From 8fcb170d89dfef74b5b7d3f2f9fe0f29584b7d1d Mon Sep 17 00:00:00 2001
From: Sayed Ibrahim Hashimi <sayed.hashimi@gmail.com>
Date: Tue, 21 Sep 2021 13:45:33 -0400
Subject: [PATCH 01/20] upgrade to .net 6

---
 Directory.Build.props                                     | 8 ++++----
 src/BlazingComponents/BlazingComponents.csproj            | 2 +-
 src/BlazingPizza.Client/BlazingPizza.Client.csproj        | 2 +-
 .../BlazingPizza.ComponentsLibrary.csproj                 | 2 +-
 src/BlazingPizza.Server/BlazingPizza.Server.csproj        | 2 +-
 src/BlazingPizza.Server/PizzaStoreContext.cs              | 2 +-
 src/BlazingPizza.Server/SpecialsController.cs             | 2 ++
 src/BlazingPizza.Shared/BlazingPizza.Shared.csproj        | 2 +-
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index bb2df7b9..49b8f5e4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
-        <AspNetCoreVersion>5.0.0</AspNetCoreVersion>
-        <BlazorVersion>5.0.0</BlazorVersion>
-        <EntityFrameworkVersion>5.0.0</EntityFrameworkVersion>
-        <SystemNetHttpJsonVersion>5.0.0</SystemNetHttpJsonVersion>
+        <AspNetCoreVersion>6.0.0-rc.1.21452.15</AspNetCoreVersion>
+        <BlazorVersion>6.0.0-rc.1.21452.15</BlazorVersion>
+        <EntityFrameworkVersion>6.0.0-rc.1.21452.10</EntityFrameworkVersion>
+        <SystemNetHttpJsonVersion>6.0.0-rc.1.21451.13</SystemNetHttpJsonVersion>
     </PropertyGroup>
 </Project>
diff --git a/src/BlazingComponents/BlazingComponents.csproj b/src/BlazingComponents/BlazingComponents.csproj
index 6325ad64..cd034c1a 100644
--- a/src/BlazingComponents/BlazingComponents.csproj
+++ b/src/BlazingComponents/BlazingComponents.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.Client/BlazingPizza.Client.csproj b/src/BlazingPizza.Client/BlazingPizza.Client.csproj
index 5014247d..17486ea0 100644
--- a/src/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/src/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 5f51ee3c..32150e78 100644
--- a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.Server/BlazingPizza.Server.csproj b/src/BlazingPizza.Server/BlazingPizza.Server.csproj
index 6391d520..c32275bf 100644
--- a/src/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/src/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.Server/PizzaStoreContext.cs b/src/BlazingPizza.Server/PizzaStoreContext.cs
index 51e96e1e..7fa06430 100644
--- a/src/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/src/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using IdentityServer4.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
diff --git a/src/BlazingPizza.Server/SpecialsController.cs b/src/BlazingPizza.Server/SpecialsController.cs
index a176844c..91b01483 100644
--- a/src/BlazingPizza.Server/SpecialsController.cs
+++ b/src/BlazingPizza.Server/SpecialsController.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
@@ -20,6 +21,7 @@ public SpecialsController(PizzaStoreContext db)
         [HttpGet]
         public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()
         {
+            var foo = _db.Specials.ToList();
             return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();
         }
     }
diff --git a/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 911c57c5..583d66fe 100644
--- a/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 

From 79a04729af2e65c9a601ce5192331acda8e8cfa1 Mon Sep 17 00:00:00 2001
From: Sayed Ibrahim Hashimi <sayed.hashimi@gmail.com>
Date: Tue, 21 Sep 2021 14:39:25 -0400
Subject: [PATCH 02/20] updating to rc2

---
 Directory.Build.props | 8 ++++----
 src/nuget.config      | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 49b8f5e4..1048d648 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
-        <AspNetCoreVersion>6.0.0-rc.1.21452.15</AspNetCoreVersion>
-        <BlazorVersion>6.0.0-rc.1.21452.15</BlazorVersion>
-        <EntityFrameworkVersion>6.0.0-rc.1.21452.10</EntityFrameworkVersion>
-        <SystemNetHttpJsonVersion>6.0.0-rc.1.21451.13</SystemNetHttpJsonVersion>
+        <AspNetCoreVersion>6.0.0-rc.2.21471.1</AspNetCoreVersion>
+        <BlazorVersion>6.0.0-rc.2.21471.1</BlazorVersion>
+        <EntityFrameworkVersion>6.0.0-rc.2.21471.1</EntityFrameworkVersion>
+        <SystemNetHttpJsonVersion>6.0.0-rc.2.21470.23</SystemNetHttpJsonVersion>
     </PropertyGroup>
 </Project>
diff --git a/src/nuget.config b/src/nuget.config
index c128a804..787160cf 100644
--- a/src/nuget.config
+++ b/src/nuget.config
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <packageSources>
         <!--To inherit the global NuGet package sources remove the <clear/> line below -->
         <clear />
         <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+        <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
     </packageSources>
 </configuration>

From d269b716a1d72bb2149849506b07f59a5b3c4489 Mon Sep 17 00:00:00 2001
From: Sayed Ibrahim Hashimi <sayed.hashimi@gmail.com>
Date: Tue, 21 Sep 2021 14:40:43 -0400
Subject: [PATCH 03/20] adding gitignore to ignore sqllite temp files

---
 src/BlazingPizza.Server/.gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 src/BlazingPizza.Server/.gitignore

diff --git a/src/BlazingPizza.Server/.gitignore b/src/BlazingPizza.Server/.gitignore
new file mode 100644
index 00000000..3323b0a7
--- /dev/null
+++ b/src/BlazingPizza.Server/.gitignore
@@ -0,0 +1,2 @@
+*.db-shm
+*.db-wal
\ No newline at end of file

From 10d6596f282d138315ec90f148ad2c5ad7fabbeb Mon Sep 17 00:00:00 2001
From: Sayed Ibrahim Hashimi <sayed.hashimi@gmail.com>
Date: Tue, 21 Sep 2021 14:57:37 -0400
Subject: [PATCH 04/20] removing invalid code that i added on accident

---
 src/BlazingPizza.Server/SpecialsController.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/BlazingPizza.Server/SpecialsController.cs b/src/BlazingPizza.Server/SpecialsController.cs
index 91b01483..9c253eb6 100644
--- a/src/BlazingPizza.Server/SpecialsController.cs
+++ b/src/BlazingPizza.Server/SpecialsController.cs
@@ -21,7 +21,6 @@ public SpecialsController(PizzaStoreContext db)
         [HttpGet]
         public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()
         {
-            var foo = _db.Specials.ToList();
             return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();
         }
     }

From 0ee662f2fe2b2e98d49d59a9eda2046d61e5571c Mon Sep 17 00:00:00 2001
From: Sayed Ibrahim Hashimi <sayed.hashimi@gmail.com>
Date: Tue, 21 Sep 2021 15:05:48 -0400
Subject: [PATCH 05/20] going back to a different rc2 build that works w Hot
 Reload

---
 Directory.Build.props                                     | 6 +++---
 src/BlazingPizza.Client/Pages/Index.razor                 | 2 +-
 src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 1048d648..3a7b1f2e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
-        <AspNetCoreVersion>6.0.0-rc.2.21471.1</AspNetCoreVersion>
-        <BlazorVersion>6.0.0-rc.2.21471.1</BlazorVersion>
-        <EntityFrameworkVersion>6.0.0-rc.2.21471.1</EntityFrameworkVersion>
+        <AspNetCoreVersion>6.0.0-rc.2.21470.37</AspNetCoreVersion>
+        <BlazorVersion>6.0.0-rc.2.21470.37</BlazorVersion>
+        <EntityFrameworkVersion>6.0.0-rc.2.21470.37</EntityFrameworkVersion>
         <SystemNetHttpJsonVersion>6.0.0-rc.2.21470.23</SystemNetHttpJsonVersion>
     </PropertyGroup>
 </Project>
diff --git a/src/BlazingPizza.Client/Pages/Index.razor b/src/BlazingPizza.Client/Pages/Index.razor
index ca5ac084..f1309132 100644
--- a/src/BlazingPizza.Client/Pages/Index.razor
+++ b/src/BlazingPizza.Client/Pages/Index.razor
@@ -36,7 +36,7 @@
     }
     else
     {
-        <div class="empty-cart">Choose a pizza<br>to get started</div>
+        <div class="empty-cart">Choose a pizza2<br>to get started</div>
     }
 
     <div class="order-total @(Order.Pizzas.Any() ? "" : "hidden")">
diff --git a/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor b/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
index 67096b01..f4dd45b4 100644
--- a/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
+++ b/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
@@ -13,7 +13,7 @@
         </span>
     </div>
     <div>
-        <label>Extra Toppings:</label>
+        <label>222Extra Toppings:</label>
         @if (toppings == null)
         {
             <select class="custom-select" disabled>

From 998ca63d7c6b024277e20120222c3da163652c3a Mon Sep 17 00:00:00 2001
From: Sayed Ibrahim Hashimi <sayed.hashimi@gmail.com>
Date: Tue, 21 Sep 2021 15:07:31 -0400
Subject: [PATCH 06/20] removing invalid code that i added on accident

---
 src/BlazingPizza.Client/Pages/Index.razor                 | 2 +-
 src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BlazingPizza.Client/Pages/Index.razor b/src/BlazingPizza.Client/Pages/Index.razor
index f1309132..ca5ac084 100644
--- a/src/BlazingPizza.Client/Pages/Index.razor
+++ b/src/BlazingPizza.Client/Pages/Index.razor
@@ -36,7 +36,7 @@
     }
     else
     {
-        <div class="empty-cart">Choose a pizza2<br>to get started</div>
+        <div class="empty-cart">Choose a pizza<br>to get started</div>
     }
 
     <div class="order-total @(Order.Pizzas.Any() ? "" : "hidden")">
diff --git a/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor b/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
index f4dd45b4..67096b01 100644
--- a/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
+++ b/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
@@ -13,7 +13,7 @@
         </span>
     </div>
     <div>
-        <label>222Extra Toppings:</label>
+        <label>Extra Toppings:</label>
         @if (toppings == null)
         {
             <select class="custom-select" disabled>

From 70ebe01475096675b42bbb8976debd1ef2974bb0 Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Fritz" <csharpfritz@users.noreply.github.com>
Date: Fri, 28 Jan 2022 12:56:39 -0500
Subject: [PATCH 07/20] Started TFM variable

---
 Directory.Build.props                              | 9 +++++----
 src/BlazingComponents/BlazingComponents.csproj     | 2 +-
 src/BlazingPizza.Client/BlazingPizza.Client.csproj | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 3a7b1f2e..a8b3d094 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,9 @@
 <Project>
     <PropertyGroup>
-        <AspNetCoreVersion>6.0.0-rc.2.21470.37</AspNetCoreVersion>
-        <BlazorVersion>6.0.0-rc.2.21470.37</BlazorVersion>
-        <EntityFrameworkVersion>6.0.0-rc.2.21470.37</EntityFrameworkVersion>
-        <SystemNetHttpJsonVersion>6.0.0-rc.2.21470.23</SystemNetHttpJsonVersion>
+        <AspNetCoreVersion>6.0.0</AspNetCoreVersion>
+        <BlazorVersion>6.0.0</BlazorVersion>
+        <EntityFrameworkVersion>6.0.0</EntityFrameworkVersion>
+				<TargetFrameworkVersion>net6.0</TargetFrameworkVersion>
+        <SystemNetHttpJsonVersion>6.0.0</SystemNetHttpJsonVersion>
     </PropertyGroup>
 </Project>
diff --git a/src/BlazingComponents/BlazingComponents.csproj b/src/BlazingComponents/BlazingComponents.csproj
index cd034c1a..e0a4b76a 100644
--- a/src/BlazingComponents/BlazingComponents.csproj
+++ b/src/BlazingComponents/BlazingComponents.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.Client/BlazingPizza.Client.csproj b/src/BlazingPizza.Client/BlazingPizza.Client.csproj
index 17486ea0..168bb22a 100644
--- a/src/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/src/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

From 915346032dca9363ce2e551ece741d3f310a63fc Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Fritz" <csharpfritz@users.noreply.github.com>
Date: Fri, 28 Jan 2022 13:09:35 -0500
Subject: [PATCH 08/20] Updated all projects to NET6 and Duende
 IdentityFramework

---
 .../BlazingPizza.Client/BlazingPizza.Client.csproj              | 2 +-
 .../BlazingPizza.ComponentsLibrary.csproj                       | 2 +-
 .../BlazingPizza.Server/BlazingPizza.Server.csproj              | 2 +-
 .../00-get-started/BlazingPizza.Server/PizzaStoreContext.cs     | 2 +-
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj              | 2 +-
 .../BlazingPizza.Client/BlazingPizza.Client.csproj              | 2 +-
 .../BlazingPizza.ComponentsLibrary.csproj                       | 2 +-
 .../BlazingPizza.Server/BlazingPizza.Server.csproj              | 2 +-
 .../BlazingPizza.Server/PizzaStoreContext.cs                    | 2 +-
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj              | 2 +-
 .../BlazingPizza.Client/BlazingPizza.Client.csproj              | 2 +-
 .../BlazingPizza.ComponentsLibrary.csproj                       | 2 +-
 .../BlazingPizza.Server/BlazingPizza.Server.csproj              | 2 +-
 .../BlazingPizza.Server/PizzaStoreContext.cs                    | 2 +-
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj              | 2 +-
 .../BlazingPizza.Client/BlazingPizza.Client.csproj              | 2 +-
 .../BlazingPizza.ComponentsLibrary.csproj                       | 2 +-
 .../BlazingPizza.Server/BlazingPizza.Server.csproj              | 2 +-
 .../BlazingPizza.Server/PizzaStoreContext.cs                    | 2 +-
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj              | 2 +-
 .../BlazingPizza.Client/BlazingPizza.Client.csproj              | 2 +-
 .../BlazingPizza.ComponentsLibrary.csproj                       | 2 +-
 .../BlazingPizza.Server/BlazingPizza.Server.csproj              | 2 +-
 .../BlazingPizza.Server/PizzaStoreContext.cs                    | 2 +-
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj              | 2 +-
 .../BlazingPizza.Client/BlazingPizza.Client.csproj              | 2 +-
 .../BlazingPizza.ComponentsLibrary.csproj                       | 2 +-
 .../BlazingPizza.Server/BlazingPizza.Server.csproj              | 2 +-
 .../BlazingPizza.Server/PizzaStoreContext.cs                    | 2 +-
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj              | 2 +-
 .../BlazingPizza.Client/BlazingPizza.Client.csproj              | 2 +-
 .../BlazingPizza.ComponentsLibrary.csproj                       | 2 +-
 .../BlazingPizza.Server/BlazingPizza.Server.csproj              | 2 +-
 .../BlazingPizza.Server/PizzaStoreContext.cs                    | 2 +-
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj              | 2 +-
 .../BlazingPizza.Client/BlazingPizza.Client.csproj              | 2 +-
 .../BlazingPizza.ComponentsLibrary.csproj                       | 2 +-
 .../BlazingPizza.Server/BlazingPizza.Server.csproj              | 2 +-
 .../BlazingPizza.Server/PizzaStoreContext.cs                    | 2 +-
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj              | 2 +-
 .../BlazingComponents/BlazingComponents.csproj                  | 2 +-
 .../BlazingPizza.Client/BlazingPizza.Client.csproj              | 2 +-
 .../BlazingPizza.ComponentsLibrary.csproj                       | 2 +-
 .../BlazingPizza.Server/BlazingPizza.Server.csproj              | 2 +-
 .../BlazingPizza.Server/PizzaStoreContext.cs                    | 2 +-
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj              | 2 +-
 .../BlazingComponents/BlazingComponents.csproj                  | 2 +-
 .../BlazingPizza.Client/BlazingPizza.Client.csproj              | 2 +-
 .../BlazingPizza.ComponentsLibrary.csproj                       | 2 +-
 .../BlazingPizza.Server/BlazingPizza.Server.csproj              | 2 +-
 .../BlazingPizza.Server/PizzaStoreContext.cs                    | 2 +-
 .../BlazingPizza.Shared/BlazingPizza.Shared.csproj              | 2 +-
 .../BlazingPizza.ComponentsLibrary.csproj                       | 2 +-
 src/BlazingPizza.Server/BlazingPizza.Server.csproj              | 2 +-
 src/BlazingPizza.Shared/BlazingPizza.Shared.csproj              | 2 +-
 src/nuget.config                                                | 1 -
 56 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj
index 04df2ddd..bfef7295 100644
--- a/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 5f51ee3c..61ebf623 100644
--- a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/00-get-started/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/00-get-started/BlazingPizza.Server/BlazingPizza.Server.csproj
index fd7e3c51..b9c74fc4 100644
--- a/save-points/00-get-started/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/00-get-started/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/00-get-started/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/00-get-started/BlazingPizza.Server/PizzaStoreContext.cs
index f79c1c66..fae5acb4 100644
--- a/save-points/00-get-started/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/00-get-started/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using IdentityServer4.EntityFramework.Options;
+using IDuende.IdentityServerEEntityFramework.Options
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
diff --git a/save-points/00-get-started/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/00-get-started/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 911c57c5..f7b7dd02 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/00-get-started/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/01-Components-and-layout/BlazingPizza.Client/BlazingPizza.Client.csproj
index a833c6be..663677a1 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/01-Components-and-layout/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 5f51ee3c..61ebf623 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/01-Components-and-layout/BlazingPizza.Server/BlazingPizza.Server.csproj
index fd7e3c51..b9c74fc4 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreContext.cs
index f79c1c66..9485bd12 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using IdentityServer4.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/01-Components-and-layout/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 911c57c5..f7b7dd02 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/02-customize-a-pizza/BlazingPizza.Client/BlazingPizza.Client.csproj
index c50ce7e0..cd5da247 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 5f51ee3c..61ebf623 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/02-customize-a-pizza/BlazingPizza.Server/BlazingPizza.Server.csproj
index fd7e3c51..b9c74fc4 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreContext.cs
index f79c1c66..9485bd12 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using IdentityServer4.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/02-customize-a-pizza/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 911c57c5..f7b7dd02 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/03-show-order-status/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/03-show-order-status/BlazingPizza.Client/BlazingPizza.Client.csproj
index a833c6be..663677a1 100644
--- a/save-points/03-show-order-status/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/03-show-order-status/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 5f51ee3c..61ebf623 100644
--- a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/03-show-order-status/BlazingPizza.Server/BlazingPizza.Server.csproj
index fd7e3c51..b9c74fc4 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/03-show-order-status/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreContext.cs
index f79c1c66..9485bd12 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using IdentityServer4.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/03-show-order-status/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 911c57c5..f7b7dd02 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/04-refactor-state-management/BlazingPizza.Client/BlazingPizza.Client.csproj
index a833c6be..663677a1 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/04-refactor-state-management/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 5f51ee3c..61ebf623 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/04-refactor-state-management/BlazingPizza.Server/BlazingPizza.Server.csproj
index fd7e3c51..b9c74fc4 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreContext.cs
index f79c1c66..9485bd12 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using IdentityServer4.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/04-refactor-state-management/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 911c57c5..f7b7dd02 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj
index a833c6be..663677a1 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 5f51ee3c..61ebf623 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/05-checkout-with-validation/BlazingPizza.Server/BlazingPizza.Server.csproj
index fd7e3c51..b9c74fc4 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreContext.cs
index f79c1c66..9485bd12 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using IdentityServer4.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/05-checkout-with-validation/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 911c57c5..f7b7dd02 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj
index a833c6be..663677a1 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 5f51ee3c..61ebf623 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/06-authentication-and-authorization/BlazingPizza.Server/BlazingPizza.Server.csproj
index fd7e3c51..b9c74fc4 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzaStoreContext.cs
index f79c1c66..9485bd12 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using IdentityServer4.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 911c57c5..f7b7dd02 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj
index a833c6be..663677a1 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 5f51ee3c..61ebf623 100644
--- a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/07-javascript-interop/BlazingPizza.Server/BlazingPizza.Server.csproj
index fd7e3c51..b9c74fc4 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreContext.cs
index f79c1c66..9485bd12 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using IdentityServer4.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/07-javascript-interop/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 911c57c5..f7b7dd02 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/08-templated-components/BlazingComponents/BlazingComponents.csproj b/save-points/08-templated-components/BlazingComponents/BlazingComponents.csproj
index 6325ad64..e0a4b76a 100644
--- a/save-points/08-templated-components/BlazingComponents/BlazingComponents.csproj
+++ b/save-points/08-templated-components/BlazingComponents/BlazingComponents.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/08-templated-components/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/08-templated-components/BlazingPizza.Client/BlazingPizza.Client.csproj
index c6ff02af..7fecc21b 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/08-templated-components/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 5f51ee3c..61ebf623 100644
--- a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/08-templated-components/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/08-templated-components/BlazingPizza.Server/BlazingPizza.Server.csproj
index fd7e3c51..b9c74fc4 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/08-templated-components/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreContext.cs
index f79c1c66..9485bd12 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using IdentityServer4.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/08-templated-components/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 911c57c5..f7b7dd02 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/08-templated-components/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/save-points/09-progressive-web-app/BlazingComponents/BlazingComponents.csproj b/save-points/09-progressive-web-app/BlazingComponents/BlazingComponents.csproj
index df017b6f..89335194 100644
--- a/save-points/09-progressive-web-app/BlazingComponents/BlazingComponents.csproj
+++ b/save-points/09-progressive-web-app/BlazingComponents/BlazingComponents.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
 
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/09-progressive-web-app/BlazingPizza.Client/BlazingPizza.Client.csproj
index c6ff02af..7fecc21b 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 255af646..1ec992ad 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/09-progressive-web-app/BlazingPizza.Server/BlazingPizza.Server.csproj
index 6391d520..e1e7aaef 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreContext.cs
index f79c1c66..9485bd12 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using IdentityServer4.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/09-progressive-web-app/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 911c57c5..f7b7dd02 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 32150e78..61ebf623 100644
--- a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.Server/BlazingPizza.Server.csproj b/src/BlazingPizza.Server/BlazingPizza.Server.csproj
index c32275bf..e1e7aaef 100644
--- a/src/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/src/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index 583d66fe..f7b7dd02 100644
--- a/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
   </PropertyGroup>
 
diff --git a/src/nuget.config b/src/nuget.config
index 787160cf..719ff50f 100644
--- a/src/nuget.config
+++ b/src/nuget.config
@@ -4,6 +4,5 @@
         <!--To inherit the global NuGet package sources remove the <clear/> line below -->
         <clear />
         <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-        <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
     </packageSources>
 </configuration>

From 08ce819fc2b511a00852fc2abd847050ce32dd37 Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Fritz" <csharpfritz@users.noreply.github.com>
Date: Fri, 28 Jan 2022 14:54:02 -0500
Subject: [PATCH 09/20] Upgraded finished project to .NET 6 with C# 10 features

Added generated JSON Serialization

Added EF compiled models
---
 src/nuget.config => nuget.config              |  16 +-
 .../BlazingPizza.Client.csproj                |   1 +
 .../BlazingPizza.Client/Program.cs            |  24 +-
 .../BlazingPizza.ComponentsLibrary.csproj     |   1 +
 .../LocalStorage.cs                           |  20 +-
 .../BlazingPizza.Server.csproj                |   1 +
 .../NotificationsController.cs                |  43 --
 .../OidcConfigurationController.cs            |  35 +-
 .../BlazingPizza.Server/OrdersController.cs   | 215 +++++-----
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  60 +++
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  49 ++-
 .../BlazingPizza.Server/PizzasController.cs   |  16 -
 .../BlazingPizza.Server/Program.cs            |  93 +++--
 .../BlazingPizza.Server/SeedData.cs           | 379 +++++++++---------
 .../BlazingPizza.Server/SpecialsController.cs |  26 --
 .../BlazingPizza.Server/Startup.cs            |  70 ----
 .../BlazingPizza.Server/ToppingsController.cs |  26 --
 .../BlazingPizza.Client.csproj                |   1 +
 .../JSRuntimeExtensions.cs                    |  16 +-
 src/BlazingPizza.Client/OrderState.cs         | 101 +++--
 src/BlazingPizza.Client/OrdersClient.cs       |  59 ++-
 src/BlazingPizza.Client/Pages/Index.razor     |   2 +-
 .../PizzaAuthenticationState.cs               |   9 +-
 src/BlazingPizza.Client/Program.cs            |  37 +-
 .../Shared/ConfigurePizzaDialog.razor         |   2 +-
 .../BlazingPizza.ComponentsLibrary.csproj     |   1 +
 .../LocalStorage.cs                           |  22 +-
 .../Map/Marker.cs                             |  15 +-
 .../Map/Point.cs                              |  13 +-
 .../BlazingPizza.Server.csproj                |   1 +
 .../Models/AddressEntityType.cs               |  92 +++++
 .../Models/DeviceFlowCodesEntityType.cs       | 114 ++++++
 .../IdentityRoleClaimstringEntityType.cs      |  85 ++++
 .../Models/IdentityRoleEntityType.cs          |  78 ++++
 .../IdentityUserClaimstringEntityType.cs      |  85 ++++
 .../IdentityUserLoginstringEntityType.cs      |  86 ++++
 .../IdentityUserRolestringEntityType.cs       |  82 ++++
 .../IdentityUserTokenstringEntityType.cs      |  84 ++++
 .../Models/KeyEntityType.cs                   |  96 +++++
 .../Models/LatLongEntityType.cs               |  80 ++++
 .../NotificationSubscriptionEntityType.cs     |  77 ++++
 .../Models/OrderEntityType.cs                 |  86 ++++
 .../Models/PersistedGrantEntityType.cs        | 127 ++++++
 .../Models/PizzaEntityType.cs                 | 111 +++++
 .../Models/PizzaSpecialEntityType.cs          |  76 ++++
 .../Models/PizzaStoreContextModel.cs          |  28 ++
 .../Models/PizzaStoreContextModelBuilder.cs   |  69 ++++
 .../Models/PizzaStoreUserEntityType.cs        | 156 +++++++
 .../Models/PizzaToppingEntityType.cs          |  96 +++++
 .../Models/ToppingEntityType.cs               |  62 +++
 .../NotificationsController.cs                |  43 --
 .../OidcConfigurationController.cs            |  33 +-
 src/BlazingPizza.Server/OrdersController.cs   | 249 ++++++------
 src/BlazingPizza.Server/PizzaApiExtensions.cs |  60 +++
 src/BlazingPizza.Server/PizzaStoreContext.cs  |  47 ++-
 src/BlazingPizza.Server/PizzaStoreUser.cs     |   9 +-
 src/BlazingPizza.Server/PizzasController.cs   |  16 -
 src/BlazingPizza.Server/Program.cs            |  94 +++--
 src/BlazingPizza.Server/SeedData.cs           | 379 +++++++++---------
 src/BlazingPizza.Server/SpecialsController.cs |  27 --
 src/BlazingPizza.Server/Startup.cs            |  70 ----
 src/BlazingPizza.Server/ToppingsController.cs |  26 --
 src/BlazingPizza.Shared/Address.cs            |  33 +-
 .../BlazingPizza.Shared.csproj                |   5 +
 src/BlazingPizza.Shared/LatLong.cs            |  43 +-
 .../NotificationSubscription.cs               |  17 +-
 src/BlazingPizza.Shared/Order.cs              |  37 +-
 src/BlazingPizza.Shared/OrderWithStatus.cs    | 133 +++---
 src/BlazingPizza.Shared/Pizza.cs              |  62 +--
 src/BlazingPizza.Shared/PizzaSpecial.cs       |  27 +-
 src/BlazingPizza.Shared/PizzaTopping.cs       |  18 +-
 src/BlazingPizza.Shared/Topping.cs            |  18 +-
 src/BlazingPizza.Shared/UserInfo.cs           |  14 +-
 73 files changed, 3061 insertions(+), 1523 deletions(-)
 rename src/nuget.config => nuget.config (97%)
 delete mode 100644 save-points/00-get-started/BlazingPizza.Server/NotificationsController.cs
 create mode 100644 save-points/00-get-started/BlazingPizza.Server/PizzaApiExtensions.cs
 delete mode 100644 save-points/00-get-started/BlazingPizza.Server/PizzasController.cs
 delete mode 100644 save-points/00-get-started/BlazingPizza.Server/SpecialsController.cs
 delete mode 100644 save-points/00-get-started/BlazingPizza.Server/Startup.cs
 delete mode 100644 save-points/00-get-started/BlazingPizza.Server/ToppingsController.cs
 create mode 100644 src/BlazingPizza.Server/Models/AddressEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/KeyEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/LatLongEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/OrderEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/PizzaEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
 create mode 100644 src/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
 create mode 100644 src/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
 create mode 100644 src/BlazingPizza.Server/Models/ToppingEntityType.cs
 delete mode 100644 src/BlazingPizza.Server/NotificationsController.cs
 create mode 100644 src/BlazingPizza.Server/PizzaApiExtensions.cs
 delete mode 100644 src/BlazingPizza.Server/PizzasController.cs
 delete mode 100644 src/BlazingPizza.Server/SpecialsController.cs
 delete mode 100644 src/BlazingPizza.Server/Startup.cs
 delete mode 100644 src/BlazingPizza.Server/ToppingsController.cs

diff --git a/src/nuget.config b/nuget.config
similarity index 97%
rename from src/nuget.config
rename to nuget.config
index 719ff50f..023d22cf 100644
--- a/src/nuget.config
+++ b/nuget.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <packageSources>
-        <!--To inherit the global NuGet package sources remove the <clear/> line below -->
-        <clear />
-        <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-    </packageSources>
-</configuration>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+        <clear />
+        <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+    </packageSources>
+</configuration>
diff --git a/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj
index bfef7295..86250f68 100644
--- a/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/00-get-started/BlazingPizza.Client/Program.cs b/save-points/00-get-started/BlazingPizza.Client/Program.cs
index 48147d6f..ab7dd4d9 100644
--- a/save-points/00-get-started/BlazingPizza.Client/Program.cs
+++ b/save-points/00-get-started/BlazingPizza.Client/Program.cs
@@ -1,21 +1,9 @@
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
+using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
-namespace BlazingPizza.Client
-{
-    public class Program
-    {
-        public static async Task Main(string[] args)
-        {
-            var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("#app");
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<App>("#app");
 
-            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
-            await builder.Build().RunAsync();
-        }
-    }
-}
+await builder.Build().RunAsync();
diff --git a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 61ebf623..cb996b1b 100644
--- a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index f36b098e..1b91cef9 100644
--- a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -1,17 +1,15 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.ComponentsLibrary
+namespace BlazingPizza.ComponentsLibrary;
+
+public static class LocalStorage
 {
-    public static class LocalStorage
-    {
-        public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-        public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-        public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
-    }
+	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
 }
diff --git a/save-points/00-get-started/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/00-get-started/BlazingPizza.Server/BlazingPizza.Server.csproj
index b9c74fc4..227890e1 100644
--- a/save-points/00-get-started/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/00-get-started/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/00-get-started/BlazingPizza.Server/NotificationsController.cs b/save-points/00-get-started/BlazingPizza.Server/NotificationsController.cs
deleted file mode 100644
index bb3b96ff..00000000
--- a/save-points/00-get-started/BlazingPizza.Server/NotificationsController.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("notifications")]
-    [ApiController]
-    [Authorize]
-    public class NotificationsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public NotificationsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpPut("subscribe")]
-        public async Task<NotificationSubscription> Subscribe(NotificationSubscription subscription)
-        {
-            // We're storing at most one subscription per user, so delete old ones.
-            // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-            var userId = GetUserId();
-            var oldSubscriptions = _db.NotificationSubscriptions.Where(e => e.UserId == userId);
-            _db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
-
-            // Store new subscription
-            subscription.UserId = userId;
-            _db.NotificationSubscriptions.Attach(subscription);
-
-            await _db.SaveChangesAsync();
-            return subscription;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-    }
-}
diff --git a/save-points/00-get-started/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/00-get-started/BlazingPizza.Server/OidcConfigurationController.cs
index c074debf..b7654075 100644
--- a/save-points/00-get-started/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/00-get-started/BlazingPizza.Server/OidcConfigurationController.cs
@@ -1,26 +1,21 @@
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class OidcConfigurationController : Controller
 {
-    public class OidcConfigurationController : Controller
-    {
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-        {
-            ClientRequestParametersProvider = clientRequestParametersProvider;
-        }
+	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+	{
+		ClientRequestParametersProvider = clientRequestParametersProvider;
+	}
 
-        public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-        [HttpGet("_configuration/{clientId}")]
-        public IActionResult GetClientRequestParameters([FromRoute]string clientId)
-        {
-            var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-            return Ok(parameters);
-        }
-    }
-}
+	[HttpGet("_configuration/{clientId}")]
+	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+	{
+		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+		return Ok(parameters);
+	}
+}
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Server/OrdersController.cs b/save-points/00-get-started/BlazingPizza.Server/OrdersController.cs
index 2b8bc99b..54ff6114 100644
--- a/save-points/00-get-started/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/00-get-started/BlazingPizza.Server/OrdersController.cs
@@ -1,114 +1,109 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+[Route("orders")]
+[ApiController]
+// [Authorize]
+public class OrdersController : Controller
 {
-    [Route("orders")]
-    [ApiController]
-    // [Authorize]
-    public class OrdersController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public OrdersController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-        {
-            var orders = await _db.Orders
-                // .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .OrderByDescending(o => o.CreatedTime)
-                .ToListAsync();
-
-            return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-        }
-
-        [HttpGet("{orderId}")]
-        public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-        {
-            var order = await _db.Orders
-                .Where(o => o.OrderId == orderId)
-                // .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .SingleOrDefaultAsync();
-
-            if (order == null)
-            {
-                return NotFound();
-            }
-
-            return OrderWithStatus.FromOrder(order);
-        }
-
-        [HttpPost]
-        public async Task<ActionResult<int>> PlaceOrder(Order order)
-        {
-            order.CreatedTime = DateTime.Now;
-            order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-            // order.UserId = GetUserId();
-
-            // Enforce existence of Pizza.SpecialId and Topping.ToppingId
-            // in the database - prevent the submitter from making up
-            // new specials and toppings
-            foreach (var pizza in order.Pizzas)
-            {
-                pizza.SpecialId = pizza.Special.Id;
-                pizza.Special = null;
-
-                foreach (var topping in pizza.Toppings)
-                {
-                    topping.ToppingId = topping.Topping.Id;
-                    topping.Topping = null;
-                }
-            }
-
-            _db.Orders.Attach(order);
-            await _db.SaveChangesAsync();
-
-            // In the background, send push notifications if possible
-            var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-            if (subscription != null)
-            {
-                _ = TrackAndSendNotificationsAsync(order, subscription);
-            }
-
-            return order.OrderId;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-
-        private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-        {
-            // In a realistic case, some other backend process would track
-            // order delivery progress and send us notifications when it
-            // changes. Since we don't have any such process here, fake it.
-            await Task.Delay(OrderWithStatus.PreparationDuration);
-            await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-            await Task.Delay(OrderWithStatus.DeliveryDuration);
-            await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-        }
-
-        private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-        {
-            // This will be implemented later
-            return Task.CompletedTask;
-        }
-    }
-}
+	private readonly PizzaStoreContext _db;
+
+	public OrdersController(PizzaStoreContext db)
+	{
+		_db = db;
+	}
+
+	[HttpGet]
+	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+	{
+		var orders = await _db.Orders
+				// .Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.OrderByDescending(o => o.CreatedTime)
+				.ToListAsync();
+
+		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+	}
+
+	[HttpGet("{orderId}")]
+	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+	{
+		var order = await _db.Orders
+				.Where(o => o.OrderId == orderId)
+				// .Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.SingleOrDefaultAsync();
+
+		if (order == null)
+		{
+			return NotFound();
+		}
+
+		return OrderWithStatus.FromOrder(order);
+	}
+
+	[HttpPost]
+	public async Task<ActionResult<int>> PlaceOrder(Order order)
+	{
+		order.CreatedTime = DateTime.Now;
+		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+		// order.UserId = GetUserId();
+
+		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
+		// in the database - prevent the submitter from making up
+		// new specials and toppings
+		foreach (var pizza in order.Pizzas)
+		{
+			pizza.SpecialId = pizza.Special.Id;
+			pizza.Special = null;
+
+			foreach (var topping in pizza.Toppings)
+			{
+				topping.ToppingId = topping.Topping.Id;
+				topping.Topping = null;
+			}
+		}
+
+		_db.Orders.Attach(order);
+		await _db.SaveChangesAsync();
+
+		// In the background, send push notifications if possible
+		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+		if (subscription != null)
+		{
+			_ = TrackAndSendNotificationsAsync(order, subscription);
+		}
+
+		return order.OrderId;
+	}
+
+	private string GetUserId()
+	{
+		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+	{
+		// In a realistic case, some other backend process would track
+		// order delivery progress and send us notifications when it
+		// changes. Since we don't have any such process here, fake it.
+		await Task.Delay(OrderWithStatus.PreparationDuration);
+		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+		await Task.Delay(OrderWithStatus.DeliveryDuration);
+		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+	}
+
+	private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+	{
+		// This will be implemented later
+		return Task.CompletedTask;
+	}
+}
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/00-get-started/BlazingPizza.Server/PizzaApiExtensions.cs
new file mode 100644
index 00000000..bf6b7bde
--- /dev/null
+++ b/save-points/00-get-started/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -0,0 +1,60 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
+
+namespace BlazingPizza.Server;
+
+public static class PizzaApiExtensions
+{
+
+	public static WebApplication MapPizzaApi(this WebApplication app)
+	{
+
+		// Subscribe to notifications
+		app.MapPut("/notifications/subscribe", [Authorize] async (
+			HttpContext context,
+			PizzaStoreContext db,
+			NotificationSubscription subscription) =>
+		{
+
+			// We're storing at most one subscription per user, so delete old ones.
+			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+			var userId = GetUserId(context);
+			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+
+			// Store new subscription
+			subscription.UserId = userId;
+			db.NotificationSubscriptions.Attach(subscription);
+
+			await db.SaveChangesAsync();
+			return Results.Ok(subscription);
+
+		});
+
+		// Specials
+		app.MapGet("/specials", async (PizzaStoreContext db) =>
+		{
+
+			var specials = await db.Specials.ToListAsync();
+			return Results.Ok(specials);
+
+		});
+
+		// Toppings
+		app.MapGet("/toppings", async (PizzaStoreContext db) =>
+		{
+			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+			return Results.Ok(toppings);
+		});
+
+		return app;
+
+	}
+
+	private static string GetUserId(HttpContext context)
+	{
+		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+}
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/00-get-started/BlazingPizza.Server/PizzaStoreContext.cs
index fae5acb4..921b2824 100644
--- a/save-points/00-get-started/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/00-get-started/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,39 +1,38 @@
-using IDuende.IdentityServerEEntityFramework.Options
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-    public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
-    {
-        public PizzaStoreContext(
-            DbContextOptions options,
-            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-        {
-        }
+	public PizzaStoreContext(
+			DbContextOptions options,
+			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+	{
+	}
 
-        public DbSet<Order> Orders { get; set; }
+	public DbSet<Order> Orders { get; set; }
 
-        public DbSet<Pizza> Pizzas { get; set; }
+	public DbSet<Pizza> Pizzas { get; set; }
 
-        public DbSet<PizzaSpecial> Specials { get; set; }
+	public DbSet<PizzaSpecial> Specials { get; set; }
 
-        public DbSet<Topping> Toppings { get; set; }
+	public DbSet<Topping> Toppings { get; set; }
 
-        public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
+	protected override void OnModelCreating(ModelBuilder modelBuilder)
+	{
+		base.OnModelCreating(modelBuilder);
 
-            // Configuring a many-to-many special -> topping relationship that is friendly for serialization
-            modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-            modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-            modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
+		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-            // Inline the Lat-Long pairs in Order rather than having a FK to another table
-            modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-        }
-    }
+		// Inline the Lat-Long pairs in Order rather than having a FK to another table
+		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+	}
 }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Server/PizzasController.cs b/save-points/00-get-started/BlazingPizza.Server/PizzasController.cs
deleted file mode 100644
index c082552c..00000000
--- a/save-points/00-get-started/BlazingPizza.Server/PizzasController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("pizzas")]
-    [ApiController]
-    public class PizzasController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public PizzasController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-    }
-}
diff --git a/save-points/00-get-started/BlazingPizza.Server/Program.cs b/save-points/00-get-started/BlazingPizza.Server/Program.cs
index 40a47641..3fe5d78f 100644
--- a/save-points/00-get-started/BlazingPizza.Server/Program.cs
+++ b/save-points/00-get-started/BlazingPizza.Server/Program.cs
@@ -1,33 +1,66 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.EntityFrameworkCore;
+using BlazingPizza.Server;
 
-namespace BlazingPizza.Server
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddControllersWithViews()
+	.AddJsonOptions(options =>  {
+		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+	});
+builder.Services.AddRazorPages();
+
+builder.Services.AddDbContext<PizzaStoreContext>(options =>
+		options.UseSqlite("Data Source=pizza.db"));
+
+builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
+		.AddEntityFrameworkStores<PizzaStoreContext>();
+
+builder.Services.AddIdentityServer()
+		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+
+builder.Services.AddAuthentication()
+		.AddIdentityServerJwt();
+
+var app = builder.Build();
+
+// Initialize the database
+var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
+using (var scope = scopeFactory.CreateScope())
+{
+	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+	if (db.Database.EnsureCreated())
+	{
+		SeedData.Initialize(db);
+	}
+}
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseWebAssemblyDebugging();
+}
+else
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var host = CreateHostBuilder(args).Build();
-
-            // Initialize the database
-            var scopeFactory = host.Services.GetRequiredService<IServiceScopeFactory>();
-            using (var scope = scopeFactory.CreateScope())
-            {
-                var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-                if (db.Database.EnsureCreated())
-                {
-                    SeedData.Initialize(db);
-                }
-            }
-
-            host.Run();
-        }
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+    app.UseExceptionHandler("/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
 }
+
+app.UseHttpsRedirection();
+app.UseBlazorFrameworkFiles();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseIdentityServer();
+app.UseAuthorization();
+
+app.MapPizzaApi();
+
+app.MapRazorPages();
+app.MapControllers();
+app.MapFallbackToFile("index.html");
+
+app.Run();
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Server/SeedData.cs b/save-points/00-get-started/BlazingPizza.Server/SeedData.cs
index 7c86a5b2..a1e47973 100644
--- a/save-points/00-get-started/BlazingPizza.Server/SeedData.cs
+++ b/save-points/00-get-started/BlazingPizza.Server/SeedData.cs
@@ -1,193 +1,192 @@
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public static class SeedData
 {
-    public static class SeedData
-    {
-        public static void Initialize(PizzaStoreContext db)
-        {
-            var toppings = new Topping[]
-            {
-                new Topping()
-                {
-                    Name = "Extra cheese",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "American bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "British bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Canadian bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Tea and crumpets",
-                    Price = 5.00m
-                },
-                new Topping()
-                {
-                    Name = "Fresh-baked scones",
-                    Price = 4.50m,
-                },
-                new Topping()
-                {
-                    Name = "Bell peppers",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Onions",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Mushrooms",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Pepperoni",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Duck sausage",
-                    Price = 3.20m,
-                },
-                new Topping()
-                {
-                    Name = "Venison meatballs",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "Served on a silver platter",
-                    Price = 250.99m,
-                },
-                new Topping()
-                {
-                    Name = "Lobster on top",
-                    Price = 64.50m,
-                },
-                new Topping()
-                {
-                    Name = "Sturgeon caviar",
-                    Price = 101.75m,
-                },
-                new Topping()
-                {
-                    Name = "Artichoke hearts",
-                    Price = 3.40m,
-                },
-                new Topping()
-                {
-                    Name = "Fresh tomatoes",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Basil",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Steak (medium-rare)",
-                    Price = 8.50m,
-                },
-                new Topping()
-                {
-                    Name = "Blazing hot peppers",
-                    Price = 4.20m,
-                },
-                new Topping()
-                {
-                    Name = "Buffalo chicken",
-                    Price = 5.00m,
-                },
-                new Topping()
-                {
-                    Name = "Blue cheese",
-                    Price = 2.50m,
-                },
-            };
+	public static void Initialize(PizzaStoreContext db)
+	{
+		var toppings = new Topping[]
+		{
+			new Topping()
+			{
+					Name = "Extra cheese",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "American bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "British bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Canadian bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Tea and crumpets",
+					Price = 5.00m
+			},
+			new Topping()
+			{
+					Name = "Fresh-baked scones",
+					Price = 4.50m,
+			},
+			new Topping()
+			{
+					Name = "Bell peppers",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Onions",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Mushrooms",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Pepperoni",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Duck sausage",
+					Price = 3.20m,
+			},
+			new Topping()
+			{
+					Name = "Venison meatballs",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "Served on a silver platter",
+					Price = 250.99m,
+			},
+			new Topping()
+			{
+					Name = "Lobster on top",
+					Price = 64.50m,
+			},
+			new Topping()
+			{
+					Name = "Sturgeon caviar",
+					Price = 101.75m,
+			},
+			new Topping()
+			{
+					Name = "Artichoke hearts",
+					Price = 3.40m,
+			},
+			new Topping()
+			{
+					Name = "Fresh tomatoes",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Basil",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Steak (medium-rare)",
+					Price = 8.50m,
+			},
+			new Topping()
+			{
+					Name = "Blazing hot peppers",
+					Price = 4.20m,
+			},
+			new Topping()
+			{
+					Name = "Buffalo chicken",
+					Price = 5.00m,
+			},
+			new Topping()
+			{
+					Name = "Blue cheese",
+					Price = 2.50m,
+			},
+		};
 
-            var specials = new PizzaSpecial[]
-            {
-                new PizzaSpecial()
-                {
-                    Name = "Basic Cheese Pizza",
-                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/cheese.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 2,
-                    Name = "The Baconatorizor",
-                    Description = "It has EVERY kind of bacon",
-                    BasePrice = 11.99m,
-                    ImageUrl = "img/pizzas/bacon.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 3,
-                    Name = "Classic pepperoni",
-                    Description = "It's the pizza you grew up with, but Blazing hot!",
-                    BasePrice = 10.50m,
-                    ImageUrl = "img/pizzas/pepperoni.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 4,
-                    Name = "Buffalo chicken",
-                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-                    BasePrice = 12.75m,
-                    ImageUrl = "img/pizzas/meaty.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 5,
-                    Name = "Mushroom Lovers",
-                    Description = "It has mushrooms. Isn't that obvious?",
-                    BasePrice = 11.00m,
-                    ImageUrl = "img/pizzas/mushroom.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 6,
-                    Name = "The Brit",
-                    Description = "When in London...",
-                    BasePrice = 10.25m,
-                    ImageUrl = "img/pizzas/brit.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 7,
-                    Name = "Veggie Delight",
-                    Description = "It's like salad, but on a pizza",
-                    BasePrice = 11.50m,
-                    ImageUrl = "img/pizzas/salad.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 8,
-                    Name = "Margherita",
-                    Description = "Traditional Italian pizza with tomatoes and basil",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/margherita.jpg",
-                },
-            };
+		var specials = new PizzaSpecial[]
+		{
+			new PizzaSpecial()
+			{
+					Name = "Basic Cheese Pizza",
+					Description = "It's cheesy and delicious. Why wouldn't you want one?",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/cheese.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 2,
+					Name = "The Baconatorizor",
+					Description = "It has EVERY kind of bacon",
+					BasePrice = 11.99m,
+					ImageUrl = "img/pizzas/bacon.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 3,
+					Name = "Classic pepperoni",
+					Description = "It's the pizza you grew up with, but Blazing hot!",
+					BasePrice = 10.50m,
+					ImageUrl = "img/pizzas/pepperoni.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 4,
+					Name = "Buffalo chicken",
+					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+					BasePrice = 12.75m,
+					ImageUrl = "img/pizzas/meaty.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 5,
+					Name = "Mushroom Lovers",
+					Description = "It has mushrooms. Isn't that obvious?",
+					BasePrice = 11.00m,
+					ImageUrl = "img/pizzas/mushroom.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 6,
+					Name = "The Brit",
+					Description = "When in London...",
+					BasePrice = 10.25m,
+					ImageUrl = "img/pizzas/brit.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 7,
+					Name = "Veggie Delight",
+					Description = "It's like salad, but on a pizza",
+					BasePrice = 11.50m,
+					ImageUrl = "img/pizzas/salad.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 8,
+					Name = "Margherita",
+					Description = "Traditional Italian pizza with tomatoes and basil",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/margherita.jpg",
+			},
+		};
 
-            db.Toppings.AddRange(toppings);
-            db.Specials.AddRange(specials);
-            db.SaveChanges();
-        }
-    }
-}
+		db.Toppings.AddRange(toppings);
+		db.Specials.AddRange(specials);
+		db.SaveChanges();
+	}
+}
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Server/SpecialsController.cs b/save-points/00-get-started/BlazingPizza.Server/SpecialsController.cs
deleted file mode 100644
index a176844c..00000000
--- a/save-points/00-get-started/BlazingPizza.Server/SpecialsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("specials")]
-    [ApiController]
-    public class SpecialsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public SpecialsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()
-        {
-            return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();
-        }
-    }
-}
diff --git a/save-points/00-get-started/BlazingPizza.Server/Startup.cs b/save-points/00-get-started/BlazingPizza.Server/Startup.cs
deleted file mode 100644
index ed3fca06..00000000
--- a/save-points/00-get-started/BlazingPizza.Server/Startup.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace BlazingPizza.Server
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllersWithViews();
-            services.AddRazorPages();
-
-            services.AddDbContext<PizzaStoreContext>(options => 
-                options.UseSqlite("Data Source=pizza.db"));
-
-            services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-                .AddEntityFrameworkStores<PizzaStoreContext>();
-
-            services.AddIdentityServer()
-                .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
-
-            services.AddAuthentication()
-                .AddIdentityServerJwt();
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                app.UseWebAssemblyDebugging();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Error");
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
-
-            app.UseHttpsRedirection();
-            app.UseBlazorFrameworkFiles();
-            app.UseStaticFiles();
-
-            app.UseRouting();
-
-            app.UseAuthentication();
-            app.UseIdentityServer();
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-                endpoints.MapRazorPages();
-                endpoints.MapFallbackToFile("index.html");
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Server/ToppingsController.cs b/save-points/00-get-started/BlazingPizza.Server/ToppingsController.cs
deleted file mode 100644
index 6a677639..00000000
--- a/save-points/00-get-started/BlazingPizza.Server/ToppingsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("toppings")]
-    [ApiController]
-    public class ToppingsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public ToppingsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<Topping>>> GetToppings()
-        {
-            return await _db.Toppings.OrderBy(t => t.Name).ToListAsync();
-        }
-    }
-}
diff --git a/src/BlazingPizza.Client/BlazingPizza.Client.csproj b/src/BlazingPizza.Client/BlazingPizza.Client.csproj
index 168bb22a..44802d79 100644
--- a/src/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/src/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.Client/JSRuntimeExtensions.cs b/src/BlazingPizza.Client/JSRuntimeExtensions.cs
index 89da520c..cc242348 100644
--- a/src/BlazingPizza.Client/JSRuntimeExtensions.cs
+++ b/src/BlazingPizza.Client/JSRuntimeExtensions.cs
@@ -1,13 +1,11 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.Client
+namespace BlazingPizza.Client;
+
+public static class JSRuntimeExtensions
 {
-    public static class JSRuntimeExtensions
-    {
-        public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
-        {
-            return jsRuntime.InvokeAsync<bool>("confirm", message);
-        }
-    }
+	public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
+	{
+		return jsRuntime.InvokeAsync<bool>("confirm", message);
+	}
 }
diff --git a/src/BlazingPizza.Client/OrderState.cs b/src/BlazingPizza.Client/OrderState.cs
index 5265ae39..4f47979d 100644
--- a/src/BlazingPizza.Client/OrderState.cs
+++ b/src/BlazingPizza.Client/OrderState.cs
@@ -1,55 +1,52 @@
-using System.Collections.Generic;
+namespace BlazingPizza.Client;
 
-namespace BlazingPizza.Client
+public class OrderState
 {
-    public class OrderState
-    {
-        public bool ShowingConfigureDialog { get; private set; }
-
-        public Pizza ConfiguringPizza { get; private set; }
-
-        public Order Order { get; private set; } = new Order();
-
-        public void ShowConfigurePizzaDialog(PizzaSpecial special)
-        {
-            ConfiguringPizza = new Pizza()
-            {
-                Special = special,
-                SpecialId = special.Id,
-                Size = Pizza.DefaultSize,
-                Toppings = new List<PizzaTopping>(),
-            };
-
-            ShowingConfigureDialog = true;
-        }
-
-        public void CancelConfigurePizzaDialog()
-        {
-            ConfiguringPizza = null;
-            ShowingConfigureDialog = false;
-        }
-
-        public void ConfirmConfigurePizzaDialog()
-        {
-            Order.Pizzas.Add(ConfiguringPizza);
-            ConfiguringPizza = null;
-
-            ShowingConfigureDialog = false;
-        }
-
-        public void RemoveConfiguredPizza(Pizza pizza)
-        {
-            Order.Pizzas.Remove(pizza);
-        }
-
-        public void ResetOrder()
-        {
-            Order = new Order();
-        }
-
-        public void ReplaceOrder(Order order)
-        {
-            Order = order;
-        }
-    }
+	public bool ShowingConfigureDialog { get; private set; }
+
+	public Pizza ConfiguringPizza { get; private set; }
+
+	public Order Order { get; private set; } = new Order();
+
+	public void ShowConfigurePizzaDialog(PizzaSpecial special)
+	{
+		ConfiguringPizza = new Pizza()
+		{
+			Special = special,
+			SpecialId = special.Id,
+			Size = Pizza.DefaultSize,
+			Toppings = new List<PizzaTopping>(),
+		};
+
+		ShowingConfigureDialog = true;
+	}
+
+	public void CancelConfigurePizzaDialog()
+	{
+		ConfiguringPizza = null;
+		ShowingConfigureDialog = false;
+	}
+
+	public void ConfirmConfigurePizzaDialog()
+	{
+		Order.Pizzas.Add(ConfiguringPizza);
+		ConfiguringPizza = null;
+
+		ShowingConfigureDialog = false;
+	}
+
+	public void RemoveConfiguredPizza(Pizza pizza)
+	{
+		Order.Pizzas.Remove(pizza);
+	}
+
+	public void ResetOrder()
+	{
+		Order = new Order();
+	}
+
+	public void ReplaceOrder(Order order)
+	{
+		Order = order;
+	}
 }
diff --git a/src/BlazingPizza.Client/OrdersClient.cs b/src/BlazingPizza.Client/OrdersClient.cs
index 01c63572..e63bd045 100644
--- a/src/BlazingPizza.Client/OrdersClient.cs
+++ b/src/BlazingPizza.Client/OrdersClient.cs
@@ -1,41 +1,36 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Threading.Tasks;
-
-namespace BlazingPizza.Client
+using System.Net.Http.Json;
+using System.Text.Json;
+
+namespace BlazingPizza.Client;
+
+public class OrdersClient
 {
-    public class OrdersClient
-    {
-        private readonly HttpClient httpClient;
+	private readonly HttpClient httpClient;
 
-        public OrdersClient(HttpClient httpClient)
-        {
-            this.httpClient = httpClient;
-        }
+	public OrdersClient(HttpClient httpClient)
+	{
+		this.httpClient = httpClient;
+	}
 
-        public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
-            await httpClient.GetFromJsonAsync<IEnumerable<OrderWithStatus>>("orders");
+	public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
+			await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
 
 
-        public async Task<OrderWithStatus> GetOrder(int orderId) =>
-            await httpClient.GetFromJsonAsync<OrderWithStatus>($"orders/{orderId}");
+	public async Task<OrderWithStatus> GetOrder(int orderId) =>
+			await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
 
 
-        public async Task<int> PlaceOrder(Order order)
-        {
-            var response = await httpClient.PostAsJsonAsync("orders", order);
-            response.EnsureSuccessStatusCode();
-            var orderId = await response.Content.ReadFromJsonAsync<int>();
-            return orderId;
-        }
+	public async Task<int> PlaceOrder(Order order)
+	{
+		var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
+		response.EnsureSuccessStatusCode();
+		var orderId = await response.Content.ReadFromJsonAsync<int>();
+		return orderId;
+	}
 
-        public async Task SubscribeToNotifications(NotificationSubscription subscription)
-        {
-            var response = await httpClient.PutAsJsonAsync("notifications/subscribe", subscription);
-            response.EnsureSuccessStatusCode();
-        }
-    }
+	public async Task SubscribeToNotifications(NotificationSubscription subscription)
+	{
+		var response = await httpClient.PutAsJsonAsync("notifications/subscribe", subscription);
+		response.EnsureSuccessStatusCode();
+	}
 }
diff --git a/src/BlazingPizza.Client/Pages/Index.razor b/src/BlazingPizza.Client/Pages/Index.razor
index ca5ac084..f8ff79df 100644
--- a/src/BlazingPizza.Client/Pages/Index.razor
+++ b/src/BlazingPizza.Client/Pages/Index.razor
@@ -61,7 +61,7 @@
 
     protected override async Task OnInitializedAsync()
     {
-        specials = await HttpClient.GetFromJsonAsync<List<PizzaSpecial>>("specials");
+        specials = await HttpClient.GetFromJsonAsync("specials", BlazingPizza.OrderContext.Default.ListPizzaSpecial);
     }
 
     async Task RemovePizza(Pizza configuredPizza)
diff --git a/src/BlazingPizza.Client/PizzaAuthenticationState.cs b/src/BlazingPizza.Client/PizzaAuthenticationState.cs
index 3f295928..f5bfef65 100644
--- a/src/BlazingPizza.Client/PizzaAuthenticationState.cs
+++ b/src/BlazingPizza.Client/PizzaAuthenticationState.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 
-namespace BlazingPizza.Client
+namespace BlazingPizza.Client;
+
+public class PizzaAuthenticationState : RemoteAuthenticationState
 {
-    public class PizzaAuthenticationState : RemoteAuthenticationState
-    {
-        public Order Order { get; set; }
-    }
+	public Order Order { get; set; }
 }
diff --git a/src/BlazingPizza.Client/Program.cs b/src/BlazingPizza.Client/Program.cs
index afeee128..41eedccb 100644
--- a/src/BlazingPizza.Client/Program.cs
+++ b/src/BlazingPizza.Client/Program.cs
@@ -1,31 +1,20 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
+using BlazingPizza.Client;
 
-namespace BlazingPizza.Client
-{
-    public class Program
-    {
-        public static async Task Main(string[] args)
-        {
-            var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("#app");
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<App>("#app");
 
-            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
-            builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
-                .AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
-            builder.Services.AddScoped<OrderState>();
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
+		.AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
+builder.Services.AddScoped<OrderState>();
 
-            // Add auth services
-            builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
-            {
-                options.AuthenticationPaths.LogOutSucceededPath = "";
-            });
+// Add auth services
+builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
+{
+	options.AuthenticationPaths.LogOutSucceededPath = "";
+});
 
-            await builder.Build().RunAsync();
-        }
-    }
-}
+await builder.Build().RunAsync();
diff --git a/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor b/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
index 67096b01..f10c7990 100644
--- a/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
+++ b/src/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
@@ -65,7 +65,7 @@
 
     protected async override Task OnInitializedAsync()
     {
-        toppings = await HttpClient.GetFromJsonAsync<List<Topping>>("toppings");
+        toppings = await HttpClient.GetFromJsonAsync("toppings", BlazingPizza.OrderContext.Default.ListTopping);
     }
 
     void ToppingSelected(ChangeEventArgs e)
diff --git a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 61ebf623..cb996b1b 100644
--- a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/src/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index f36b098e..bb84f13c 100644
--- a/src/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/src/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -1,17 +1,15 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.ComponentsLibrary
+namespace BlazingPizza.ComponentsLibrary;
+
+public static class LocalStorage
 {
-    public static class LocalStorage
-    {
-        public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-        public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-        public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
-    }
-}
+	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+}
\ No newline at end of file
diff --git a/src/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/src/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index 63006067..a8e78f2a 100644
--- a/src/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/src/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -1,13 +1,12 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Marker
 {
-    public class Marker
-    {
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public double X { get; set; }
+	public double X { get; set; }
 
-        public double Y { get; set; }
+	public double Y { get; set; }
 
-        public bool ShowPopup { get; set; }
-    }
+	public bool ShowPopup { get; set; }
 }
diff --git a/src/BlazingPizza.ComponentsLibrary/Map/Point.cs b/src/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 03841826..349046d4 100644
--- a/src/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/src/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -1,9 +1,8 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Point
 {
-    public class Point
-    {
-        public double X { get; set; }
+	public double X { get; set; }
 
-        public double Y { get; set; }
-    }
-}
+	public double Y { get; set; }
+}
\ No newline at end of file
diff --git a/src/BlazingPizza.Server/BlazingPizza.Server.csproj b/src/BlazingPizza.Server/BlazingPizza.Server.csproj
index e1e7aaef..abd2317b 100644
--- a/src/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/src/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BlazingPizza.Server/Models/AddressEntityType.cs b/src/BlazingPizza.Server/Models/AddressEntityType.cs
new file mode 100644
index 00000000..82db81b6
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/AddressEntityType.cs
@@ -0,0 +1,92 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class AddressEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Address",
+                typeof(Address),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Address).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var city = runtimeEntityType.AddProperty(
+                "City",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("City", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<City>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var line1 = runtimeEntityType.AddProperty(
+                "Line1",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var line2 = runtimeEntityType.AddProperty(
+                "Line2",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var postalCode = runtimeEntityType.AddProperty(
+                "PostalCode",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("PostalCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<PostalCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var region = runtimeEntityType.AddProperty(
+                "Region",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Region", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Region>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Address");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs b/src/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
new file mode 100644
index 00000000..1dd4563b
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
@@ -0,0 +1,114 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class DeviceFlowCodesEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes",
+                typeof(DeviceFlowCodes),
+                baseEntityType);
+
+            var userCode = runtimeEntityType.AddProperty(
+                "UserCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("UserCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<UserCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var deviceCode = runtimeEntityType.AddProperty(
+                "DeviceCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("DeviceCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<DeviceCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userCode });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deviceCode },
+                unique: true);
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DeviceCodes");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs b/src/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
new file mode 100644
index 00000000..8946b261
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>",
+                typeof(IdentityRoleClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoleClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/IdentityRoleEntityType.cs b/src/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
new file mode 100644
index 00000000..2f1fec2b
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
@@ -0,0 +1,78 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRole",
+                typeof(IdentityRole),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedName = runtimeEntityType.AddProperty(
+                "NormalizedName",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("NormalizedName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<NormalizedName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedName },
+                unique: true);
+            index.AddAnnotation("Relational:Name", "RoleNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs b/src/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
new file mode 100644
index 00000000..55418a1e
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserClaim<string>",
+                typeof(IdentityUserClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs b/src/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
new file mode 100644
index 00000000..3ca029bd
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserLoginstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserLogin<string>",
+                typeof(IdentityUserLogin<string>),
+                baseEntityType);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerKey = runtimeEntityType.AddProperty(
+                "ProviderKey",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderKey", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderKey>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerDisplayName = runtimeEntityType.AddProperty(
+                "ProviderDisplayName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderDisplayName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderDisplayName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { loginProvider, providerKey });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserLogins");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs b/src/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
new file mode 100644
index 00000000..70078d7a
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
@@ -0,0 +1,82 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserRolestringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserRole<string>",
+                typeof(IdentityUserRole<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, roleId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs b/src/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
new file mode 100644
index 00000000..93ba6d31
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
@@ -0,0 +1,84 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserTokenstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserToken<string>",
+                typeof(IdentityUserToken<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var value = runtimeEntityType.AddProperty(
+                "Value",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Value", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Value>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, loginProvider, name });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserTokens");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/KeyEntityType.cs b/src/BlazingPizza.Server/Models/KeyEntityType.cs
new file mode 100644
index 00000000..f6c6b4c7
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/KeyEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class KeyEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.Key",
+                typeof(Key),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var algorithm = runtimeEntityType.AddProperty(
+                "Algorithm",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Algorithm", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Algorithm>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var created = runtimeEntityType.AddProperty(
+                "Created",
+                typeof(DateTime),
+                propertyInfo: typeof(Key).GetProperty("Created", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Created>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var dataProtected = runtimeEntityType.AddProperty(
+                "DataProtected",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("DataProtected", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<DataProtected>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var isX509Certificate = runtimeEntityType.AddProperty(
+                "IsX509Certificate",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("IsX509Certificate", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<IsX509Certificate>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var use = runtimeEntityType.AddProperty(
+                "Use",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Use", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Use>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var version = runtimeEntityType.AddProperty(
+                "Version",
+                typeof(int),
+                propertyInfo: typeof(Key).GetProperty("Version", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Version>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { use });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Keys");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/LatLongEntityType.cs b/src/BlazingPizza.Server/Models/LatLongEntityType.cs
new file mode 100644
index 00000000..3fd254bd
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/LatLongEntityType.cs
@@ -0,0 +1,80 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class LatLongEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.LatLong",
+                typeof(LatLong),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var latitude = runtimeEntityType.AddProperty(
+                "Latitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Latitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Latitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var longitude = runtimeEntityType.AddProperty(
+                "Longitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Longitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Longitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                ownership: true);
+
+            var deliveryLocation = principalEntityType.AddNavigation("DeliveryLocation",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(LatLong),
+                propertyInfo: typeof(Order).GetProperty("DeliveryLocation", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryLocation>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs b/src/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
new file mode 100644
index 00000000..db236e4c
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
@@ -0,0 +1,77 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class NotificationSubscriptionEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.NotificationSubscription",
+                typeof(NotificationSubscription),
+                baseEntityType);
+
+            var notificationSubscriptionId = runtimeEntityType.AddProperty(
+                "NotificationSubscriptionId",
+                typeof(int),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("NotificationSubscriptionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<NotificationSubscriptionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var auth = runtimeEntityType.AddProperty(
+                "Auth",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Auth", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Auth>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var p256dh = runtimeEntityType.AddProperty(
+                "P256dh",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("P256dh", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<P256dh>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var url = runtimeEntityType.AddProperty(
+                "Url",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Url", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Url>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { notificationSubscriptionId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "NotificationSubscriptions");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/OrderEntityType.cs b/src/BlazingPizza.Server/Models/OrderEntityType.cs
new file mode 100644
index 00000000..9d9ec6fd
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/OrderEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class OrderEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Order",
+                typeof(Order),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Order).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var createdTime = runtimeEntityType.AddProperty(
+                "CreatedTime",
+                typeof(DateTime),
+                propertyInfo: typeof(Order).GetProperty("CreatedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<CreatedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var deliveryAddressId = runtimeEntityType.AddProperty(
+                "DeliveryAddressId",
+                typeof(int?),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(Order).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deliveryAddressId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("DeliveryAddressId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var deliveryAddress = declaringEntityType.AddNavigation("DeliveryAddress",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Address),
+                propertyInfo: typeof(Order).GetProperty("DeliveryAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/PersistedGrantEntityType.cs b/src/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
new file mode 100644
index 00000000..842d53a5
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
@@ -0,0 +1,127 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PersistedGrantEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.PersistedGrant",
+                typeof(PersistedGrant),
+                baseEntityType);
+
+            var key = runtimeEntityType.AddProperty(
+                "Key",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Key", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Key>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var consumedTime = runtimeEntityType.AddProperty(
+                "ConsumedTime",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ConsumedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ConsumedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(PersistedGrant).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var type = runtimeEntityType.AddProperty(
+                "Type",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Type", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Type>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var key0 = runtimeEntityType.AddKey(
+                new[] { key });
+            runtimeEntityType.SetPrimaryKey(key0);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { consumedTime });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            var index1 = runtimeEntityType.AddIndex(
+                new[] { subjectId, clientId, type });
+
+            var index2 = runtimeEntityType.AddIndex(
+                new[] { subjectId, sessionId, type });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PersistedGrants");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/PizzaEntityType.cs b/src/BlazingPizza.Server/Models/PizzaEntityType.cs
new file mode 100644
index 00000000..3a124e63
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/PizzaEntityType.cs
@@ -0,0 +1,111 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Pizza",
+                typeof(Pizza),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var size = runtimeEntityType.AddProperty(
+                "Size",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Size", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Size>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var specialId = runtimeEntityType.AddProperty(
+                "SpecialId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("SpecialId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<SpecialId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { orderId });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { specialId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var pizzas = principalEntityType.AddNavigation("Pizzas",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<Pizza>),
+                propertyInfo: typeof(Order).GetProperty("Pizzas", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<Pizzas>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("SpecialId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var special = declaringEntityType.AddNavigation("Special",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(PizzaSpecial),
+                propertyInfo: typeof(Pizza).GetProperty("Special", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Special>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Pizzas");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs b/src/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
new file mode 100644
index 00000000..e86b0f50
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
@@ -0,0 +1,76 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaSpecialEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaSpecial",
+                typeof(PizzaSpecial),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var basePrice = runtimeEntityType.AddProperty(
+                "BasePrice",
+                typeof(decimal),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("BasePrice", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<BasePrice>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var imageUrl = runtimeEntityType.AddProperty(
+                "ImageUrl",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("ImageUrl", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<ImageUrl>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Specials");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/PizzaStoreContextModel.cs b/src/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
new file mode 100644
index 00000000..8b516a68
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
@@ -0,0 +1,28 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    [DbContext(typeof(PizzaStoreContext))]
+    public partial class PizzaStoreContextModel : RuntimeModel
+    {
+        static PizzaStoreContextModel()
+        {
+            var model = new PizzaStoreContextModel();
+            model.Initialize();
+            model.Customize();
+            _instance = model;
+        }
+
+        private static PizzaStoreContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs b/src/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
new file mode 100644
index 00000000..d46f50f4
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
@@ -0,0 +1,69 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    public partial class PizzaStoreContextModel
+    {
+        partial void Initialize()
+        {
+            var address = AddressEntityType.Create(this);
+            var latLong = LatLongEntityType.Create(this);
+            var notificationSubscription = NotificationSubscriptionEntityType.Create(this);
+            var order = OrderEntityType.Create(this);
+            var pizza = PizzaEntityType.Create(this);
+            var pizzaSpecial = PizzaSpecialEntityType.Create(this);
+            var pizzaTopping = PizzaToppingEntityType.Create(this);
+            var pizzaStoreUser = PizzaStoreUserEntityType.Create(this);
+            var topping = ToppingEntityType.Create(this);
+            var deviceFlowCodes = DeviceFlowCodesEntityType.Create(this);
+            var key = KeyEntityType.Create(this);
+            var persistedGrant = PersistedGrantEntityType.Create(this);
+            var identityRole = IdentityRoleEntityType.Create(this);
+            var identityRoleClaimstring = IdentityRoleClaimstringEntityType.Create(this);
+            var identityUserClaimstring = IdentityUserClaimstringEntityType.Create(this);
+            var identityUserLoginstring = IdentityUserLoginstringEntityType.Create(this);
+            var identityUserRolestring = IdentityUserRolestringEntityType.Create(this);
+            var identityUserTokenstring = IdentityUserTokenstringEntityType.Create(this);
+
+            LatLongEntityType.CreateForeignKey1(latLong, order);
+            OrderEntityType.CreateForeignKey1(order, address);
+            PizzaEntityType.CreateForeignKey1(pizza, order);
+            PizzaEntityType.CreateForeignKey2(pizza, pizzaSpecial);
+            PizzaToppingEntityType.CreateForeignKey1(pizzaTopping, pizza);
+            PizzaToppingEntityType.CreateForeignKey2(pizzaTopping, topping);
+            IdentityRoleClaimstringEntityType.CreateForeignKey1(identityRoleClaimstring, identityRole);
+            IdentityUserClaimstringEntityType.CreateForeignKey1(identityUserClaimstring, pizzaStoreUser);
+            IdentityUserLoginstringEntityType.CreateForeignKey1(identityUserLoginstring, pizzaStoreUser);
+            IdentityUserRolestringEntityType.CreateForeignKey1(identityUserRolestring, identityRole);
+            IdentityUserRolestringEntityType.CreateForeignKey2(identityUserRolestring, pizzaStoreUser);
+            IdentityUserTokenstringEntityType.CreateForeignKey1(identityUserTokenstring, pizzaStoreUser);
+
+            AddressEntityType.CreateAnnotations(address);
+            LatLongEntityType.CreateAnnotations(latLong);
+            NotificationSubscriptionEntityType.CreateAnnotations(notificationSubscription);
+            OrderEntityType.CreateAnnotations(order);
+            PizzaEntityType.CreateAnnotations(pizza);
+            PizzaSpecialEntityType.CreateAnnotations(pizzaSpecial);
+            PizzaToppingEntityType.CreateAnnotations(pizzaTopping);
+            PizzaStoreUserEntityType.CreateAnnotations(pizzaStoreUser);
+            ToppingEntityType.CreateAnnotations(topping);
+            DeviceFlowCodesEntityType.CreateAnnotations(deviceFlowCodes);
+            KeyEntityType.CreateAnnotations(key);
+            PersistedGrantEntityType.CreateAnnotations(persistedGrant);
+            IdentityRoleEntityType.CreateAnnotations(identityRole);
+            IdentityRoleClaimstringEntityType.CreateAnnotations(identityRoleClaimstring);
+            IdentityUserClaimstringEntityType.CreateAnnotations(identityUserClaimstring);
+            IdentityUserLoginstringEntityType.CreateAnnotations(identityUserLoginstring);
+            IdentityUserRolestringEntityType.CreateAnnotations(identityUserRolestring);
+            IdentityUserTokenstringEntityType.CreateAnnotations(identityUserTokenstring);
+
+            AddAnnotation("ProductVersion", "6.0.0");
+        }
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs b/src/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
new file mode 100644
index 00000000..18b2d96d
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
@@ -0,0 +1,156 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaStoreUserEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Server.PizzaStoreUser",
+                typeof(PizzaStoreUser),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var accessFailedCount = runtimeEntityType.AddProperty(
+                "AccessFailedCount",
+                typeof(int),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("AccessFailedCount", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<AccessFailedCount>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var email = runtimeEntityType.AddProperty(
+                "Email",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Email", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Email>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var emailConfirmed = runtimeEntityType.AddProperty(
+                "EmailConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("EmailConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<EmailConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnabled = runtimeEntityType.AddProperty(
+                "LockoutEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnd = runtimeEntityType.AddProperty(
+                "LockoutEnd",
+                typeof(DateTimeOffset?),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnd", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnd>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var normalizedEmail = runtimeEntityType.AddProperty(
+                "NormalizedEmail",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedEmail", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedEmail>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedUserName = runtimeEntityType.AddProperty(
+                "NormalizedUserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedUserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedUserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var passwordHash = runtimeEntityType.AddProperty(
+                "PasswordHash",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PasswordHash", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PasswordHash>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumber = runtimeEntityType.AddProperty(
+                "PhoneNumber",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumber", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumber>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumberConfirmed = runtimeEntityType.AddProperty(
+                "PhoneNumberConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumberConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumberConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var securityStamp = runtimeEntityType.AddProperty(
+                "SecurityStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("SecurityStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<SecurityStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var twoFactorEnabled = runtimeEntityType.AddProperty(
+                "TwoFactorEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("TwoFactorEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<TwoFactorEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var userName = runtimeEntityType.AddProperty(
+                "UserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("UserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<UserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedEmail });
+            index.AddAnnotation("Relational:Name", "EmailIndex");
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { normalizedUserName },
+                unique: true);
+            index0.AddAnnotation("Relational:Name", "UserNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUsers");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/PizzaToppingEntityType.cs b/src/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
new file mode 100644
index 00000000..b97d2a24
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaTopping",
+                typeof(PizzaTopping),
+                baseEntityType);
+
+            var pizzaId = runtimeEntityType.AddProperty(
+                "PizzaId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("PizzaId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<PizzaId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var toppingId = runtimeEntityType.AddProperty(
+                "ToppingId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("ToppingId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<ToppingId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { pizzaId, toppingId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { toppingId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PizzaId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var toppings = principalEntityType.AddNavigation("Toppings",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<PizzaTopping>),
+                propertyInfo: typeof(Pizza).GetProperty("Toppings", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Toppings>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("ToppingId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var topping = declaringEntityType.AddNavigation("Topping",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Topping),
+                propertyInfo: typeof(PizzaTopping).GetProperty("Topping", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<Topping>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PizzaTopping");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/Models/ToppingEntityType.cs b/src/BlazingPizza.Server/Models/ToppingEntityType.cs
new file mode 100644
index 00000000..9295f9bf
--- /dev/null
+++ b/src/BlazingPizza.Server/Models/ToppingEntityType.cs
@@ -0,0 +1,62 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class ToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Topping",
+                typeof(Topping),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Topping).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Topping).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var price = runtimeEntityType.AddProperty(
+                "Price",
+                typeof(decimal),
+                propertyInfo: typeof(Topping).GetProperty("Price", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Price>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Toppings");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/src/BlazingPizza.Server/NotificationsController.cs b/src/BlazingPizza.Server/NotificationsController.cs
deleted file mode 100644
index bb3b96ff..00000000
--- a/src/BlazingPizza.Server/NotificationsController.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("notifications")]
-    [ApiController]
-    [Authorize]
-    public class NotificationsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public NotificationsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpPut("subscribe")]
-        public async Task<NotificationSubscription> Subscribe(NotificationSubscription subscription)
-        {
-            // We're storing at most one subscription per user, so delete old ones.
-            // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-            var userId = GetUserId();
-            var oldSubscriptions = _db.NotificationSubscriptions.Where(e => e.UserId == userId);
-            _db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
-
-            // Store new subscription
-            subscription.UserId = userId;
-            _db.NotificationSubscriptions.Attach(subscription);
-
-            await _db.SaveChangesAsync();
-            return subscription;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-    }
-}
diff --git a/src/BlazingPizza.Server/OidcConfigurationController.cs b/src/BlazingPizza.Server/OidcConfigurationController.cs
index c074debf..dc75ecb3 100644
--- a/src/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/src/BlazingPizza.Server/OidcConfigurationController.cs
@@ -1,26 +1,21 @@
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class OidcConfigurationController : Controller
 {
-    public class OidcConfigurationController : Controller
-    {
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-        {
-            ClientRequestParametersProvider = clientRequestParametersProvider;
-        }
+	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+	{
+		ClientRequestParametersProvider = clientRequestParametersProvider;
+	}
 
-        public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-        [HttpGet("_configuration/{clientId}")]
-        public IActionResult GetClientRequestParameters([FromRoute]string clientId)
-        {
-            var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-            return Ok(parameters);
-        }
-    }
+	[HttpGet("_configuration/{clientId}")]
+	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+	{
+		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+		return Ok(parameters);
+	}
 }
diff --git a/src/BlazingPizza.Server/OrdersController.cs b/src/BlazingPizza.Server/OrdersController.cs
index bab775e4..1859decd 100644
--- a/src/BlazingPizza.Server/OrdersController.cs
+++ b/src/BlazingPizza.Server/OrdersController.cs
@@ -1,135 +1,130 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
+using System.Security.Claims;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using WebPush;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+[Route("orders")]
+[ApiController]
+[Authorize]
+public class OrdersController : Controller
 {
-    [Route("orders")]
-    [ApiController]
-    [Authorize]
-    public class OrdersController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public OrdersController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-        {
-            var orders = await _db.Orders
-                .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .OrderByDescending(o => o.CreatedTime)
-                .ToListAsync();
-
-            return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-        }
-
-        [HttpGet("{orderId}")]
-        public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-        {
-            var order = await _db.Orders
-                .Where(o => o.OrderId == orderId)
-                .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .SingleOrDefaultAsync();
-
-            if (order == null)
-            {
-                return NotFound();
-            }
-
-            return OrderWithStatus.FromOrder(order);
-        }
-
-        [HttpPost]
-        public async Task<ActionResult<int>> PlaceOrder(Order order)
-        {
-            order.CreatedTime = DateTime.Now;
-            order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-            order.UserId = GetUserId();
-
-            // Enforce existence of Pizza.SpecialId and Topping.ToppingId
-            // in the database - prevent the submitter from making up
-            // new specials and toppings
-            foreach (var pizza in order.Pizzas)
-            {
-                pizza.SpecialId = pizza.Special.Id;
-                pizza.Special = null;
-
-                foreach (var topping in pizza.Toppings)
-                {
-                    topping.ToppingId = topping.Topping.Id;
-                    topping.Topping = null;
-                }
-            }
-
-            _db.Orders.Attach(order);
-            await _db.SaveChangesAsync();
-
-            // In the background, send push notifications if possible
-            var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-            if (subscription != null)
-            {
-                _ = TrackAndSendNotificationsAsync(order, subscription);
-            }
-
-            return order.OrderId;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-
-        private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-        {
-            // In a realistic case, some other backend process would track
-            // order delivery progress and send us notifications when it
-            // changes. Since we don't have any such process here, fake it.
-            await Task.Delay(OrderWithStatus.PreparationDuration);
-            await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-            await Task.Delay(OrderWithStatus.DeliveryDuration);
-            await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-        }
-
-        private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-        {
-            // For a real application, generate your own
-            var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
-            var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
-
-            var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
-            var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
-            var webPushClient = new WebPushClient();
-            try
-            {
-                var payload = JsonSerializer.Serialize(new
-                {
-                    message,
-                    url = $"myorders/{order.OrderId}",
-                });
-                await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
-            }
-            catch (Exception ex)
-            {
-                Console.Error.WriteLine("Error sending push notification: " + ex.Message);
-            }
-        }
-    }
+	private readonly PizzaStoreContext _db;
+
+	public OrdersController(PizzaStoreContext db)
+	{
+		_db = db;
+	}
+
+	[HttpGet]
+	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+	{
+		var orders = await _db.Orders
+				.Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.OrderByDescending(o => o.CreatedTime)
+				.ToListAsync();
+
+		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+	}
+
+	[HttpGet("{orderId}")]
+	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+	{
+		var order = await _db.Orders
+				.Where(o => o.OrderId == orderId)
+				.Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.SingleOrDefaultAsync();
+
+		if (order == null)
+		{
+			return NotFound();
+		}
+
+		return OrderWithStatus.FromOrder(order);
+	}
+
+	[HttpPost]
+	public async Task<ActionResult<int>> PlaceOrder(Order order)
+	{
+		order.CreatedTime = DateTime.Now;
+		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+		order.UserId = GetUserId();
+
+		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
+		// in the database - prevent the submitter from making up
+		// new specials and toppings
+		foreach (var pizza in order.Pizzas)
+		{
+			pizza.SpecialId = pizza.Special.Id;
+			pizza.Special = null;
+
+			foreach (var topping in pizza.Toppings)
+			{
+				topping.ToppingId = topping.Topping.Id;
+				topping.Topping = null;
+			}
+		}
+
+		_db.Orders.Attach(order);
+		await _db.SaveChangesAsync();
+
+		// In the background, send push notifications if possible
+		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+		if (subscription != null)
+		{
+			_ = TrackAndSendNotificationsAsync(order, subscription);
+		}
+
+		return order.OrderId;
+	}
+
+	private string GetUserId()
+	{
+		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+	{
+		// In a realistic case, some other backend process would track
+		// order delivery progress and send us notifications when it
+		// changes. Since we don't have any such process here, fake it.
+		await Task.Delay(OrderWithStatus.PreparationDuration);
+		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+		await Task.Delay(OrderWithStatus.DeliveryDuration);
+		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+	}
+
+	private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+	{
+		// For a real application, generate your own
+		var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
+		var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
+
+		var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
+		var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
+		var webPushClient = new WebPushClient();
+		try
+		{
+			var payload = JsonSerializer.Serialize(new
+			{
+				message,
+				url = $"myorders/{order.OrderId}",
+			});
+			await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
+		}
+		catch (Exception ex)
+		{
+			Console.Error.WriteLine("Error sending push notification: " + ex.Message);
+		}
+	}
 }
diff --git a/src/BlazingPizza.Server/PizzaApiExtensions.cs b/src/BlazingPizza.Server/PizzaApiExtensions.cs
new file mode 100644
index 00000000..bf6b7bde
--- /dev/null
+++ b/src/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -0,0 +1,60 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
+
+namespace BlazingPizza.Server;
+
+public static class PizzaApiExtensions
+{
+
+	public static WebApplication MapPizzaApi(this WebApplication app)
+	{
+
+		// Subscribe to notifications
+		app.MapPut("/notifications/subscribe", [Authorize] async (
+			HttpContext context,
+			PizzaStoreContext db,
+			NotificationSubscription subscription) =>
+		{
+
+			// We're storing at most one subscription per user, so delete old ones.
+			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+			var userId = GetUserId(context);
+			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+
+			// Store new subscription
+			subscription.UserId = userId;
+			db.NotificationSubscriptions.Attach(subscription);
+
+			await db.SaveChangesAsync();
+			return Results.Ok(subscription);
+
+		});
+
+		// Specials
+		app.MapGet("/specials", async (PizzaStoreContext db) =>
+		{
+
+			var specials = await db.Specials.ToListAsync();
+			return Results.Ok(specials);
+
+		});
+
+		// Toppings
+		app.MapGet("/toppings", async (PizzaStoreContext db) =>
+		{
+			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+			return Results.Ok(toppings);
+		});
+
+		return app;
+
+	}
+
+	private static string GetUserId(HttpContext context)
+	{
+		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+}
\ No newline at end of file
diff --git a/src/BlazingPizza.Server/PizzaStoreContext.cs b/src/BlazingPizza.Server/PizzaStoreContext.cs
index 7fa06430..992baa19 100644
--- a/src/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/src/BlazingPizza.Server/PizzaStoreContext.cs
@@ -3,37 +3,36 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-    public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
-    {
-        public PizzaStoreContext(
-            DbContextOptions options,
-            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-        {
-        }
+	public PizzaStoreContext(
+			DbContextOptions options,
+			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+	{
+	}
 
-        public DbSet<Order> Orders { get; set; }
+	public DbSet<Order> Orders { get; set; }
 
-        public DbSet<Pizza> Pizzas { get; set; }
+	public DbSet<Pizza> Pizzas { get; set; }
 
-        public DbSet<PizzaSpecial> Specials { get; set; }
+	public DbSet<PizzaSpecial> Specials { get; set; }
 
-        public DbSet<Topping> Toppings { get; set; }
+	public DbSet<Topping> Toppings { get; set; }
 
-        public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
+	protected override void OnModelCreating(ModelBuilder modelBuilder)
+	{
+		base.OnModelCreating(modelBuilder);
 
-            // Configuring a many-to-many special -> topping relationship that is friendly for serialization
-            modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-            modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-            modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
+		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-            // Inline the Lat-Long pairs in Order rather than having a FK to another table
-            modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-        }
-    }
+		// Inline the Lat-Long pairs in Order rather than having a FK to another table
+		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+	}
 }
diff --git a/src/BlazingPizza.Server/PizzaStoreUser.cs b/src/BlazingPizza.Server/PizzaStoreUser.cs
index 171ce83d..7ab40235 100644
--- a/src/BlazingPizza.Server/PizzaStoreUser.cs
+++ b/src/BlazingPizza.Server/PizzaStoreUser.cs
@@ -1,8 +1,5 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace BlazingPizza.Server
-{
-    public class PizzaStoreUser : IdentityUser
-    {
-    }
-}
\ No newline at end of file
+namespace BlazingPizza.Server;
+
+public class PizzaStoreUser : IdentityUser { }
\ No newline at end of file
diff --git a/src/BlazingPizza.Server/PizzasController.cs b/src/BlazingPizza.Server/PizzasController.cs
deleted file mode 100644
index c082552c..00000000
--- a/src/BlazingPizza.Server/PizzasController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("pizzas")]
-    [ApiController]
-    public class PizzasController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public PizzasController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-    }
-}
diff --git a/src/BlazingPizza.Server/Program.cs b/src/BlazingPizza.Server/Program.cs
index 40a47641..4484d8f7 100644
--- a/src/BlazingPizza.Server/Program.cs
+++ b/src/BlazingPizza.Server/Program.cs
@@ -1,33 +1,67 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.EntityFrameworkCore;
+using BlazingPizza.Server;
 
-namespace BlazingPizza.Server
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddControllersWithViews()
+	.AddJsonOptions(options =>  {
+		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+	});
+builder.Services.AddRazorPages();
+
+builder.Services.AddDbContext<PizzaStoreContext>(options =>
+		options.UseSqlite("Data Source=pizza.db")
+			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+
+builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
+		.AddEntityFrameworkStores<PizzaStoreContext>();
+
+builder.Services.AddIdentityServer()
+		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+
+builder.Services.AddAuthentication()
+		.AddIdentityServerJwt();
+
+var app = builder.Build();
+
+// Initialize the database
+var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
+using (var scope = scopeFactory.CreateScope())
+{
+	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+	if (db.Database.EnsureCreated())
+	{
+		SeedData.Initialize(db);
+	}
+}
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseWebAssemblyDebugging();
+}
+else
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var host = CreateHostBuilder(args).Build();
-
-            // Initialize the database
-            var scopeFactory = host.Services.GetRequiredService<IServiceScopeFactory>();
-            using (var scope = scopeFactory.CreateScope())
-            {
-                var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-                if (db.Database.EnsureCreated())
-                {
-                    SeedData.Initialize(db);
-                }
-            }
-
-            host.Run();
-        }
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+    app.UseExceptionHandler("/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
 }
+
+app.UseHttpsRedirection();
+app.UseBlazorFrameworkFiles();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseIdentityServer();
+app.UseAuthorization();
+
+app.MapPizzaApi();
+
+app.MapRazorPages();
+app.MapControllers();
+app.MapFallbackToFile("index.html");
+
+app.Run();
\ No newline at end of file
diff --git a/src/BlazingPizza.Server/SeedData.cs b/src/BlazingPizza.Server/SeedData.cs
index 7c86a5b2..a1e47973 100644
--- a/src/BlazingPizza.Server/SeedData.cs
+++ b/src/BlazingPizza.Server/SeedData.cs
@@ -1,193 +1,192 @@
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public static class SeedData
 {
-    public static class SeedData
-    {
-        public static void Initialize(PizzaStoreContext db)
-        {
-            var toppings = new Topping[]
-            {
-                new Topping()
-                {
-                    Name = "Extra cheese",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "American bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "British bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Canadian bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Tea and crumpets",
-                    Price = 5.00m
-                },
-                new Topping()
-                {
-                    Name = "Fresh-baked scones",
-                    Price = 4.50m,
-                },
-                new Topping()
-                {
-                    Name = "Bell peppers",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Onions",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Mushrooms",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Pepperoni",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Duck sausage",
-                    Price = 3.20m,
-                },
-                new Topping()
-                {
-                    Name = "Venison meatballs",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "Served on a silver platter",
-                    Price = 250.99m,
-                },
-                new Topping()
-                {
-                    Name = "Lobster on top",
-                    Price = 64.50m,
-                },
-                new Topping()
-                {
-                    Name = "Sturgeon caviar",
-                    Price = 101.75m,
-                },
-                new Topping()
-                {
-                    Name = "Artichoke hearts",
-                    Price = 3.40m,
-                },
-                new Topping()
-                {
-                    Name = "Fresh tomatoes",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Basil",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Steak (medium-rare)",
-                    Price = 8.50m,
-                },
-                new Topping()
-                {
-                    Name = "Blazing hot peppers",
-                    Price = 4.20m,
-                },
-                new Topping()
-                {
-                    Name = "Buffalo chicken",
-                    Price = 5.00m,
-                },
-                new Topping()
-                {
-                    Name = "Blue cheese",
-                    Price = 2.50m,
-                },
-            };
+	public static void Initialize(PizzaStoreContext db)
+	{
+		var toppings = new Topping[]
+		{
+			new Topping()
+			{
+					Name = "Extra cheese",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "American bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "British bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Canadian bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Tea and crumpets",
+					Price = 5.00m
+			},
+			new Topping()
+			{
+					Name = "Fresh-baked scones",
+					Price = 4.50m,
+			},
+			new Topping()
+			{
+					Name = "Bell peppers",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Onions",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Mushrooms",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Pepperoni",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Duck sausage",
+					Price = 3.20m,
+			},
+			new Topping()
+			{
+					Name = "Venison meatballs",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "Served on a silver platter",
+					Price = 250.99m,
+			},
+			new Topping()
+			{
+					Name = "Lobster on top",
+					Price = 64.50m,
+			},
+			new Topping()
+			{
+					Name = "Sturgeon caviar",
+					Price = 101.75m,
+			},
+			new Topping()
+			{
+					Name = "Artichoke hearts",
+					Price = 3.40m,
+			},
+			new Topping()
+			{
+					Name = "Fresh tomatoes",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Basil",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Steak (medium-rare)",
+					Price = 8.50m,
+			},
+			new Topping()
+			{
+					Name = "Blazing hot peppers",
+					Price = 4.20m,
+			},
+			new Topping()
+			{
+					Name = "Buffalo chicken",
+					Price = 5.00m,
+			},
+			new Topping()
+			{
+					Name = "Blue cheese",
+					Price = 2.50m,
+			},
+		};
 
-            var specials = new PizzaSpecial[]
-            {
-                new PizzaSpecial()
-                {
-                    Name = "Basic Cheese Pizza",
-                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/cheese.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 2,
-                    Name = "The Baconatorizor",
-                    Description = "It has EVERY kind of bacon",
-                    BasePrice = 11.99m,
-                    ImageUrl = "img/pizzas/bacon.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 3,
-                    Name = "Classic pepperoni",
-                    Description = "It's the pizza you grew up with, but Blazing hot!",
-                    BasePrice = 10.50m,
-                    ImageUrl = "img/pizzas/pepperoni.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 4,
-                    Name = "Buffalo chicken",
-                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-                    BasePrice = 12.75m,
-                    ImageUrl = "img/pizzas/meaty.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 5,
-                    Name = "Mushroom Lovers",
-                    Description = "It has mushrooms. Isn't that obvious?",
-                    BasePrice = 11.00m,
-                    ImageUrl = "img/pizzas/mushroom.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 6,
-                    Name = "The Brit",
-                    Description = "When in London...",
-                    BasePrice = 10.25m,
-                    ImageUrl = "img/pizzas/brit.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 7,
-                    Name = "Veggie Delight",
-                    Description = "It's like salad, but on a pizza",
-                    BasePrice = 11.50m,
-                    ImageUrl = "img/pizzas/salad.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 8,
-                    Name = "Margherita",
-                    Description = "Traditional Italian pizza with tomatoes and basil",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/margherita.jpg",
-                },
-            };
+		var specials = new PizzaSpecial[]
+		{
+			new PizzaSpecial()
+			{
+					Name = "Basic Cheese Pizza",
+					Description = "It's cheesy and delicious. Why wouldn't you want one?",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/cheese.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 2,
+					Name = "The Baconatorizor",
+					Description = "It has EVERY kind of bacon",
+					BasePrice = 11.99m,
+					ImageUrl = "img/pizzas/bacon.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 3,
+					Name = "Classic pepperoni",
+					Description = "It's the pizza you grew up with, but Blazing hot!",
+					BasePrice = 10.50m,
+					ImageUrl = "img/pizzas/pepperoni.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 4,
+					Name = "Buffalo chicken",
+					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+					BasePrice = 12.75m,
+					ImageUrl = "img/pizzas/meaty.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 5,
+					Name = "Mushroom Lovers",
+					Description = "It has mushrooms. Isn't that obvious?",
+					BasePrice = 11.00m,
+					ImageUrl = "img/pizzas/mushroom.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 6,
+					Name = "The Brit",
+					Description = "When in London...",
+					BasePrice = 10.25m,
+					ImageUrl = "img/pizzas/brit.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 7,
+					Name = "Veggie Delight",
+					Description = "It's like salad, but on a pizza",
+					BasePrice = 11.50m,
+					ImageUrl = "img/pizzas/salad.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 8,
+					Name = "Margherita",
+					Description = "Traditional Italian pizza with tomatoes and basil",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/margherita.jpg",
+			},
+		};
 
-            db.Toppings.AddRange(toppings);
-            db.Specials.AddRange(specials);
-            db.SaveChanges();
-        }
-    }
-}
+		db.Toppings.AddRange(toppings);
+		db.Specials.AddRange(specials);
+		db.SaveChanges();
+	}
+}
\ No newline at end of file
diff --git a/src/BlazingPizza.Server/SpecialsController.cs b/src/BlazingPizza.Server/SpecialsController.cs
deleted file mode 100644
index 9c253eb6..00000000
--- a/src/BlazingPizza.Server/SpecialsController.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("specials")]
-    [ApiController]
-    public class SpecialsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public SpecialsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()
-        {
-            return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();
-        }
-    }
-}
diff --git a/src/BlazingPizza.Server/Startup.cs b/src/BlazingPizza.Server/Startup.cs
deleted file mode 100644
index 053acade..00000000
--- a/src/BlazingPizza.Server/Startup.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace BlazingPizza.Server
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllersWithViews();
-            services.AddRazorPages();
-
-            services.AddDbContext<PizzaStoreContext>(options =>
-                options.UseSqlite("Data Source=pizza.db"));
-
-            services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-                .AddEntityFrameworkStores<PizzaStoreContext>();
-
-            services.AddIdentityServer()
-                .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
-
-            services.AddAuthentication()
-                .AddIdentityServerJwt();
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                app.UseWebAssemblyDebugging();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Error");
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
-
-            app.UseHttpsRedirection();
-            app.UseBlazorFrameworkFiles();
-            app.UseStaticFiles();
-
-            app.UseRouting();
-
-            app.UseAuthentication();
-            app.UseIdentityServer();
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapRazorPages();
-                endpoints.MapControllers();
-                endpoints.MapFallbackToFile("index.html");
-            });
-        }
-    }
-}
diff --git a/src/BlazingPizza.Server/ToppingsController.cs b/src/BlazingPizza.Server/ToppingsController.cs
deleted file mode 100644
index 6a677639..00000000
--- a/src/BlazingPizza.Server/ToppingsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("toppings")]
-    [ApiController]
-    public class ToppingsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public ToppingsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<Topping>>> GetToppings()
-        {
-            return await _db.Toppings.OrderBy(t => t.Name).ToListAsync();
-        }
-    }
-}
diff --git a/src/BlazingPizza.Shared/Address.cs b/src/BlazingPizza.Shared/Address.cs
index d76bc52a..79be9c5b 100644
--- a/src/BlazingPizza.Shared/Address.cs
+++ b/src/BlazingPizza.Shared/Address.cs
@@ -1,27 +1,24 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class Address
 {
-    public class Address
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        [Required, MaxLength(100)]
-        public string Name { get; set; }
+	[Required, MaxLength(100)]
+	public string Name { get; set; }
 
-        [Required, MaxLength(100)]
-        public string Line1 { get; set; }
+	[Required, MaxLength(100)]
+	public string Line1 { get; set; }
 
-        [MaxLength(100)]
-        public string Line2 { get; set; }
+	[MaxLength(100)]
+	public string Line2 { get; set; }
 
-        [Required, MaxLength(50)]
-        public string City { get; set; }
+	[Required, MaxLength(50)]
+	public string City { get; set; }
 
-        [Required, MaxLength(20)]
-        public string Region { get; set; }
+	[Required, MaxLength(20)]
+	public string Region { get; set; }
 
-        [Required, MaxLength(20)]
-        public string PostalCode { get; set; }
-    }
+	[Required, MaxLength(20)]
+	public string PostalCode { get; set; }
 }
diff --git a/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index f7b7dd02..fb17e53b 100644
--- a/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/src/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -3,8 +3,13 @@
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
+	<ItemGroup>
+		<Using Include="System.ComponentModel.DataAnnotations" />
+	</ItemGroup>
+	
   <ItemGroup>
     <ProjectReference Include="..\BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj" />
   </ItemGroup>
diff --git a/src/BlazingPizza.Shared/LatLong.cs b/src/BlazingPizza.Shared/LatLong.cs
index 9b8c3811..14a94c26 100644
--- a/src/BlazingPizza.Shared/LatLong.cs
+++ b/src/BlazingPizza.Shared/LatLong.cs
@@ -1,27 +1,26 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class LatLong
 {
-    public class LatLong
-    {
-        public LatLong()
-        {
-        }
+	public LatLong()
+	{
+	}
 
-        public LatLong(double latitude, double longitude) : this()
-        {
-            Latitude = latitude;
-            Longitude = longitude;
-        }
+	public LatLong(double latitude, double longitude) : this()
+	{
+		Latitude = latitude;
+		Longitude = longitude;
+	}
 
-        public double Latitude { get; set; }
+	public double Latitude { get; set; }
 
-        public double Longitude { get; set; }
+	public double Longitude { get; set; }
 
-        public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-        {
-            // The Earth is flat, right? So no need for spherical interpolation.
-            return new LatLong(
-                start.Latitude + (end.Latitude - start.Latitude) * proportion,
-                start.Longitude + (end.Longitude - start.Longitude) * proportion);
-        }
-    }
-}
+	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+	{
+		// The Earth is flat, right? So no need for spherical interpolation.
+		return new LatLong(
+				start.Latitude + (end.Latitude - start.Latitude) * proportion,
+				start.Longitude + (end.Longitude - start.Longitude) * proportion);
+	}
+}
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/NotificationSubscription.cs b/src/BlazingPizza.Shared/NotificationSubscription.cs
index 04259c2f..9109ff57 100644
--- a/src/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/src/BlazingPizza.Shared/NotificationSubscription.cs
@@ -1,17 +1,14 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class NotificationSubscription
 {
-    public class NotificationSubscription
-    {
-        public int NotificationSubscriptionId { get; set; }
+	public int NotificationSubscriptionId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public string Url { get; set; }
+	public string Url { get; set; }
 
-        public string P256dh { get; set; }
+	public string P256dh { get; set; }
 
-        public string Auth { get; set; }
-    }
+	public string Auth { get; set; }
 }
diff --git a/src/BlazingPizza.Shared/Order.cs b/src/BlazingPizza.Shared/Order.cs
index fb003bd6..aca04ca1 100644
--- a/src/BlazingPizza.Shared/Order.cs
+++ b/src/BlazingPizza.Shared/Order.cs
@@ -1,25 +1,32 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Order
 {
-    public class Order
-    {
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public DateTime CreatedTime { get; set; }
+	public DateTime CreatedTime { get; set; }
 
-        public Address DeliveryAddress { get; set; } = new Address();
+	public Address DeliveryAddress { get; set; } = new Address();
 
-        public LatLong DeliveryLocation { get; set; }
+	public LatLong DeliveryLocation { get; set; }
 
-        public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-        public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-        public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
-    }
+	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(Order))]
+[JsonSerializable(typeof(OrderWithStatus))]
+[JsonSerializable(typeof(List<OrderWithStatus>))]
+[JsonSerializable(typeof(Pizza))]
+[JsonSerializable(typeof(List<PizzaSpecial>))]
+[JsonSerializable(typeof(List<Topping>))]
+[JsonSerializable(typeof(Topping))]
+public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/OrderWithStatus.cs b/src/BlazingPizza.Shared/OrderWithStatus.cs
index 021de78c..f5f153b6 100644
--- a/src/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/src/BlazingPizza.Shared/OrderWithStatus.cs
@@ -1,79 +1,78 @@
-using BlazingPizza.ComponentsLibrary.Map;
-using System;
-using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using BlazingPizza.ComponentsLibrary.Map;
 
-namespace BlazingPizza
+
+namespace BlazingPizza;
+
+public class OrderWithStatus
 {
-    public class OrderWithStatus
-    {
-        public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-        public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-        public Order Order { get; set; }
+	public Order Order { get; set; }
 
-        public string StatusText { get; set; }
+	public string StatusText { get; set; }
 
-        public bool IsDelivered => StatusText == "Delivered";
+	public bool IsDelivered => StatusText == "Delivered";
 
-        public List<Marker> MapMarkers { get; set; }
+	public List<Marker> MapMarkers { get; set; }
 
-        public static OrderWithStatus FromOrder(Order order)
-        {
-            // To simulate a real backend process, we fake status updates based on the amount
-            // of time since the order was placed
-            string statusText;
-            List<Marker> mapMarkers;
-            var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+	public static OrderWithStatus FromOrder(Order order)
+	{
+		// To simulate a real backend process, we fake status updates based on the amount
+		// of time since the order was placed
+		string statusText;
+		List<Marker> mapMarkers;
+		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-            if (DateTime.Now < dispatchTime)
-            {
-                statusText = "Preparing";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-                };
-            }
-            else if (DateTime.Now < dispatchTime + DeliveryDuration)
-            {
-                statusText = "Out for delivery";
+		if (DateTime.Now < dispatchTime)
+		{
+			statusText = "Preparing";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+								};
+		}
+		else if (DateTime.Now < dispatchTime + DeliveryDuration)
+		{
+			statusText = "Out for delivery";
 
-                var startPosition = ComputeStartPosition(order);
-                var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-                var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation),
-                    ToMapMarker("Driver", driverPosition, showPopup: true),
-                };
-            }
-            else
-            {
-                statusText = "Delivered";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-                };
-            }
+			var startPosition = ComputeStartPosition(order);
+			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation),
+										ToMapMarker("Driver", driverPosition, showPopup: true),
+								};
+		}
+		else
+		{
+			statusText = "Delivered";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+								};
+		}
 
-            return new OrderWithStatus
-            {
-                Order = order,
-                StatusText = statusText,
-                MapMarkers = mapMarkers,
-            };
-        }
+		return new OrderWithStatus
+		{
+			Order = order,
+			StatusText = statusText,
+			MapMarkers = mapMarkers,
+		};
+	}
 
-        private static LatLong ComputeStartPosition(Order order)
-        {
-            // Random but deterministic based on order ID
-            var rng = new Random(order.OrderId);
-            var distance = 0.01 + rng.NextDouble() * 0.02;
-            var angle = rng.NextDouble() * Math.PI * 2;
-            var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-            return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-        }
+	private static LatLong ComputeStartPosition(Order order)
+	{
+		// Random but deterministic based on order ID
+		var rng = new Random(order.OrderId);
+		var distance = 0.01 + rng.NextDouble() * 0.02;
+		var angle = rng.NextDouble() * Math.PI * 2;
+		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+	}
 
-        static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
-    }
-}
+	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+}
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/Pizza.cs b/src/BlazingPizza.Shared/Pizza.cs
index ec1108a9..459298f4 100644
--- a/src/BlazingPizza.Shared/Pizza.cs
+++ b/src/BlazingPizza.Shared/Pizza.cs
@@ -1,42 +1,44 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+///    /// Represents a customized pizza as part of an order
+/// </summary>
+public class Pizza
 {
-    /// <summary>
-    /// Represents a customized pizza as part of an order
-    /// </summary>
-    public class Pizza
-    {
-        public const int DefaultSize = 12;
-        public const int MinimumSize = 9;
-        public const int MaximumSize = 17;
+	public const int DefaultSize = 12;
+	public const int MinimumSize = 9;
+	public const int MaximumSize = 17;
 
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public PizzaSpecial Special { get; set; }
+	public PizzaSpecial Special { get; set; }
 
-        public int SpecialId { get; set; }
+	public int SpecialId { get; set; }
 
-        public int Size { get; set; }
+	public int Size { get; set; }
 
-        public List<PizzaTopping> Toppings { get; set; }
+	public List<PizzaTopping> Toppings { get; set; }
 
-        public decimal GetBasePrice()
-        {
-            return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-        }
+	public decimal GetBasePrice()
+	{
+		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+	}
 
-        public decimal GetTotalPrice()
-        {
-            return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-        }
+	public decimal GetTotalPrice()
+	{
+		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+	}
 
-        public string GetFormattedTotalPrice()
-        {
-            return GetTotalPrice().ToString("0.00");
-        }
-    }
+	public string GetFormattedTotalPrice()
+	{
+		return GetTotalPrice().ToString("0.00");
+	}
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
+[JsonSerializable(typeof(Pizza))]
+public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/PizzaSpecial.cs b/src/BlazingPizza.Shared/PizzaSpecial.cs
index 2f2b3383..9653300c 100644
--- a/src/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/src/BlazingPizza.Shared/PizzaSpecial.cs
@@ -1,20 +1,19 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+/// Represents a pre-configured template for a pizza a user can order
+/// </summary>
+public class PizzaSpecial
 {
-    /// <summary>
-    /// Represents a pre-configured template for a pizza a user can order
-    /// </summary>
-    public class PizzaSpecial
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal BasePrice { get; set; }
+	public decimal BasePrice { get; set; }
 
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public string ImageUrl { get; set; }
+	public string ImageUrl { get; set; }
 
-        public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
-    }
-}
+	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+}
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/PizzaTopping.cs b/src/BlazingPizza.Shared/PizzaTopping.cs
index f5a6c1ac..0a711647 100644
--- a/src/BlazingPizza.Shared/PizzaTopping.cs
+++ b/src/BlazingPizza.Shared/PizzaTopping.cs
@@ -1,11 +1,11 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class PizzaTopping
 {
-    public class PizzaTopping
-    {
-        public Topping Topping { get; set; }
+	public Topping Topping { get; set; }
+
+	public int ToppingId { get; set; }
 
-        public int ToppingId { get; set; }
-        
-        public int PizzaId { get; set; }
-    }
-}
+	public int PizzaId { get; set; }
+	
+}
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/Topping.cs b/src/BlazingPizza.Shared/Topping.cs
index 61bdeb92..376c311a 100644
--- a/src/BlazingPizza.Shared/Topping.cs
+++ b/src/BlazingPizza.Shared/Topping.cs
@@ -1,13 +1,13 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Topping
 {
-    public class Topping
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal Price { get; set; }
+	public decimal Price { get; set; }
 
-        public string GetFormattedPrice() => Price.ToString("0.00");
-    }
-}
+	public string GetFormattedPrice() => Price.ToString("0.00");
+	
+}
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/UserInfo.cs b/src/BlazingPizza.Shared/UserInfo.cs
index 4996ef80..362f8f8e 100644
--- a/src/BlazingPizza.Shared/UserInfo.cs
+++ b/src/BlazingPizza.Shared/UserInfo.cs
@@ -1,9 +1,9 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class UserInfo
 {
-    public class UserInfo
-    {
-        public bool IsAuthenticated { get; set; }
+	public bool IsAuthenticated { get; set; }
 
-        public string Name { get; set; }
-    }
-}
+	public string Name { get; set; }
+	
+}
\ No newline at end of file

From a5464670195968fa169b320a127f872cdd09f8f4 Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Fritz" <csharpfritz@users.noreply.github.com>
Date: Fri, 28 Jan 2022 17:44:38 -0500
Subject: [PATCH 10/20] Finished savepoint 0 and 1

---
 .../BlazingPizza.Shared/Address.cs            |  27 +-
 .../BlazingPizza.Shared.csproj                |   5 +
 .../BlazingPizza.Shared/LatLong.cs            |  43 +-
 .../NotificationSubscription.cs               |  17 +-
 .../BlazingPizza.Shared/Order.cs              |  37 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 133 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  62 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  27 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |  18 +-
 .../BlazingPizza.Shared/Topping.cs            |  18 +-
 .../BlazingPizza.Shared/UserInfo.cs           |  14 +-
 .../BlazingPizza.Client.csproj                |   1 +
 .../BlazingPizza.Client/Pages/Index.razor     |   2 +-
 .../BlazingPizza.Client/Program.cs            |  24 +-
 .../BlazingPizza.ComponentsLibrary.csproj     |   1 +
 .../LocalStorage.cs                           |  22 +-
 .../BlazingPizza.Server.csproj                |   1 +
 .../Models/AddressEntityType.cs               |  92 +++++
 .../Models/DeviceFlowCodesEntityType.cs       | 114 ++++++
 .../IdentityRoleClaimstringEntityType.cs      |  85 ++++
 .../Models/IdentityRoleEntityType.cs          |  78 ++++
 .../IdentityUserClaimstringEntityType.cs      |  85 ++++
 .../IdentityUserLoginstringEntityType.cs      |  86 ++++
 .../IdentityUserRolestringEntityType.cs       |  82 ++++
 .../IdentityUserTokenstringEntityType.cs      |  84 ++++
 .../Models/KeyEntityType.cs                   |  96 +++++
 .../Models/LatLongEntityType.cs               |  80 ++++
 .../NotificationSubscriptionEntityType.cs     |  77 ++++
 .../Models/OrderEntityType.cs                 |  86 ++++
 .../Models/PersistedGrantEntityType.cs        | 127 ++++++
 .../Models/PizzaEntityType.cs                 | 111 +++++
 .../Models/PizzaSpecialEntityType.cs          |  76 ++++
 .../Models/PizzaStoreContextModel.cs          |  28 ++
 .../Models/PizzaStoreContextModelBuilder.cs   |  69 ++++
 .../Models/PizzaStoreUserEntityType.cs        | 156 +++++++
 .../Models/PizzaToppingEntityType.cs          |  96 +++++
 .../Models/ToppingEntityType.cs               |  62 +++
 .../NotificationsController.cs                |  43 --
 .../OidcConfigurationController.cs            |  35 +-
 .../BlazingPizza.Server/OrdersController.cs   | 215 +++++-----
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  60 +++
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  51 ++-
 .../BlazingPizza.Server/PizzasController.cs   |  16 -
 .../BlazingPizza.Server/Program.cs            |  94 +++--
 .../BlazingPizza.Server/SeedData.cs           | 379 +++++++++---------
 .../BlazingPizza.Server/SpecialsController.cs |  26 --
 .../BlazingPizza.Server/Startup.cs            |  71 ----
 .../BlazingPizza.Server/ToppingsController.cs |  26 --
 .../BlazingPizza.Shared/Address.cs            |  27 +-
 .../BlazingPizza.Shared.csproj                |   5 +
 .../BlazingPizza.Shared/LatLong.cs            |  43 +-
 .../NotificationSubscription.cs               |  17 +-
 .../BlazingPizza.Shared/Order.cs              |  37 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 133 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  62 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  27 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |  18 +-
 .../BlazingPizza.Shared/Topping.cs            |  18 +-
 .../BlazingPizza.Shared/UserInfo.cs           |  14 +-
 59 files changed, 2660 insertions(+), 979 deletions(-)
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/AddressEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/KeyEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/LatLongEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/OrderEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Models/ToppingEntityType.cs
 delete mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/NotificationsController.cs
 create mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/PizzaApiExtensions.cs
 delete mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/PizzasController.cs
 delete mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/SpecialsController.cs
 delete mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/Startup.cs
 delete mode 100644 save-points/01-Components-and-layout/BlazingPizza.Server/ToppingsController.cs

diff --git a/save-points/00-get-started/BlazingPizza.Shared/Address.cs b/save-points/00-get-started/BlazingPizza.Shared/Address.cs
index e5c0ef0d..79be9c5b 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/Address.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/Address.cs
@@ -1,21 +1,24 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class Address
 {
-    public class Address
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	[Required, MaxLength(100)]
+	public string Name { get; set; }
 
-        public string Line1 { get; set; }
+	[Required, MaxLength(100)]
+	public string Line1 { get; set; }
 
-        public string Line2 { get; set; }
+	[MaxLength(100)]
+	public string Line2 { get; set; }
 
-        public string City { get; set; }
+	[Required, MaxLength(50)]
+	public string City { get; set; }
 
-        public string Region { get; set; }
+	[Required, MaxLength(20)]
+	public string Region { get; set; }
 
-        public string PostalCode { get; set; }
-    }
+	[Required, MaxLength(20)]
+	public string PostalCode { get; set; }
 }
diff --git a/save-points/00-get-started/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/00-get-started/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index f7b7dd02..fb17e53b 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/00-get-started/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -3,8 +3,13 @@
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
+	<ItemGroup>
+		<Using Include="System.ComponentModel.DataAnnotations" />
+	</ItemGroup>
+	
   <ItemGroup>
     <ProjectReference Include="..\BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj" />
   </ItemGroup>
diff --git a/save-points/00-get-started/BlazingPizza.Shared/LatLong.cs b/save-points/00-get-started/BlazingPizza.Shared/LatLong.cs
index 9b8c3811..14a94c26 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/LatLong.cs
@@ -1,27 +1,26 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class LatLong
 {
-    public class LatLong
-    {
-        public LatLong()
-        {
-        }
+	public LatLong()
+	{
+	}
 
-        public LatLong(double latitude, double longitude) : this()
-        {
-            Latitude = latitude;
-            Longitude = longitude;
-        }
+	public LatLong(double latitude, double longitude) : this()
+	{
+		Latitude = latitude;
+		Longitude = longitude;
+	}
 
-        public double Latitude { get; set; }
+	public double Latitude { get; set; }
 
-        public double Longitude { get; set; }
+	public double Longitude { get; set; }
 
-        public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-        {
-            // The Earth is flat, right? So no need for spherical interpolation.
-            return new LatLong(
-                start.Latitude + (end.Latitude - start.Latitude) * proportion,
-                start.Longitude + (end.Longitude - start.Longitude) * proportion);
-        }
-    }
-}
+	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+	{
+		// The Earth is flat, right? So no need for spherical interpolation.
+		return new LatLong(
+				start.Latitude + (end.Latitude - start.Latitude) * proportion,
+				start.Longitude + (end.Longitude - start.Longitude) * proportion);
+	}
+}
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/00-get-started/BlazingPizza.Shared/NotificationSubscription.cs
index 04259c2f..9109ff57 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/NotificationSubscription.cs
@@ -1,17 +1,14 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class NotificationSubscription
 {
-    public class NotificationSubscription
-    {
-        public int NotificationSubscriptionId { get; set; }
+	public int NotificationSubscriptionId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public string Url { get; set; }
+	public string Url { get; set; }
 
-        public string P256dh { get; set; }
+	public string P256dh { get; set; }
 
-        public string Auth { get; set; }
-    }
+	public string Auth { get; set; }
 }
diff --git a/save-points/00-get-started/BlazingPizza.Shared/Order.cs b/save-points/00-get-started/BlazingPizza.Shared/Order.cs
index fb003bd6..aca04ca1 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/Order.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/Order.cs
@@ -1,25 +1,32 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Order
 {
-    public class Order
-    {
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public DateTime CreatedTime { get; set; }
+	public DateTime CreatedTime { get; set; }
 
-        public Address DeliveryAddress { get; set; } = new Address();
+	public Address DeliveryAddress { get; set; } = new Address();
 
-        public LatLong DeliveryLocation { get; set; }
+	public LatLong DeliveryLocation { get; set; }
 
-        public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-        public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-        public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
-    }
+	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(Order))]
+[JsonSerializable(typeof(OrderWithStatus))]
+[JsonSerializable(typeof(List<OrderWithStatus>))]
+[JsonSerializable(typeof(Pizza))]
+[JsonSerializable(typeof(List<PizzaSpecial>))]
+[JsonSerializable(typeof(List<Topping>))]
+[JsonSerializable(typeof(Topping))]
+public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/00-get-started/BlazingPizza.Shared/OrderWithStatus.cs
index 021de78c..f5f153b6 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/OrderWithStatus.cs
@@ -1,79 +1,78 @@
-using BlazingPizza.ComponentsLibrary.Map;
-using System;
-using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using BlazingPizza.ComponentsLibrary.Map;
 
-namespace BlazingPizza
+
+namespace BlazingPizza;
+
+public class OrderWithStatus
 {
-    public class OrderWithStatus
-    {
-        public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-        public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-        public Order Order { get; set; }
+	public Order Order { get; set; }
 
-        public string StatusText { get; set; }
+	public string StatusText { get; set; }
 
-        public bool IsDelivered => StatusText == "Delivered";
+	public bool IsDelivered => StatusText == "Delivered";
 
-        public List<Marker> MapMarkers { get; set; }
+	public List<Marker> MapMarkers { get; set; }
 
-        public static OrderWithStatus FromOrder(Order order)
-        {
-            // To simulate a real backend process, we fake status updates based on the amount
-            // of time since the order was placed
-            string statusText;
-            List<Marker> mapMarkers;
-            var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+	public static OrderWithStatus FromOrder(Order order)
+	{
+		// To simulate a real backend process, we fake status updates based on the amount
+		// of time since the order was placed
+		string statusText;
+		List<Marker> mapMarkers;
+		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-            if (DateTime.Now < dispatchTime)
-            {
-                statusText = "Preparing";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-                };
-            }
-            else if (DateTime.Now < dispatchTime + DeliveryDuration)
-            {
-                statusText = "Out for delivery";
+		if (DateTime.Now < dispatchTime)
+		{
+			statusText = "Preparing";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+								};
+		}
+		else if (DateTime.Now < dispatchTime + DeliveryDuration)
+		{
+			statusText = "Out for delivery";
 
-                var startPosition = ComputeStartPosition(order);
-                var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-                var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation),
-                    ToMapMarker("Driver", driverPosition, showPopup: true),
-                };
-            }
-            else
-            {
-                statusText = "Delivered";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-                };
-            }
+			var startPosition = ComputeStartPosition(order);
+			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation),
+										ToMapMarker("Driver", driverPosition, showPopup: true),
+								};
+		}
+		else
+		{
+			statusText = "Delivered";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+								};
+		}
 
-            return new OrderWithStatus
-            {
-                Order = order,
-                StatusText = statusText,
-                MapMarkers = mapMarkers,
-            };
-        }
+		return new OrderWithStatus
+		{
+			Order = order,
+			StatusText = statusText,
+			MapMarkers = mapMarkers,
+		};
+	}
 
-        private static LatLong ComputeStartPosition(Order order)
-        {
-            // Random but deterministic based on order ID
-            var rng = new Random(order.OrderId);
-            var distance = 0.01 + rng.NextDouble() * 0.02;
-            var angle = rng.NextDouble() * Math.PI * 2;
-            var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-            return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-        }
+	private static LatLong ComputeStartPosition(Order order)
+	{
+		// Random but deterministic based on order ID
+		var rng = new Random(order.OrderId);
+		var distance = 0.01 + rng.NextDouble() * 0.02;
+		var angle = rng.NextDouble() * Math.PI * 2;
+		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+	}
 
-        static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
-    }
-}
+	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+}
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/Pizza.cs b/save-points/00-get-started/BlazingPizza.Shared/Pizza.cs
index ec1108a9..459298f4 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/Pizza.cs
@@ -1,42 +1,44 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+///    /// Represents a customized pizza as part of an order
+/// </summary>
+public class Pizza
 {
-    /// <summary>
-    /// Represents a customized pizza as part of an order
-    /// </summary>
-    public class Pizza
-    {
-        public const int DefaultSize = 12;
-        public const int MinimumSize = 9;
-        public const int MaximumSize = 17;
+	public const int DefaultSize = 12;
+	public const int MinimumSize = 9;
+	public const int MaximumSize = 17;
 
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public PizzaSpecial Special { get; set; }
+	public PizzaSpecial Special { get; set; }
 
-        public int SpecialId { get; set; }
+	public int SpecialId { get; set; }
 
-        public int Size { get; set; }
+	public int Size { get; set; }
 
-        public List<PizzaTopping> Toppings { get; set; }
+	public List<PizzaTopping> Toppings { get; set; }
 
-        public decimal GetBasePrice()
-        {
-            return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-        }
+	public decimal GetBasePrice()
+	{
+		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+	}
 
-        public decimal GetTotalPrice()
-        {
-            return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-        }
+	public decimal GetTotalPrice()
+	{
+		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+	}
 
-        public string GetFormattedTotalPrice()
-        {
-            return GetTotalPrice().ToString("0.00");
-        }
-    }
+	public string GetFormattedTotalPrice()
+	{
+		return GetTotalPrice().ToString("0.00");
+	}
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
+[JsonSerializable(typeof(Pizza))]
+public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/00-get-started/BlazingPizza.Shared/PizzaSpecial.cs
index 2f2b3383..9653300c 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/PizzaSpecial.cs
@@ -1,20 +1,19 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+/// Represents a pre-configured template for a pizza a user can order
+/// </summary>
+public class PizzaSpecial
 {
-    /// <summary>
-    /// Represents a pre-configured template for a pizza a user can order
-    /// </summary>
-    public class PizzaSpecial
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal BasePrice { get; set; }
+	public decimal BasePrice { get; set; }
 
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public string ImageUrl { get; set; }
+	public string ImageUrl { get; set; }
 
-        public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
-    }
-}
+	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+}
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/PizzaTopping.cs b/save-points/00-get-started/BlazingPizza.Shared/PizzaTopping.cs
index f5a6c1ac..0a711647 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/PizzaTopping.cs
@@ -1,11 +1,11 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class PizzaTopping
 {
-    public class PizzaTopping
-    {
-        public Topping Topping { get; set; }
+	public Topping Topping { get; set; }
+
+	public int ToppingId { get; set; }
 
-        public int ToppingId { get; set; }
-        
-        public int PizzaId { get; set; }
-    }
-}
+	public int PizzaId { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/Topping.cs b/save-points/00-get-started/BlazingPizza.Shared/Topping.cs
index 61bdeb92..376c311a 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/Topping.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/Topping.cs
@@ -1,13 +1,13 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Topping
 {
-    public class Topping
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal Price { get; set; }
+	public decimal Price { get; set; }
 
-        public string GetFormattedPrice() => Price.ToString("0.00");
-    }
-}
+	public string GetFormattedPrice() => Price.ToString("0.00");
+	
+}
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/UserInfo.cs b/save-points/00-get-started/BlazingPizza.Shared/UserInfo.cs
index 4996ef80..362f8f8e 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/UserInfo.cs
@@ -1,9 +1,9 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class UserInfo
 {
-    public class UserInfo
-    {
-        public bool IsAuthenticated { get; set; }
+	public bool IsAuthenticated { get; set; }
 
-        public string Name { get; set; }
-    }
-}
+	public string Name { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/01-Components-and-layout/BlazingPizza.Client/BlazingPizza.Client.csproj
index 663677a1..f9ebe283 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/01-Components-and-layout/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Client/Pages/Index.razor b/save-points/01-Components-and-layout/BlazingPizza.Client/Pages/Index.razor
index 68649ba9..03d6e160 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/01-Components-and-layout/BlazingPizza.Client/Pages/Index.razor
@@ -24,6 +24,6 @@
 
     protected override async Task OnInitializedAsync()
     {
-        specials = await HttpClient.GetFromJsonAsync<List<PizzaSpecial>>("specials");
+        specials = await HttpClient.GetFromJsonAsync("specials", BlazingPizza.OrderContext.Default.ListPizzaSpecial);
     }
 }
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Client/Program.cs b/save-points/01-Components-and-layout/BlazingPizza.Client/Program.cs
index 48147d6f..ab7dd4d9 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Client/Program.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Client/Program.cs
@@ -1,21 +1,9 @@
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
+using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
-namespace BlazingPizza.Client
-{
-    public class Program
-    {
-        public static async Task Main(string[] args)
-        {
-            var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("#app");
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<App>("#app");
 
-            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
-            await builder.Build().RunAsync();
-        }
-    }
-}
+await builder.Build().RunAsync();
diff --git a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 61ebf623..cb996b1b 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index f36b098e..bb84f13c 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -1,17 +1,15 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.ComponentsLibrary
+namespace BlazingPizza.ComponentsLibrary;
+
+public static class LocalStorage
 {
-    public static class LocalStorage
-    {
-        public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-        public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-        public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
-    }
-}
+	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/01-Components-and-layout/BlazingPizza.Server/BlazingPizza.Server.csproj
index b9c74fc4..227890e1 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/AddressEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/AddressEntityType.cs
new file mode 100644
index 00000000..82db81b6
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/AddressEntityType.cs
@@ -0,0 +1,92 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class AddressEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Address",
+                typeof(Address),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Address).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var city = runtimeEntityType.AddProperty(
+                "City",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("City", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<City>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var line1 = runtimeEntityType.AddProperty(
+                "Line1",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var line2 = runtimeEntityType.AddProperty(
+                "Line2",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var postalCode = runtimeEntityType.AddProperty(
+                "PostalCode",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("PostalCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<PostalCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var region = runtimeEntityType.AddProperty(
+                "Region",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Region", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Region>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Address");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
new file mode 100644
index 00000000..1dd4563b
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
@@ -0,0 +1,114 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class DeviceFlowCodesEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes",
+                typeof(DeviceFlowCodes),
+                baseEntityType);
+
+            var userCode = runtimeEntityType.AddProperty(
+                "UserCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("UserCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<UserCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var deviceCode = runtimeEntityType.AddProperty(
+                "DeviceCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("DeviceCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<DeviceCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userCode });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deviceCode },
+                unique: true);
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DeviceCodes");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
new file mode 100644
index 00000000..8946b261
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>",
+                typeof(IdentityRoleClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoleClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityRoleEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
new file mode 100644
index 00000000..2f1fec2b
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
@@ -0,0 +1,78 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRole",
+                typeof(IdentityRole),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedName = runtimeEntityType.AddProperty(
+                "NormalizedName",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("NormalizedName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<NormalizedName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedName },
+                unique: true);
+            index.AddAnnotation("Relational:Name", "RoleNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
new file mode 100644
index 00000000..55418a1e
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserClaim<string>",
+                typeof(IdentityUserClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
new file mode 100644
index 00000000..3ca029bd
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserLoginstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserLogin<string>",
+                typeof(IdentityUserLogin<string>),
+                baseEntityType);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerKey = runtimeEntityType.AddProperty(
+                "ProviderKey",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderKey", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderKey>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerDisplayName = runtimeEntityType.AddProperty(
+                "ProviderDisplayName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderDisplayName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderDisplayName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { loginProvider, providerKey });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserLogins");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
new file mode 100644
index 00000000..70078d7a
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
@@ -0,0 +1,82 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserRolestringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserRole<string>",
+                typeof(IdentityUserRole<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, roleId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
new file mode 100644
index 00000000..93ba6d31
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
@@ -0,0 +1,84 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserTokenstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserToken<string>",
+                typeof(IdentityUserToken<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var value = runtimeEntityType.AddProperty(
+                "Value",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Value", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Value>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, loginProvider, name });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserTokens");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/KeyEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/KeyEntityType.cs
new file mode 100644
index 00000000..f6c6b4c7
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/KeyEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class KeyEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.Key",
+                typeof(Key),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var algorithm = runtimeEntityType.AddProperty(
+                "Algorithm",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Algorithm", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Algorithm>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var created = runtimeEntityType.AddProperty(
+                "Created",
+                typeof(DateTime),
+                propertyInfo: typeof(Key).GetProperty("Created", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Created>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var dataProtected = runtimeEntityType.AddProperty(
+                "DataProtected",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("DataProtected", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<DataProtected>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var isX509Certificate = runtimeEntityType.AddProperty(
+                "IsX509Certificate",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("IsX509Certificate", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<IsX509Certificate>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var use = runtimeEntityType.AddProperty(
+                "Use",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Use", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Use>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var version = runtimeEntityType.AddProperty(
+                "Version",
+                typeof(int),
+                propertyInfo: typeof(Key).GetProperty("Version", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Version>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { use });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Keys");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/LatLongEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/LatLongEntityType.cs
new file mode 100644
index 00000000..3fd254bd
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/LatLongEntityType.cs
@@ -0,0 +1,80 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class LatLongEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.LatLong",
+                typeof(LatLong),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var latitude = runtimeEntityType.AddProperty(
+                "Latitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Latitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Latitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var longitude = runtimeEntityType.AddProperty(
+                "Longitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Longitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Longitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                ownership: true);
+
+            var deliveryLocation = principalEntityType.AddNavigation("DeliveryLocation",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(LatLong),
+                propertyInfo: typeof(Order).GetProperty("DeliveryLocation", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryLocation>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
new file mode 100644
index 00000000..db236e4c
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
@@ -0,0 +1,77 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class NotificationSubscriptionEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.NotificationSubscription",
+                typeof(NotificationSubscription),
+                baseEntityType);
+
+            var notificationSubscriptionId = runtimeEntityType.AddProperty(
+                "NotificationSubscriptionId",
+                typeof(int),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("NotificationSubscriptionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<NotificationSubscriptionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var auth = runtimeEntityType.AddProperty(
+                "Auth",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Auth", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Auth>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var p256dh = runtimeEntityType.AddProperty(
+                "P256dh",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("P256dh", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<P256dh>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var url = runtimeEntityType.AddProperty(
+                "Url",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Url", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Url>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { notificationSubscriptionId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "NotificationSubscriptions");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/OrderEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/OrderEntityType.cs
new file mode 100644
index 00000000..9d9ec6fd
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/OrderEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class OrderEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Order",
+                typeof(Order),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Order).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var createdTime = runtimeEntityType.AddProperty(
+                "CreatedTime",
+                typeof(DateTime),
+                propertyInfo: typeof(Order).GetProperty("CreatedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<CreatedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var deliveryAddressId = runtimeEntityType.AddProperty(
+                "DeliveryAddressId",
+                typeof(int?),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(Order).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deliveryAddressId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("DeliveryAddressId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var deliveryAddress = declaringEntityType.AddNavigation("DeliveryAddress",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Address),
+                propertyInfo: typeof(Order).GetProperty("DeliveryAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PersistedGrantEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
new file mode 100644
index 00000000..842d53a5
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
@@ -0,0 +1,127 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PersistedGrantEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.PersistedGrant",
+                typeof(PersistedGrant),
+                baseEntityType);
+
+            var key = runtimeEntityType.AddProperty(
+                "Key",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Key", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Key>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var consumedTime = runtimeEntityType.AddProperty(
+                "ConsumedTime",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ConsumedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ConsumedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(PersistedGrant).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var type = runtimeEntityType.AddProperty(
+                "Type",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Type", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Type>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var key0 = runtimeEntityType.AddKey(
+                new[] { key });
+            runtimeEntityType.SetPrimaryKey(key0);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { consumedTime });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            var index1 = runtimeEntityType.AddIndex(
+                new[] { subjectId, clientId, type });
+
+            var index2 = runtimeEntityType.AddIndex(
+                new[] { subjectId, sessionId, type });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PersistedGrants");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaEntityType.cs
new file mode 100644
index 00000000..3a124e63
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaEntityType.cs
@@ -0,0 +1,111 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Pizza",
+                typeof(Pizza),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var size = runtimeEntityType.AddProperty(
+                "Size",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Size", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Size>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var specialId = runtimeEntityType.AddProperty(
+                "SpecialId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("SpecialId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<SpecialId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { orderId });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { specialId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var pizzas = principalEntityType.AddNavigation("Pizzas",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<Pizza>),
+                propertyInfo: typeof(Order).GetProperty("Pizzas", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<Pizzas>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("SpecialId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var special = declaringEntityType.AddNavigation("Special",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(PizzaSpecial),
+                propertyInfo: typeof(Pizza).GetProperty("Special", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Special>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Pizzas");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
new file mode 100644
index 00000000..e86b0f50
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
@@ -0,0 +1,76 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaSpecialEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaSpecial",
+                typeof(PizzaSpecial),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var basePrice = runtimeEntityType.AddProperty(
+                "BasePrice",
+                typeof(decimal),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("BasePrice", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<BasePrice>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var imageUrl = runtimeEntityType.AddProperty(
+                "ImageUrl",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("ImageUrl", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<ImageUrl>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Specials");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaStoreContextModel.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
new file mode 100644
index 00000000..8b516a68
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
@@ -0,0 +1,28 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    [DbContext(typeof(PizzaStoreContext))]
+    public partial class PizzaStoreContextModel : RuntimeModel
+    {
+        static PizzaStoreContextModel()
+        {
+            var model = new PizzaStoreContextModel();
+            model.Initialize();
+            model.Customize();
+            _instance = model;
+        }
+
+        private static PizzaStoreContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
new file mode 100644
index 00000000..d46f50f4
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
@@ -0,0 +1,69 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    public partial class PizzaStoreContextModel
+    {
+        partial void Initialize()
+        {
+            var address = AddressEntityType.Create(this);
+            var latLong = LatLongEntityType.Create(this);
+            var notificationSubscription = NotificationSubscriptionEntityType.Create(this);
+            var order = OrderEntityType.Create(this);
+            var pizza = PizzaEntityType.Create(this);
+            var pizzaSpecial = PizzaSpecialEntityType.Create(this);
+            var pizzaTopping = PizzaToppingEntityType.Create(this);
+            var pizzaStoreUser = PizzaStoreUserEntityType.Create(this);
+            var topping = ToppingEntityType.Create(this);
+            var deviceFlowCodes = DeviceFlowCodesEntityType.Create(this);
+            var key = KeyEntityType.Create(this);
+            var persistedGrant = PersistedGrantEntityType.Create(this);
+            var identityRole = IdentityRoleEntityType.Create(this);
+            var identityRoleClaimstring = IdentityRoleClaimstringEntityType.Create(this);
+            var identityUserClaimstring = IdentityUserClaimstringEntityType.Create(this);
+            var identityUserLoginstring = IdentityUserLoginstringEntityType.Create(this);
+            var identityUserRolestring = IdentityUserRolestringEntityType.Create(this);
+            var identityUserTokenstring = IdentityUserTokenstringEntityType.Create(this);
+
+            LatLongEntityType.CreateForeignKey1(latLong, order);
+            OrderEntityType.CreateForeignKey1(order, address);
+            PizzaEntityType.CreateForeignKey1(pizza, order);
+            PizzaEntityType.CreateForeignKey2(pizza, pizzaSpecial);
+            PizzaToppingEntityType.CreateForeignKey1(pizzaTopping, pizza);
+            PizzaToppingEntityType.CreateForeignKey2(pizzaTopping, topping);
+            IdentityRoleClaimstringEntityType.CreateForeignKey1(identityRoleClaimstring, identityRole);
+            IdentityUserClaimstringEntityType.CreateForeignKey1(identityUserClaimstring, pizzaStoreUser);
+            IdentityUserLoginstringEntityType.CreateForeignKey1(identityUserLoginstring, pizzaStoreUser);
+            IdentityUserRolestringEntityType.CreateForeignKey1(identityUserRolestring, identityRole);
+            IdentityUserRolestringEntityType.CreateForeignKey2(identityUserRolestring, pizzaStoreUser);
+            IdentityUserTokenstringEntityType.CreateForeignKey1(identityUserTokenstring, pizzaStoreUser);
+
+            AddressEntityType.CreateAnnotations(address);
+            LatLongEntityType.CreateAnnotations(latLong);
+            NotificationSubscriptionEntityType.CreateAnnotations(notificationSubscription);
+            OrderEntityType.CreateAnnotations(order);
+            PizzaEntityType.CreateAnnotations(pizza);
+            PizzaSpecialEntityType.CreateAnnotations(pizzaSpecial);
+            PizzaToppingEntityType.CreateAnnotations(pizzaTopping);
+            PizzaStoreUserEntityType.CreateAnnotations(pizzaStoreUser);
+            ToppingEntityType.CreateAnnotations(topping);
+            DeviceFlowCodesEntityType.CreateAnnotations(deviceFlowCodes);
+            KeyEntityType.CreateAnnotations(key);
+            PersistedGrantEntityType.CreateAnnotations(persistedGrant);
+            IdentityRoleEntityType.CreateAnnotations(identityRole);
+            IdentityRoleClaimstringEntityType.CreateAnnotations(identityRoleClaimstring);
+            IdentityUserClaimstringEntityType.CreateAnnotations(identityUserClaimstring);
+            IdentityUserLoginstringEntityType.CreateAnnotations(identityUserLoginstring);
+            IdentityUserRolestringEntityType.CreateAnnotations(identityUserRolestring);
+            IdentityUserTokenstringEntityType.CreateAnnotations(identityUserTokenstring);
+
+            AddAnnotation("ProductVersion", "6.0.0");
+        }
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
new file mode 100644
index 00000000..18b2d96d
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
@@ -0,0 +1,156 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaStoreUserEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Server.PizzaStoreUser",
+                typeof(PizzaStoreUser),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var accessFailedCount = runtimeEntityType.AddProperty(
+                "AccessFailedCount",
+                typeof(int),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("AccessFailedCount", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<AccessFailedCount>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var email = runtimeEntityType.AddProperty(
+                "Email",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Email", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Email>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var emailConfirmed = runtimeEntityType.AddProperty(
+                "EmailConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("EmailConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<EmailConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnabled = runtimeEntityType.AddProperty(
+                "LockoutEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnd = runtimeEntityType.AddProperty(
+                "LockoutEnd",
+                typeof(DateTimeOffset?),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnd", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnd>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var normalizedEmail = runtimeEntityType.AddProperty(
+                "NormalizedEmail",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedEmail", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedEmail>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedUserName = runtimeEntityType.AddProperty(
+                "NormalizedUserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedUserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedUserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var passwordHash = runtimeEntityType.AddProperty(
+                "PasswordHash",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PasswordHash", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PasswordHash>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumber = runtimeEntityType.AddProperty(
+                "PhoneNumber",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumber", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumber>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumberConfirmed = runtimeEntityType.AddProperty(
+                "PhoneNumberConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumberConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumberConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var securityStamp = runtimeEntityType.AddProperty(
+                "SecurityStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("SecurityStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<SecurityStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var twoFactorEnabled = runtimeEntityType.AddProperty(
+                "TwoFactorEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("TwoFactorEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<TwoFactorEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var userName = runtimeEntityType.AddProperty(
+                "UserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("UserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<UserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedEmail });
+            index.AddAnnotation("Relational:Name", "EmailIndex");
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { normalizedUserName },
+                unique: true);
+            index0.AddAnnotation("Relational:Name", "UserNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUsers");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaToppingEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
new file mode 100644
index 00000000..b97d2a24
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaTopping",
+                typeof(PizzaTopping),
+                baseEntityType);
+
+            var pizzaId = runtimeEntityType.AddProperty(
+                "PizzaId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("PizzaId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<PizzaId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var toppingId = runtimeEntityType.AddProperty(
+                "ToppingId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("ToppingId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<ToppingId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { pizzaId, toppingId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { toppingId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PizzaId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var toppings = principalEntityType.AddNavigation("Toppings",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<PizzaTopping>),
+                propertyInfo: typeof(Pizza).GetProperty("Toppings", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Toppings>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("ToppingId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var topping = declaringEntityType.AddNavigation("Topping",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Topping),
+                propertyInfo: typeof(PizzaTopping).GetProperty("Topping", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<Topping>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PizzaTopping");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Models/ToppingEntityType.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/ToppingEntityType.cs
new file mode 100644
index 00000000..9295f9bf
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Models/ToppingEntityType.cs
@@ -0,0 +1,62 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class ToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Topping",
+                typeof(Topping),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Topping).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Topping).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var price = runtimeEntityType.AddProperty(
+                "Price",
+                typeof(decimal),
+                propertyInfo: typeof(Topping).GetProperty("Price", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Price>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Toppings");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/NotificationsController.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/NotificationsController.cs
deleted file mode 100644
index bb3b96ff..00000000
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/NotificationsController.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("notifications")]
-    [ApiController]
-    [Authorize]
-    public class NotificationsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public NotificationsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpPut("subscribe")]
-        public async Task<NotificationSubscription> Subscribe(NotificationSubscription subscription)
-        {
-            // We're storing at most one subscription per user, so delete old ones.
-            // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-            var userId = GetUserId();
-            var oldSubscriptions = _db.NotificationSubscriptions.Where(e => e.UserId == userId);
-            _db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
-
-            // Store new subscription
-            subscription.UserId = userId;
-            _db.NotificationSubscriptions.Attach(subscription);
-
-            await _db.SaveChangesAsync();
-            return subscription;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-    }
-}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/OidcConfigurationController.cs
index c074debf..b7654075 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/OidcConfigurationController.cs
@@ -1,26 +1,21 @@
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class OidcConfigurationController : Controller
 {
-    public class OidcConfigurationController : Controller
-    {
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-        {
-            ClientRequestParametersProvider = clientRequestParametersProvider;
-        }
+	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+	{
+		ClientRequestParametersProvider = clientRequestParametersProvider;
+	}
 
-        public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-        [HttpGet("_configuration/{clientId}")]
-        public IActionResult GetClientRequestParameters([FromRoute]string clientId)
-        {
-            var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-            return Ok(parameters);
-        }
-    }
-}
+	[HttpGet("_configuration/{clientId}")]
+	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+	{
+		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+		return Ok(parameters);
+	}
+}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/OrdersController.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/OrdersController.cs
index 2b8bc99b..54ff6114 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/OrdersController.cs
@@ -1,114 +1,109 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+[Route("orders")]
+[ApiController]
+// [Authorize]
+public class OrdersController : Controller
 {
-    [Route("orders")]
-    [ApiController]
-    // [Authorize]
-    public class OrdersController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public OrdersController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-        {
-            var orders = await _db.Orders
-                // .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .OrderByDescending(o => o.CreatedTime)
-                .ToListAsync();
-
-            return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-        }
-
-        [HttpGet("{orderId}")]
-        public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-        {
-            var order = await _db.Orders
-                .Where(o => o.OrderId == orderId)
-                // .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .SingleOrDefaultAsync();
-
-            if (order == null)
-            {
-                return NotFound();
-            }
-
-            return OrderWithStatus.FromOrder(order);
-        }
-
-        [HttpPost]
-        public async Task<ActionResult<int>> PlaceOrder(Order order)
-        {
-            order.CreatedTime = DateTime.Now;
-            order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-            // order.UserId = GetUserId();
-
-            // Enforce existence of Pizza.SpecialId and Topping.ToppingId
-            // in the database - prevent the submitter from making up
-            // new specials and toppings
-            foreach (var pizza in order.Pizzas)
-            {
-                pizza.SpecialId = pizza.Special.Id;
-                pizza.Special = null;
-
-                foreach (var topping in pizza.Toppings)
-                {
-                    topping.ToppingId = topping.Topping.Id;
-                    topping.Topping = null;
-                }
-            }
-
-            _db.Orders.Attach(order);
-            await _db.SaveChangesAsync();
-
-            // In the background, send push notifications if possible
-            var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-            if (subscription != null)
-            {
-                _ = TrackAndSendNotificationsAsync(order, subscription);
-            }
-
-            return order.OrderId;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-
-        private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-        {
-            // In a realistic case, some other backend process would track
-            // order delivery progress and send us notifications when it
-            // changes. Since we don't have any such process here, fake it.
-            await Task.Delay(OrderWithStatus.PreparationDuration);
-            await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-            await Task.Delay(OrderWithStatus.DeliveryDuration);
-            await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-        }
-
-        private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-        {
-            // This will be implemented later
-            return Task.CompletedTask;
-        }
-    }
-}
+	private readonly PizzaStoreContext _db;
+
+	public OrdersController(PizzaStoreContext db)
+	{
+		_db = db;
+	}
+
+	[HttpGet]
+	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+	{
+		var orders = await _db.Orders
+				// .Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.OrderByDescending(o => o.CreatedTime)
+				.ToListAsync();
+
+		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+	}
+
+	[HttpGet("{orderId}")]
+	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+	{
+		var order = await _db.Orders
+				.Where(o => o.OrderId == orderId)
+				// .Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.SingleOrDefaultAsync();
+
+		if (order == null)
+		{
+			return NotFound();
+		}
+
+		return OrderWithStatus.FromOrder(order);
+	}
+
+	[HttpPost]
+	public async Task<ActionResult<int>> PlaceOrder(Order order)
+	{
+		order.CreatedTime = DateTime.Now;
+		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+		// order.UserId = GetUserId();
+
+		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
+		// in the database - prevent the submitter from making up
+		// new specials and toppings
+		foreach (var pizza in order.Pizzas)
+		{
+			pizza.SpecialId = pizza.Special.Id;
+			pizza.Special = null;
+
+			foreach (var topping in pizza.Toppings)
+			{
+				topping.ToppingId = topping.Topping.Id;
+				topping.Topping = null;
+			}
+		}
+
+		_db.Orders.Attach(order);
+		await _db.SaveChangesAsync();
+
+		// In the background, send push notifications if possible
+		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+		if (subscription != null)
+		{
+			_ = TrackAndSendNotificationsAsync(order, subscription);
+		}
+
+		return order.OrderId;
+	}
+
+	private string GetUserId()
+	{
+		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+	{
+		// In a realistic case, some other backend process would track
+		// order delivery progress and send us notifications when it
+		// changes. Since we don't have any such process here, fake it.
+		await Task.Delay(OrderWithStatus.PreparationDuration);
+		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+		await Task.Delay(OrderWithStatus.DeliveryDuration);
+		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+	}
+
+	private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+	{
+		// This will be implemented later
+		return Task.CompletedTask;
+	}
+}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaApiExtensions.cs
new file mode 100644
index 00000000..bf6b7bde
--- /dev/null
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -0,0 +1,60 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
+
+namespace BlazingPizza.Server;
+
+public static class PizzaApiExtensions
+{
+
+	public static WebApplication MapPizzaApi(this WebApplication app)
+	{
+
+		// Subscribe to notifications
+		app.MapPut("/notifications/subscribe", [Authorize] async (
+			HttpContext context,
+			PizzaStoreContext db,
+			NotificationSubscription subscription) =>
+		{
+
+			// We're storing at most one subscription per user, so delete old ones.
+			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+			var userId = GetUserId(context);
+			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+
+			// Store new subscription
+			subscription.UserId = userId;
+			db.NotificationSubscriptions.Attach(subscription);
+
+			await db.SaveChangesAsync();
+			return Results.Ok(subscription);
+
+		});
+
+		// Specials
+		app.MapGet("/specials", async (PizzaStoreContext db) =>
+		{
+
+			var specials = await db.Specials.ToListAsync();
+			return Results.Ok(specials);
+
+		});
+
+		// Toppings
+		app.MapGet("/toppings", async (PizzaStoreContext db) =>
+		{
+			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+			return Results.Ok(toppings);
+		});
+
+		return app;
+
+	}
+
+	private static string GetUserId(HttpContext context)
+	{
+		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreContext.cs
index 9485bd12..992baa19 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,39 +1,38 @@
-using Duende.IdentityServer.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-    public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
-    {
-        public PizzaStoreContext(
-            DbContextOptions options,
-            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-        {
-        }
+	public PizzaStoreContext(
+			DbContextOptions options,
+			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+	{
+	}
 
-        public DbSet<Order> Orders { get; set; }
+	public DbSet<Order> Orders { get; set; }
 
-        public DbSet<Pizza> Pizzas { get; set; }
+	public DbSet<Pizza> Pizzas { get; set; }
 
-        public DbSet<PizzaSpecial> Specials { get; set; }
+	public DbSet<PizzaSpecial> Specials { get; set; }
 
-        public DbSet<Topping> Toppings { get; set; }
+	public DbSet<Topping> Toppings { get; set; }
 
-        public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
+	protected override void OnModelCreating(ModelBuilder modelBuilder)
+	{
+		base.OnModelCreating(modelBuilder);
 
-            // Configuring a many-to-many special -> topping relationship that is friendly for serialization
-            modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-            modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-            modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
+		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-            // Inline the Lat-Long pairs in Order rather than having a FK to another table
-            modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-        }
-    }
-}
\ No newline at end of file
+		// Inline the Lat-Long pairs in Order rather than having a FK to another table
+		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+	}
+}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/PizzasController.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/PizzasController.cs
deleted file mode 100644
index c082552c..00000000
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/PizzasController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("pizzas")]
-    [ApiController]
-    public class PizzasController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public PizzasController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-    }
-}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Program.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Program.cs
index 40a47641..4484d8f7 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/Program.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Program.cs
@@ -1,33 +1,67 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.EntityFrameworkCore;
+using BlazingPizza.Server;
 
-namespace BlazingPizza.Server
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddControllersWithViews()
+	.AddJsonOptions(options =>  {
+		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+	});
+builder.Services.AddRazorPages();
+
+builder.Services.AddDbContext<PizzaStoreContext>(options =>
+		options.UseSqlite("Data Source=pizza.db")
+			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+
+builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
+		.AddEntityFrameworkStores<PizzaStoreContext>();
+
+builder.Services.AddIdentityServer()
+		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+
+builder.Services.AddAuthentication()
+		.AddIdentityServerJwt();
+
+var app = builder.Build();
+
+// Initialize the database
+var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
+using (var scope = scopeFactory.CreateScope())
+{
+	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+	if (db.Database.EnsureCreated())
+	{
+		SeedData.Initialize(db);
+	}
+}
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseWebAssemblyDebugging();
+}
+else
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var host = CreateHostBuilder(args).Build();
-
-            // Initialize the database
-            var scopeFactory = host.Services.GetRequiredService<IServiceScopeFactory>();
-            using (var scope = scopeFactory.CreateScope())
-            {
-                var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-                if (db.Database.EnsureCreated())
-                {
-                    SeedData.Initialize(db);
-                }
-            }
-
-            host.Run();
-        }
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+    app.UseExceptionHandler("/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
 }
+
+app.UseHttpsRedirection();
+app.UseBlazorFrameworkFiles();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseIdentityServer();
+app.UseAuthorization();
+
+app.MapPizzaApi();
+
+app.MapRazorPages();
+app.MapControllers();
+app.MapFallbackToFile("index.html");
+
+app.Run();
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/SeedData.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/SeedData.cs
index 7c86a5b2..a1e47973 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/SeedData.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/SeedData.cs
@@ -1,193 +1,192 @@
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public static class SeedData
 {
-    public static class SeedData
-    {
-        public static void Initialize(PizzaStoreContext db)
-        {
-            var toppings = new Topping[]
-            {
-                new Topping()
-                {
-                    Name = "Extra cheese",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "American bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "British bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Canadian bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Tea and crumpets",
-                    Price = 5.00m
-                },
-                new Topping()
-                {
-                    Name = "Fresh-baked scones",
-                    Price = 4.50m,
-                },
-                new Topping()
-                {
-                    Name = "Bell peppers",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Onions",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Mushrooms",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Pepperoni",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Duck sausage",
-                    Price = 3.20m,
-                },
-                new Topping()
-                {
-                    Name = "Venison meatballs",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "Served on a silver platter",
-                    Price = 250.99m,
-                },
-                new Topping()
-                {
-                    Name = "Lobster on top",
-                    Price = 64.50m,
-                },
-                new Topping()
-                {
-                    Name = "Sturgeon caviar",
-                    Price = 101.75m,
-                },
-                new Topping()
-                {
-                    Name = "Artichoke hearts",
-                    Price = 3.40m,
-                },
-                new Topping()
-                {
-                    Name = "Fresh tomatoes",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Basil",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Steak (medium-rare)",
-                    Price = 8.50m,
-                },
-                new Topping()
-                {
-                    Name = "Blazing hot peppers",
-                    Price = 4.20m,
-                },
-                new Topping()
-                {
-                    Name = "Buffalo chicken",
-                    Price = 5.00m,
-                },
-                new Topping()
-                {
-                    Name = "Blue cheese",
-                    Price = 2.50m,
-                },
-            };
+	public static void Initialize(PizzaStoreContext db)
+	{
+		var toppings = new Topping[]
+		{
+			new Topping()
+			{
+					Name = "Extra cheese",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "American bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "British bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Canadian bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Tea and crumpets",
+					Price = 5.00m
+			},
+			new Topping()
+			{
+					Name = "Fresh-baked scones",
+					Price = 4.50m,
+			},
+			new Topping()
+			{
+					Name = "Bell peppers",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Onions",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Mushrooms",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Pepperoni",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Duck sausage",
+					Price = 3.20m,
+			},
+			new Topping()
+			{
+					Name = "Venison meatballs",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "Served on a silver platter",
+					Price = 250.99m,
+			},
+			new Topping()
+			{
+					Name = "Lobster on top",
+					Price = 64.50m,
+			},
+			new Topping()
+			{
+					Name = "Sturgeon caviar",
+					Price = 101.75m,
+			},
+			new Topping()
+			{
+					Name = "Artichoke hearts",
+					Price = 3.40m,
+			},
+			new Topping()
+			{
+					Name = "Fresh tomatoes",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Basil",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Steak (medium-rare)",
+					Price = 8.50m,
+			},
+			new Topping()
+			{
+					Name = "Blazing hot peppers",
+					Price = 4.20m,
+			},
+			new Topping()
+			{
+					Name = "Buffalo chicken",
+					Price = 5.00m,
+			},
+			new Topping()
+			{
+					Name = "Blue cheese",
+					Price = 2.50m,
+			},
+		};
 
-            var specials = new PizzaSpecial[]
-            {
-                new PizzaSpecial()
-                {
-                    Name = "Basic Cheese Pizza",
-                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/cheese.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 2,
-                    Name = "The Baconatorizor",
-                    Description = "It has EVERY kind of bacon",
-                    BasePrice = 11.99m,
-                    ImageUrl = "img/pizzas/bacon.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 3,
-                    Name = "Classic pepperoni",
-                    Description = "It's the pizza you grew up with, but Blazing hot!",
-                    BasePrice = 10.50m,
-                    ImageUrl = "img/pizzas/pepperoni.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 4,
-                    Name = "Buffalo chicken",
-                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-                    BasePrice = 12.75m,
-                    ImageUrl = "img/pizzas/meaty.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 5,
-                    Name = "Mushroom Lovers",
-                    Description = "It has mushrooms. Isn't that obvious?",
-                    BasePrice = 11.00m,
-                    ImageUrl = "img/pizzas/mushroom.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 6,
-                    Name = "The Brit",
-                    Description = "When in London...",
-                    BasePrice = 10.25m,
-                    ImageUrl = "img/pizzas/brit.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 7,
-                    Name = "Veggie Delight",
-                    Description = "It's like salad, but on a pizza",
-                    BasePrice = 11.50m,
-                    ImageUrl = "img/pizzas/salad.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 8,
-                    Name = "Margherita",
-                    Description = "Traditional Italian pizza with tomatoes and basil",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/margherita.jpg",
-                },
-            };
+		var specials = new PizzaSpecial[]
+		{
+			new PizzaSpecial()
+			{
+					Name = "Basic Cheese Pizza",
+					Description = "It's cheesy and delicious. Why wouldn't you want one?",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/cheese.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 2,
+					Name = "The Baconatorizor",
+					Description = "It has EVERY kind of bacon",
+					BasePrice = 11.99m,
+					ImageUrl = "img/pizzas/bacon.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 3,
+					Name = "Classic pepperoni",
+					Description = "It's the pizza you grew up with, but Blazing hot!",
+					BasePrice = 10.50m,
+					ImageUrl = "img/pizzas/pepperoni.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 4,
+					Name = "Buffalo chicken",
+					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+					BasePrice = 12.75m,
+					ImageUrl = "img/pizzas/meaty.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 5,
+					Name = "Mushroom Lovers",
+					Description = "It has mushrooms. Isn't that obvious?",
+					BasePrice = 11.00m,
+					ImageUrl = "img/pizzas/mushroom.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 6,
+					Name = "The Brit",
+					Description = "When in London...",
+					BasePrice = 10.25m,
+					ImageUrl = "img/pizzas/brit.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 7,
+					Name = "Veggie Delight",
+					Description = "It's like salad, but on a pizza",
+					BasePrice = 11.50m,
+					ImageUrl = "img/pizzas/salad.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 8,
+					Name = "Margherita",
+					Description = "Traditional Italian pizza with tomatoes and basil",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/margherita.jpg",
+			},
+		};
 
-            db.Toppings.AddRange(toppings);
-            db.Specials.AddRange(specials);
-            db.SaveChanges();
-        }
-    }
-}
+		db.Toppings.AddRange(toppings);
+		db.Specials.AddRange(specials);
+		db.SaveChanges();
+	}
+}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/SpecialsController.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/SpecialsController.cs
deleted file mode 100644
index a176844c..00000000
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/SpecialsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("specials")]
-    [ApiController]
-    public class SpecialsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public SpecialsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()
-        {
-            return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();
-        }
-    }
-}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Startup.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Startup.cs
deleted file mode 100644
index 7c4656a7..00000000
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/Startup.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace BlazingPizza.Server
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllersWithViews();
-            services.AddRazorPages();
-
-
-            services.AddDbContext<PizzaStoreContext>(options => 
-                options.UseSqlite("Data Source=pizza.db"));
-
-            services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-                .AddEntityFrameworkStores<PizzaStoreContext>();
-
-            services.AddIdentityServer()
-                .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
-
-            services.AddAuthentication()
-                .AddIdentityServerJwt();
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                app.UseWebAssemblyDebugging();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Error");
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
-
-            app.UseHttpsRedirection();
-            app.UseBlazorFrameworkFiles();
-            app.UseStaticFiles();
-
-            app.UseRouting();
-
-            app.UseAuthentication();
-            app.UseIdentityServer();
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-                endpoints.MapRazorPages();
-                endpoints.MapFallbackToFile("index.html");
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/ToppingsController.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/ToppingsController.cs
deleted file mode 100644
index 6a677639..00000000
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/ToppingsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("toppings")]
-    [ApiController]
-    public class ToppingsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public ToppingsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<Topping>>> GetToppings()
-        {
-            return await _db.Toppings.OrderBy(t => t.Name).ToListAsync();
-        }
-    }
-}
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/Address.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/Address.cs
index e5c0ef0d..79be9c5b 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/Address.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/Address.cs
@@ -1,21 +1,24 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class Address
 {
-    public class Address
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	[Required, MaxLength(100)]
+	public string Name { get; set; }
 
-        public string Line1 { get; set; }
+	[Required, MaxLength(100)]
+	public string Line1 { get; set; }
 
-        public string Line2 { get; set; }
+	[MaxLength(100)]
+	public string Line2 { get; set; }
 
-        public string City { get; set; }
+	[Required, MaxLength(50)]
+	public string City { get; set; }
 
-        public string Region { get; set; }
+	[Required, MaxLength(20)]
+	public string Region { get; set; }
 
-        public string PostalCode { get; set; }
-    }
+	[Required, MaxLength(20)]
+	public string PostalCode { get; set; }
 }
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/01-Components-and-layout/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index f7b7dd02..fb17e53b 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -3,8 +3,13 @@
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
+	<ItemGroup>
+		<Using Include="System.ComponentModel.DataAnnotations" />
+	</ItemGroup>
+	
   <ItemGroup>
     <ProjectReference Include="..\BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj" />
   </ItemGroup>
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/LatLong.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/LatLong.cs
index 9b8c3811..14a94c26 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/LatLong.cs
@@ -1,27 +1,26 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class LatLong
 {
-    public class LatLong
-    {
-        public LatLong()
-        {
-        }
+	public LatLong()
+	{
+	}
 
-        public LatLong(double latitude, double longitude) : this()
-        {
-            Latitude = latitude;
-            Longitude = longitude;
-        }
+	public LatLong(double latitude, double longitude) : this()
+	{
+		Latitude = latitude;
+		Longitude = longitude;
+	}
 
-        public double Latitude { get; set; }
+	public double Latitude { get; set; }
 
-        public double Longitude { get; set; }
+	public double Longitude { get; set; }
 
-        public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-        {
-            // The Earth is flat, right? So no need for spherical interpolation.
-            return new LatLong(
-                start.Latitude + (end.Latitude - start.Latitude) * proportion,
-                start.Longitude + (end.Longitude - start.Longitude) * proportion);
-        }
-    }
-}
+	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+	{
+		// The Earth is flat, right? So no need for spherical interpolation.
+		return new LatLong(
+				start.Latitude + (end.Latitude - start.Latitude) * proportion,
+				start.Longitude + (end.Longitude - start.Longitude) * proportion);
+	}
+}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/NotificationSubscription.cs
index 04259c2f..9109ff57 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/NotificationSubscription.cs
@@ -1,17 +1,14 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class NotificationSubscription
 {
-    public class NotificationSubscription
-    {
-        public int NotificationSubscriptionId { get; set; }
+	public int NotificationSubscriptionId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public string Url { get; set; }
+	public string Url { get; set; }
 
-        public string P256dh { get; set; }
+	public string P256dh { get; set; }
 
-        public string Auth { get; set; }
-    }
+	public string Auth { get; set; }
 }
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/Order.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/Order.cs
index fb003bd6..aca04ca1 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/Order.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/Order.cs
@@ -1,25 +1,32 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Order
 {
-    public class Order
-    {
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public DateTime CreatedTime { get; set; }
+	public DateTime CreatedTime { get; set; }
 
-        public Address DeliveryAddress { get; set; } = new Address();
+	public Address DeliveryAddress { get; set; } = new Address();
 
-        public LatLong DeliveryLocation { get; set; }
+	public LatLong DeliveryLocation { get; set; }
 
-        public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-        public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-        public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
-    }
+	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(Order))]
+[JsonSerializable(typeof(OrderWithStatus))]
+[JsonSerializable(typeof(List<OrderWithStatus>))]
+[JsonSerializable(typeof(Pizza))]
+[JsonSerializable(typeof(List<PizzaSpecial>))]
+[JsonSerializable(typeof(List<Topping>))]
+[JsonSerializable(typeof(Topping))]
+public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/OrderWithStatus.cs
index 021de78c..f5f153b6 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/OrderWithStatus.cs
@@ -1,79 +1,78 @@
-using BlazingPizza.ComponentsLibrary.Map;
-using System;
-using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using BlazingPizza.ComponentsLibrary.Map;
 
-namespace BlazingPizza
+
+namespace BlazingPizza;
+
+public class OrderWithStatus
 {
-    public class OrderWithStatus
-    {
-        public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-        public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-        public Order Order { get; set; }
+	public Order Order { get; set; }
 
-        public string StatusText { get; set; }
+	public string StatusText { get; set; }
 
-        public bool IsDelivered => StatusText == "Delivered";
+	public bool IsDelivered => StatusText == "Delivered";
 
-        public List<Marker> MapMarkers { get; set; }
+	public List<Marker> MapMarkers { get; set; }
 
-        public static OrderWithStatus FromOrder(Order order)
-        {
-            // To simulate a real backend process, we fake status updates based on the amount
-            // of time since the order was placed
-            string statusText;
-            List<Marker> mapMarkers;
-            var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+	public static OrderWithStatus FromOrder(Order order)
+	{
+		// To simulate a real backend process, we fake status updates based on the amount
+		// of time since the order was placed
+		string statusText;
+		List<Marker> mapMarkers;
+		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-            if (DateTime.Now < dispatchTime)
-            {
-                statusText = "Preparing";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-                };
-            }
-            else if (DateTime.Now < dispatchTime + DeliveryDuration)
-            {
-                statusText = "Out for delivery";
+		if (DateTime.Now < dispatchTime)
+		{
+			statusText = "Preparing";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+								};
+		}
+		else if (DateTime.Now < dispatchTime + DeliveryDuration)
+		{
+			statusText = "Out for delivery";
 
-                var startPosition = ComputeStartPosition(order);
-                var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-                var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation),
-                    ToMapMarker("Driver", driverPosition, showPopup: true),
-                };
-            }
-            else
-            {
-                statusText = "Delivered";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-                };
-            }
+			var startPosition = ComputeStartPosition(order);
+			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation),
+										ToMapMarker("Driver", driverPosition, showPopup: true),
+								};
+		}
+		else
+		{
+			statusText = "Delivered";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+								};
+		}
 
-            return new OrderWithStatus
-            {
-                Order = order,
-                StatusText = statusText,
-                MapMarkers = mapMarkers,
-            };
-        }
+		return new OrderWithStatus
+		{
+			Order = order,
+			StatusText = statusText,
+			MapMarkers = mapMarkers,
+		};
+	}
 
-        private static LatLong ComputeStartPosition(Order order)
-        {
-            // Random but deterministic based on order ID
-            var rng = new Random(order.OrderId);
-            var distance = 0.01 + rng.NextDouble() * 0.02;
-            var angle = rng.NextDouble() * Math.PI * 2;
-            var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-            return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-        }
+	private static LatLong ComputeStartPosition(Order order)
+	{
+		// Random but deterministic based on order ID
+		var rng = new Random(order.OrderId);
+		var distance = 0.01 + rng.NextDouble() * 0.02;
+		var angle = rng.NextDouble() * Math.PI * 2;
+		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+	}
 
-        static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
-    }
-}
+	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/Pizza.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/Pizza.cs
index ec1108a9..459298f4 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/Pizza.cs
@@ -1,42 +1,44 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+///    /// Represents a customized pizza as part of an order
+/// </summary>
+public class Pizza
 {
-    /// <summary>
-    /// Represents a customized pizza as part of an order
-    /// </summary>
-    public class Pizza
-    {
-        public const int DefaultSize = 12;
-        public const int MinimumSize = 9;
-        public const int MaximumSize = 17;
+	public const int DefaultSize = 12;
+	public const int MinimumSize = 9;
+	public const int MaximumSize = 17;
 
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public PizzaSpecial Special { get; set; }
+	public PizzaSpecial Special { get; set; }
 
-        public int SpecialId { get; set; }
+	public int SpecialId { get; set; }
 
-        public int Size { get; set; }
+	public int Size { get; set; }
 
-        public List<PizzaTopping> Toppings { get; set; }
+	public List<PizzaTopping> Toppings { get; set; }
 
-        public decimal GetBasePrice()
-        {
-            return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-        }
+	public decimal GetBasePrice()
+	{
+		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+	}
 
-        public decimal GetTotalPrice()
-        {
-            return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-        }
+	public decimal GetTotalPrice()
+	{
+		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+	}
 
-        public string GetFormattedTotalPrice()
-        {
-            return GetTotalPrice().ToString("0.00");
-        }
-    }
+	public string GetFormattedTotalPrice()
+	{
+		return GetTotalPrice().ToString("0.00");
+	}
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
+[JsonSerializable(typeof(Pizza))]
+public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaSpecial.cs
index 2f2b3383..9653300c 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaSpecial.cs
@@ -1,20 +1,19 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+/// Represents a pre-configured template for a pizza a user can order
+/// </summary>
+public class PizzaSpecial
 {
-    /// <summary>
-    /// Represents a pre-configured template for a pizza a user can order
-    /// </summary>
-    public class PizzaSpecial
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal BasePrice { get; set; }
+	public decimal BasePrice { get; set; }
 
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public string ImageUrl { get; set; }
+	public string ImageUrl { get; set; }
 
-        public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
-    }
-}
+	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaTopping.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaTopping.cs
index f5a6c1ac..0a711647 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaTopping.cs
@@ -1,11 +1,11 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class PizzaTopping
 {
-    public class PizzaTopping
-    {
-        public Topping Topping { get; set; }
+	public Topping Topping { get; set; }
+
+	public int ToppingId { get; set; }
 
-        public int ToppingId { get; set; }
-        
-        public int PizzaId { get; set; }
-    }
-}
+	public int PizzaId { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/Topping.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/Topping.cs
index 61bdeb92..376c311a 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/Topping.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/Topping.cs
@@ -1,13 +1,13 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Topping
 {
-    public class Topping
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal Price { get; set; }
+	public decimal Price { get; set; }
 
-        public string GetFormattedPrice() => Price.ToString("0.00");
-    }
-}
+	public string GetFormattedPrice() => Price.ToString("0.00");
+	
+}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/UserInfo.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/UserInfo.cs
index 4996ef80..362f8f8e 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/UserInfo.cs
@@ -1,9 +1,9 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class UserInfo
 {
-    public class UserInfo
-    {
-        public bool IsAuthenticated { get; set; }
+	public bool IsAuthenticated { get; set; }
 
-        public string Name { get; set; }
-    }
-}
+	public string Name { get; set; }
+	
+}
\ No newline at end of file

From 2ef41963f6b4be3e9b2feaf510a350b95a35efd0 Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Fritz" <csharpfritz@users.noreply.github.com>
Date: Thu, 3 Mar 2022 14:43:42 -0500
Subject: [PATCH 11/20] Updated savepoint 2, 3, 4, 5, 6, 7, 8, 9

---
 .../Map/Marker.cs                             |  17 +-
 .../Map/Point.cs                              |  13 +-
 .../Map/Marker.cs                             |  16 +-
 .../Map/Point.cs                              |  12 +-
 .../BlazingPizza.Server/PizzaStoreUser.cs     |   6 +-
 .../BlazingPizza.Client.csproj                |   1 +
 .../BlazingPizza.Client/Program.cs            |  24 +-
 .../BlazingPizza.ComponentsLibrary.csproj     |   1 +
 .../LocalStorage.cs                           |  24 +-
 .../BlazingPizza.Server.csproj                |   1 +
 .../Models/AddressEntityType.cs               |  92 +++++
 .../Models/DeviceFlowCodesEntityType.cs       | 114 ++++++
 .../IdentityRoleClaimstringEntityType.cs      |  85 ++++
 .../Models/IdentityRoleEntityType.cs          |  78 ++++
 .../IdentityUserClaimstringEntityType.cs      |  85 ++++
 .../IdentityUserLoginstringEntityType.cs      |  86 ++++
 .../IdentityUserRolestringEntityType.cs       |  82 ++++
 .../IdentityUserTokenstringEntityType.cs      |  84 ++++
 .../Models/KeyEntityType.cs                   |  96 +++++
 .../Models/LatLongEntityType.cs               |  80 ++++
 .../NotificationSubscriptionEntityType.cs     |  77 ++++
 .../Models/OrderEntityType.cs                 |  86 ++++
 .../Models/PersistedGrantEntityType.cs        | 127 ++++++
 .../Models/PizzaEntityType.cs                 | 111 +++++
 .../Models/PizzaSpecialEntityType.cs          |  76 ++++
 .../Models/PizzaStoreContextModel.cs          |  28 ++
 .../Models/PizzaStoreContextModelBuilder.cs   |  69 ++++
 .../Models/PizzaStoreUserEntityType.cs        | 156 +++++++
 .../Models/PizzaToppingEntityType.cs          |  96 +++++
 .../Models/ToppingEntityType.cs               |  62 +++
 .../NotificationsController.cs                |  43 --
 .../OidcConfigurationController.cs            |  35 +-
 .../BlazingPizza.Server/OrdersController.cs   | 215 +++++-----
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  60 +++
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  49 ++-
 .../BlazingPizza.Server/PizzaStoreUser.cs     |   6 +-
 .../BlazingPizza.Server/PizzasController.cs   |  16 -
 .../BlazingPizza.Server/Program.cs            |  94 +++--
 .../BlazingPizza.Server/SeedData.cs           | 379 +++++++++---------
 .../BlazingPizza.Shared/Address.cs            |  27 +-
 .../BlazingPizza.Shared.csproj                |   1 +
 .../BlazingPizza.Shared/LatLong.cs            |  43 +-
 .../NotificationSubscription.cs               |  17 +-
 .../BlazingPizza.Shared/Order.cs              |  37 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 133 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  62 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  27 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |  18 +-
 .../BlazingPizza.Shared/Topping.cs            |  18 +-
 .../BlazingPizza.Shared/UserInfo.cs           |  14 +-
 .../BlazingPizza.Client.csproj                |   1 +
 .../BlazingPizza.Client/Program.cs            |  24 +-
 .../BlazingPizza.ComponentsLibrary.csproj     |   1 +
 .../LocalStorage.cs                           |  22 +-
 .../Map/Marker.cs                             |  15 +-
 .../Map/Point.cs                              |  13 +-
 .../BlazingPizza.Server.csproj                |   1 +
 .../Models/AddressEntityType.cs               |  92 +++++
 .../Models/DeviceFlowCodesEntityType.cs       | 114 ++++++
 .../IdentityRoleClaimstringEntityType.cs      |  85 ++++
 .../Models/IdentityRoleEntityType.cs          |  78 ++++
 .../IdentityUserClaimstringEntityType.cs      |  85 ++++
 .../IdentityUserLoginstringEntityType.cs      |  86 ++++
 .../IdentityUserRolestringEntityType.cs       |  82 ++++
 .../IdentityUserTokenstringEntityType.cs      |  84 ++++
 .../Models/KeyEntityType.cs                   |  96 +++++
 .../Models/LatLongEntityType.cs               |  80 ++++
 .../NotificationSubscriptionEntityType.cs     |  77 ++++
 .../Models/OrderEntityType.cs                 |  86 ++++
 .../Models/PersistedGrantEntityType.cs        | 127 ++++++
 .../Models/PizzaEntityType.cs                 | 111 +++++
 .../Models/PizzaSpecialEntityType.cs          |  76 ++++
 .../Models/PizzaStoreContextModel.cs          |  28 ++
 .../Models/PizzaStoreContextModelBuilder.cs   |  69 ++++
 .../Models/PizzaStoreUserEntityType.cs        | 156 +++++++
 .../Models/PizzaToppingEntityType.cs          |  96 +++++
 .../Models/ToppingEntityType.cs               |  62 +++
 .../NotificationsController.cs                |  43 --
 .../OidcConfigurationController.cs            |  35 +-
 .../BlazingPizza.Server/OrdersController.cs   | 215 +++++-----
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  60 +++
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  49 ++-
 .../BlazingPizza.Server/PizzaStoreUser.cs     |   6 +-
 .../BlazingPizza.Server/PizzasController.cs   |  16 -
 .../BlazingPizza.Server/Program.cs            |  94 +++--
 .../BlazingPizza.Server/SeedData.cs           | 379 +++++++++---------
 .../BlazingPizza.Server/SpecialsController.cs |  26 --
 .../BlazingPizza.Server/Startup.cs            |  70 ----
 .../BlazingPizza.Server/ToppingsController.cs |  26 --
 .../BlazingPizza.Shared/Address.cs            |  27 +-
 .../BlazingPizza.Shared.csproj                |   1 +
 .../BlazingPizza.Shared/LatLong.cs            |  43 +-
 .../NotificationSubscription.cs               |  17 +-
 .../BlazingPizza.Shared/Order.cs              |  37 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 133 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  62 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  27 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |  18 +-
 .../BlazingPizza.Shared/Topping.cs            |  18 +-
 .../BlazingPizza.Shared/UserInfo.cs           |  14 +-
 .../BlazingPizza.Client.csproj                |   1 +
 .../BlazingPizza.Client/OrderState.cs         |  91 ++---
 .../BlazingPizza.Client/Program.cs            |  26 +-
 .../BlazingPizza.ComponentsLibrary.csproj     |   1 +
 .../LocalStorage.cs                           |  22 +-
 .../Map/Marker.cs                             |  15 +-
 .../Map/Point.cs                              |  13 +-
 .../BlazingPizza.Server.csproj                |   2 +
 .../Models/AddressEntityType.cs               |  92 +++++
 .../Models/DeviceFlowCodesEntityType.cs       | 114 ++++++
 .../IdentityRoleClaimstringEntityType.cs      |  85 ++++
 .../Models/IdentityRoleEntityType.cs          |  78 ++++
 .../IdentityUserClaimstringEntityType.cs      |  85 ++++
 .../IdentityUserLoginstringEntityType.cs      |  86 ++++
 .../IdentityUserRolestringEntityType.cs       |  82 ++++
 .../IdentityUserTokenstringEntityType.cs      |  84 ++++
 .../Models/KeyEntityType.cs                   |  96 +++++
 .../Models/LatLongEntityType.cs               |  80 ++++
 .../NotificationSubscriptionEntityType.cs     |  77 ++++
 .../Models/OrderEntityType.cs                 |  86 ++++
 .../Models/PersistedGrantEntityType.cs        | 127 ++++++
 .../Models/PizzaEntityType.cs                 | 111 +++++
 .../Models/PizzaSpecialEntityType.cs          |  76 ++++
 .../Models/PizzaStoreContextModel.cs          |  28 ++
 .../Models/PizzaStoreContextModelBuilder.cs   |  69 ++++
 .../Models/PizzaStoreUserEntityType.cs        | 156 +++++++
 .../Models/PizzaToppingEntityType.cs          |  96 +++++
 .../Models/ToppingEntityType.cs               |  62 +++
 .../NotificationsController.cs                |  43 --
 .../OidcConfigurationController.cs            |  33 +-
 .../BlazingPizza.Server/OrdersController.cs   | 234 ++++++-----
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  60 +++
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  49 ++-
 .../BlazingPizza.Server/PizzaStoreUser.cs     |   9 +-
 .../BlazingPizza.Server/PizzasController.cs   |  16 -
 .../BlazingPizza.Server/Program.cs            |  94 +++--
 .../BlazingPizza.Server/SeedData.cs           | 379 +++++++++---------
 .../BlazingPizza.Server/SpecialsController.cs |  26 --
 .../BlazingPizza.Server/Startup.cs            |  70 ----
 .../BlazingPizza.Server/ToppingsController.cs |  26 --
 .../BlazingPizza.Server/pizza.db-shm          | Bin 0 -> 32768 bytes
 .../BlazingPizza.Server/pizza.db-wal          | Bin 0 -> 214272 bytes
 .../BlazingPizza.Shared/Address.cs            |  27 +-
 .../BlazingPizza.Shared.csproj                |   1 +
 .../BlazingPizza.Shared/LatLong.cs            |  43 +-
 .../NotificationSubscription.cs               |  17 +-
 .../BlazingPizza.Shared/Order.cs              |  37 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 133 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  62 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  27 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |  18 +-
 .../BlazingPizza.Shared/Topping.cs            |  18 +-
 .../BlazingPizza.Shared/UserInfo.cs           |  14 +-
 .../BlazingPizza.Client.csproj                |   5 +-
 .../BlazingPizza.Client/OrderState.cs         |  96 ++---
 .../BlazingPizza.Client/Program.cs            |  24 +-
 .../BlazingPizza.ComponentsLibrary.csproj     |   1 +
 .../LocalStorage.cs                           |  22 +-
 .../Map/Marker.cs                             |  15 +-
 .../Map/Point.cs                              |  13 +-
 .../BlazingPizza.Server.csproj                |   2 +
 .../NotificationsController.cs                |  43 --
 .../OidcConfigurationController.cs            |  33 +-
 .../BlazingPizza.Server/OrdersController.cs   | 234 ++++++-----
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  60 +++
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  49 ++-
 .../BlazingPizza.Server/PizzaStoreUser.cs     |   9 +-
 .../BlazingPizza.Server/PizzasController.cs   |  16 -
 .../BlazingPizza.Server/Program.cs            |  94 +++--
 .../BlazingPizza.Server/SeedData.cs           | 379 +++++++++---------
 .../BlazingPizza.Server/SpecialsController.cs |  26 --
 .../BlazingPizza.Server/Startup.cs            |  70 ----
 .../BlazingPizza.Server/ToppingsController.cs |  26 --
 .../BlazingPizza.Shared/Address.cs            |  33 +-
 .../BlazingPizza.Shared.csproj                |   5 +
 .../BlazingPizza.Shared/LatLong.cs            |  43 +-
 .../NotificationSubscription.cs               |  17 +-
 .../BlazingPizza.Shared/Order.cs              |  37 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 133 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  62 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  27 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |  18 +-
 .../BlazingPizza.Shared/Topping.cs            |  18 +-
 .../BlazingPizza.Shared/UserInfo.cs           |  14 +-
 .../BlazingPizza.Client.csproj                |   5 +-
 .../BlazingPizza.Client/OrderState.cs         | 101 +++--
 .../BlazingPizza.Client/OrdersClient.cs       |  51 ++-
 .../PizzaAuthenticationState.cs               |   9 +-
 .../BlazingPizza.Client/Program.cs            |  37 +-
 .../BlazingPizza.ComponentsLibrary.csproj     |   1 +
 .../LocalStorage.cs                           |  22 +-
 .../Map/Marker.cs                             |  15 +-
 .../Map/Point.cs                              |  13 +-
 .../Models/AddressEntityType.cs               |  92 +++++
 .../Models/DeviceFlowCodesEntityType.cs       | 114 ++++++
 .../IdentityRoleClaimstringEntityType.cs      |  85 ++++
 .../Models/IdentityRoleEntityType.cs          |  78 ++++
 .../IdentityUserClaimstringEntityType.cs      |  85 ++++
 .../IdentityUserLoginstringEntityType.cs      |  86 ++++
 .../IdentityUserRolestringEntityType.cs       |  82 ++++
 .../IdentityUserTokenstringEntityType.cs      |  84 ++++
 .../Models/KeyEntityType.cs                   |  96 +++++
 .../Models/LatLongEntityType.cs               |  80 ++++
 .../NotificationSubscriptionEntityType.cs     |  77 ++++
 .../Models/OrderEntityType.cs                 |  86 ++++
 .../Models/PersistedGrantEntityType.cs        | 127 ++++++
 .../Models/PizzaEntityType.cs                 | 111 +++++
 .../Models/PizzaSpecialEntityType.cs          |  76 ++++
 .../Models/PizzaStoreContextModel.cs          |  28 ++
 .../Models/PizzaStoreContextModelBuilder.cs   |  69 ++++
 .../Models/PizzaStoreUserEntityType.cs        | 156 +++++++
 .../Models/PizzaToppingEntityType.cs          |  96 +++++
 .../Models/ToppingEntityType.cs               |  62 +++
 .../BlazingPizza.Server/SeedData.cs           | 379 +++++++++---------
 .../BlazingPizza.Server/SpecialsController.cs |  26 --
 .../BlazingPizza.Server/Startup.cs            |  70 ----
 .../BlazingPizza.Server/ToppingsController.cs |  26 --
 .../BlazingPizza.Server/pizza.db-shm          | Bin 0 -> 32768 bytes
 .../BlazingPizza.Server/pizza.db-wal          | Bin 0 -> 226632 bytes
 .../BlazingPizza.Shared/Address.cs            |  33 +-
 .../BlazingPizza.Shared.csproj                |   5 +
 .../BlazingPizza.Shared/LatLong.cs            |  43 +-
 .../NotificationSubscription.cs               |  17 +-
 .../BlazingPizza.Shared/Order.cs              |  37 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 133 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  62 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  27 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |  18 +-
 .../BlazingPizza.Shared/Topping.cs            |  18 +-
 .../BlazingPizza.Shared/UserInfo.cs           |  14 +-
 .../BlazingPizza.Client.csproj                |   5 +-
 .../JSRuntimeExtensions.cs                    |  16 +-
 .../BlazingPizza.Client/OrderState.cs         | 101 +++--
 .../BlazingPizza.Client/OrdersClient.cs       |  57 +--
 .../PizzaAuthenticationState.cs               |   9 +-
 .../BlazingPizza.Client/Program.cs            |  37 +-
 .../BlazingPizza.ComponentsLibrary.csproj     |   1 +
 .../LocalStorage.cs                           |  22 +-
 .../Map/Marker.cs                             |  15 +-
 .../Map/Point.cs                              |  13 +-
 .../BlazingPizza.Server.csproj                |   2 +
 .../Models/AddressEntityType.cs               |  92 +++++
 .../Models/DeviceFlowCodesEntityType.cs       | 114 ++++++
 .../IdentityRoleClaimstringEntityType.cs      |  85 ++++
 .../Models/IdentityRoleEntityType.cs          |  78 ++++
 .../IdentityUserClaimstringEntityType.cs      |  85 ++++
 .../IdentityUserLoginstringEntityType.cs      |  86 ++++
 .../IdentityUserRolestringEntityType.cs       |  82 ++++
 .../IdentityUserTokenstringEntityType.cs      |  84 ++++
 .../Models/KeyEntityType.cs                   |  96 +++++
 .../Models/LatLongEntityType.cs               |  80 ++++
 .../NotificationSubscriptionEntityType.cs     |  77 ++++
 .../Models/OrderEntityType.cs                 |  86 ++++
 .../Models/PersistedGrantEntityType.cs        | 127 ++++++
 .../Models/PizzaEntityType.cs                 | 111 +++++
 .../Models/PizzaSpecialEntityType.cs          |  76 ++++
 .../Models/PizzaStoreContextModel.cs          |  28 ++
 .../Models/PizzaStoreContextModelBuilder.cs   |  69 ++++
 .../Models/PizzaStoreUserEntityType.cs        | 156 +++++++
 .../Models/PizzaToppingEntityType.cs          |  96 +++++
 .../Models/ToppingEntityType.cs               |  62 +++
 .../NotificationsController.cs                |  43 --
 .../OidcConfigurationController.cs            |  33 +-
 .../BlazingPizza.Server/OrdersController.cs   | 233 ++++++-----
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  60 +++
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  49 ++-
 .../BlazingPizza.Server/PizzaStoreUser.cs     |   9 +-
 .../BlazingPizza.Server/PizzasController.cs   |  16 -
 .../BlazingPizza.Server/Program.cs            |  94 +++--
 .../BlazingPizza.Server/SeedData.cs           | 379 +++++++++---------
 .../BlazingPizza.Server/SpecialsController.cs |  26 --
 .../BlazingPizza.Server/Startup.cs            |  70 ----
 .../BlazingPizza.Server/ToppingsController.cs |  26 --
 .../BlazingPizza.Shared/Address.cs            |  33 +-
 .../BlazingPizza.Shared.csproj                |   5 +
 .../BlazingPizza.Shared/LatLong.cs            |  43 +-
 .../NotificationSubscription.cs               |  17 +-
 .../BlazingPizza.Shared/Order.cs              |  37 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 133 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  62 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  27 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |  18 +-
 .../BlazingPizza.Shared/Topping.cs            |  18 +-
 .../BlazingPizza.Shared/UserInfo.cs           |  14 +-
 .../BlazingPizza.Client.csproj                |   4 +-
 .../JSRuntimeExtensions.cs                    |  16 +-
 .../BlazingPizza.Client/OrderState.cs         | 101 +++--
 .../BlazingPizza.Client/OrdersClient.cs       |  57 +--
 .../PizzaAuthenticationState.cs               |   9 +-
 .../BlazingPizza.Client/Program.cs            |  37 +-
 .../BlazingPizza.ComponentsLibrary.csproj     |   1 +
 .../LocalStorage.cs                           |  22 +-
 .../Map/Marker.cs                             |  15 +-
 .../Map/Point.cs                              |  13 +-
 .../BlazingPizza.Server.csproj                |   2 +
 .../Models/AddressEntityType.cs               |  92 +++++
 .../Models/DeviceFlowCodesEntityType.cs       | 114 ++++++
 .../IdentityRoleClaimstringEntityType.cs      |  85 ++++
 .../Models/IdentityRoleEntityType.cs          |  78 ++++
 .../IdentityUserClaimstringEntityType.cs      |  85 ++++
 .../IdentityUserLoginstringEntityType.cs      |  86 ++++
 .../IdentityUserRolestringEntityType.cs       |  82 ++++
 .../IdentityUserTokenstringEntityType.cs      |  84 ++++
 .../Models/KeyEntityType.cs                   |  96 +++++
 .../Models/LatLongEntityType.cs               |  80 ++++
 .../NotificationSubscriptionEntityType.cs     |  77 ++++
 .../Models/OrderEntityType.cs                 |  86 ++++
 .../Models/PersistedGrantEntityType.cs        | 127 ++++++
 .../Models/PizzaEntityType.cs                 | 111 +++++
 .../Models/PizzaSpecialEntityType.cs          |  76 ++++
 .../Models/PizzaStoreContextModel.cs          |  28 ++
 .../Models/PizzaStoreContextModelBuilder.cs   |  69 ++++
 .../Models/PizzaStoreUserEntityType.cs        | 156 +++++++
 .../Models/PizzaToppingEntityType.cs          |  96 +++++
 .../Models/ToppingEntityType.cs               |  62 +++
 .../NotificationsController.cs                |  43 --
 .../OidcConfigurationController.cs            |  33 +-
 .../BlazingPizza.Server/OrdersController.cs   | 233 ++++++-----
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  60 +++
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  49 ++-
 .../BlazingPizza.Server/PizzaStoreUser.cs     |   9 +-
 .../BlazingPizza.Server/PizzasController.cs   |  16 -
 .../BlazingPizza.Server/Program.cs            |  94 +++--
 .../BlazingPizza.Server/SeedData.cs           | 379 +++++++++---------
 .../BlazingPizza.Server/SpecialsController.cs |  26 --
 .../BlazingPizza.Server/Startup.cs            |  70 ----
 .../BlazingPizza.Server/ToppingsController.cs |  26 --
 .../BlazingPizza.Server/pizza.db-shm          | Bin 0 -> 32768 bytes
 .../BlazingPizza.Server/pizza.db-wal          | Bin 0 -> 226632 bytes
 .../BlazingPizza.Shared/Address.cs            |  33 +-
 .../BlazingPizza.Shared.csproj                |   5 +
 .../BlazingPizza.Shared/LatLong.cs            |  43 +-
 .../NotificationSubscription.cs               |  17 +-
 .../BlazingPizza.Shared/Order.cs              |  37 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 133 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  62 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  27 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |  18 +-
 .../BlazingPizza.Shared/Topping.cs            |  18 +-
 .../BlazingPizza.Shared/UserInfo.cs           |  14 +-
 .../BlazingPizza.Client.csproj                |   1 +
 .../JSRuntimeExtensions.cs                    |  16 +-
 .../BlazingPizza.Client/OrderState.cs         | 101 +++--
 .../BlazingPizza.Client/OrdersClient.cs       |  58 ++-
 .../PizzaAuthenticationState.cs               |   9 +-
 .../BlazingPizza.Client/Program.cs            |  37 +-
 .../BlazingPizza.ComponentsLibrary.csproj     |   1 +
 .../LocalStorage.cs                           |  22 +-
 .../BlazingPizza.Server.csproj                |   1 +
 .../Models/AddressEntityType.cs               |  92 +++++
 .../Models/DeviceFlowCodesEntityType.cs       | 114 ++++++
 .../IdentityRoleClaimstringEntityType.cs      |  85 ++++
 .../Models/IdentityRoleEntityType.cs          |  78 ++++
 .../IdentityUserClaimstringEntityType.cs      |  85 ++++
 .../IdentityUserLoginstringEntityType.cs      |  86 ++++
 .../IdentityUserRolestringEntityType.cs       |  82 ++++
 .../IdentityUserTokenstringEntityType.cs      |  84 ++++
 .../Models/KeyEntityType.cs                   |  96 +++++
 .../Models/LatLongEntityType.cs               |  80 ++++
 .../NotificationSubscriptionEntityType.cs     |  77 ++++
 .../Models/OrderEntityType.cs                 |  86 ++++
 .../Models/PersistedGrantEntityType.cs        | 127 ++++++
 .../Models/PizzaEntityType.cs                 | 111 +++++
 .../Models/PizzaSpecialEntityType.cs          |  76 ++++
 .../Models/PizzaStoreContextModel.cs          |  28 ++
 .../Models/PizzaStoreContextModelBuilder.cs   |  69 ++++
 .../Models/PizzaStoreUserEntityType.cs        | 156 +++++++
 .../Models/PizzaToppingEntityType.cs          |  96 +++++
 .../Models/ToppingEntityType.cs               |  62 +++
 .../OidcConfigurationController.cs            |  33 +-
 .../BlazingPizza.Server/OrdersController.cs   | 249 ++++++------
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  60 +++
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  51 ++-
 .../BlazingPizza.Server/PizzaStoreUser.cs     |   9 +-
 .../BlazingPizza.Server/PizzasController.cs   |  16 -
 .../BlazingPizza.Server/Program.cs            |  94 +++--
 .../BlazingPizza.Server/SeedData.cs           | 379 +++++++++---------
 .../BlazingPizza.Server/SpecialsController.cs |  26 --
 .../BlazingPizza.Server/Startup.cs            |  70 ----
 .../BlazingPizza.Server/ToppingsController.cs |  26 --
 .../BlazingPizza.Shared/Address.cs            |  33 +-
 .../BlazingPizza.Shared.csproj                |   5 +
 .../BlazingPizza.Shared/LatLong.cs            |  43 +-
 .../NotificationSubscription.cs               |  17 +-
 .../BlazingPizza.Shared/Order.cs              |  37 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 133 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  62 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  27 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |  18 +-
 .../BlazingPizza.Shared/Topping.cs            |  18 +-
 .../BlazingPizza.Shared/UserInfo.cs           |  14 +-
 391 files changed, 18264 insertions(+), 6532 deletions(-)
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/AddressEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/KeyEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/LatLongEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/OrderEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/Models/ToppingEntityType.cs
 delete mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/NotificationsController.cs
 create mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaApiExtensions.cs
 delete mode 100644 save-points/02-customize-a-pizza/BlazingPizza.Server/PizzasController.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/AddressEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/KeyEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/LatLongEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/OrderEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Models/ToppingEntityType.cs
 delete mode 100644 save-points/03-show-order-status/BlazingPizza.Server/NotificationsController.cs
 create mode 100644 save-points/03-show-order-status/BlazingPizza.Server/PizzaApiExtensions.cs
 delete mode 100644 save-points/03-show-order-status/BlazingPizza.Server/PizzasController.cs
 delete mode 100644 save-points/03-show-order-status/BlazingPizza.Server/SpecialsController.cs
 delete mode 100644 save-points/03-show-order-status/BlazingPizza.Server/Startup.cs
 delete mode 100644 save-points/03-show-order-status/BlazingPizza.Server/ToppingsController.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/AddressEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/KeyEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/LatLongEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/OrderEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Models/ToppingEntityType.cs
 delete mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/NotificationsController.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/PizzaApiExtensions.cs
 delete mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/PizzasController.cs
 delete mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/SpecialsController.cs
 delete mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/Startup.cs
 delete mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/ToppingsController.cs
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/pizza.db-shm
 create mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/pizza.db-wal
 delete mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/NotificationsController.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaApiExtensions.cs
 delete mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/PizzasController.cs
 delete mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/SpecialsController.cs
 delete mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Startup.cs
 delete mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/ToppingsController.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/AddressEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/KeyEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/LatLongEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/OrderEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/ToppingEntityType.cs
 delete mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/SpecialsController.cs
 delete mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/Startup.cs
 delete mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/ToppingsController.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/pizza.db-shm
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/pizza.db-wal
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/AddressEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/KeyEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/LatLongEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/OrderEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Models/ToppingEntityType.cs
 delete mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/NotificationsController.cs
 create mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/PizzaApiExtensions.cs
 delete mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/PizzasController.cs
 delete mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/SpecialsController.cs
 delete mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/Startup.cs
 delete mode 100644 save-points/07-javascript-interop/BlazingPizza.Server/ToppingsController.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/AddressEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/KeyEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/LatLongEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/OrderEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/PizzaEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/Models/ToppingEntityType.cs
 delete mode 100644 save-points/08-templated-components/BlazingPizza.Server/NotificationsController.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/PizzaApiExtensions.cs
 delete mode 100644 save-points/08-templated-components/BlazingPizza.Server/PizzasController.cs
 delete mode 100644 save-points/08-templated-components/BlazingPizza.Server/SpecialsController.cs
 delete mode 100644 save-points/08-templated-components/BlazingPizza.Server/Startup.cs
 delete mode 100644 save-points/08-templated-components/BlazingPizza.Server/ToppingsController.cs
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/pizza.db-shm
 create mode 100644 save-points/08-templated-components/BlazingPizza.Server/pizza.db-wal
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/AddressEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/KeyEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/LatLongEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/OrderEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Models/ToppingEntityType.cs
 create mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/PizzaApiExtensions.cs
 delete mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/PizzasController.cs
 delete mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/SpecialsController.cs
 delete mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/Startup.cs
 delete mode 100644 save-points/09-progressive-web-app/BlazingPizza.Server/ToppingsController.cs

diff --git a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index 63006067..7be5cafb 100644
--- a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -1,13 +1,12 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Marker
 {
-    public class Marker
-    {
-        public string Description { get; set; }
+		public string Description { get; set; }
 
-        public double X { get; set; }
+		public double X { get; set; }
 
-        public double Y { get; set; }
+		public double Y { get; set; }
 
-        public bool ShowPopup { get; set; }
-    }
-}
+		public bool ShowPopup { get; set; }
+}
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 03841826..a1040c38 100644
--- a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -1,9 +1,8 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Point
 {
-    public class Point
-    {
-        public double X { get; set; }
+		public double X { get; set; }
 
-        public double Y { get; set; }
-    }
-}
+		public double Y { get; set; }
+}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index 63006067..da486e7c 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -1,13 +1,11 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+public class Marker
 {
-    public class Marker
-    {
-        public string Description { get; set; }
+		public string Description { get; set; }
 
-        public double X { get; set; }
+		public double X { get; set; }
 
-        public double Y { get; set; }
+		public double Y { get; set; }
 
-        public bool ShowPopup { get; set; }
-    }
-}
+		public bool ShowPopup { get; set; }
+}
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 03841826..01f420f3 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -1,9 +1,9 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Point
 {
-    public class Point
-    {
-        public double X { get; set; }
+		public double X { get; set; }
 
-        public double Y { get; set; }
-    }
+		public double Y { get; set; }
 }
+// Compare this snippet from save-points\01-Components-and-layout\BlazingPizza.ComponentsLibrary\Map\Marker.cs:
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreUser.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreUser.cs
index 171ce83d..d446a679 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreUser.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreUser.cs
@@ -1,8 +1,6 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+public class PizzaStoreUser : IdentityUser
 {
-    public class PizzaStoreUser : IdentityUser
-    {
-    }
 }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/02-customize-a-pizza/BlazingPizza.Client/BlazingPizza.Client.csproj
index cd5da247..8f007b31 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Client/Program.cs b/save-points/02-customize-a-pizza/BlazingPizza.Client/Program.cs
index 48147d6f..ab7dd4d9 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Client/Program.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Client/Program.cs
@@ -1,21 +1,9 @@
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
+using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
-namespace BlazingPizza.Client
-{
-    public class Program
-    {
-        public static async Task Main(string[] args)
-        {
-            var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("#app");
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<App>("#app");
 
-            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
-            await builder.Build().RunAsync();
-        }
-    }
-}
+await builder.Build().RunAsync();
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 61ebf623..cb996b1b 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index f36b098e..3925ced2 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -1,17 +1,17 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.ComponentsLibrary
+namespace BlazingPizza.ComponentsLibrary;
+
+public static class LocalStorage
 {
-    public static class LocalStorage
-    {
-        public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-        public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+
+	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-        public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
-    }
-}
+	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+			
+}
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/02-customize-a-pizza/BlazingPizza.Server/BlazingPizza.Server.csproj
index b9c74fc4..227890e1 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/AddressEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/AddressEntityType.cs
new file mode 100644
index 00000000..82db81b6
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/AddressEntityType.cs
@@ -0,0 +1,92 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class AddressEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Address",
+                typeof(Address),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Address).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var city = runtimeEntityType.AddProperty(
+                "City",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("City", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<City>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var line1 = runtimeEntityType.AddProperty(
+                "Line1",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var line2 = runtimeEntityType.AddProperty(
+                "Line2",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var postalCode = runtimeEntityType.AddProperty(
+                "PostalCode",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("PostalCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<PostalCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var region = runtimeEntityType.AddProperty(
+                "Region",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Region", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Region>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Address");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
new file mode 100644
index 00000000..1dd4563b
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
@@ -0,0 +1,114 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class DeviceFlowCodesEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes",
+                typeof(DeviceFlowCodes),
+                baseEntityType);
+
+            var userCode = runtimeEntityType.AddProperty(
+                "UserCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("UserCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<UserCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var deviceCode = runtimeEntityType.AddProperty(
+                "DeviceCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("DeviceCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<DeviceCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userCode });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deviceCode },
+                unique: true);
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DeviceCodes");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
new file mode 100644
index 00000000..8946b261
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>",
+                typeof(IdentityRoleClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoleClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityRoleEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
new file mode 100644
index 00000000..2f1fec2b
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
@@ -0,0 +1,78 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRole",
+                typeof(IdentityRole),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedName = runtimeEntityType.AddProperty(
+                "NormalizedName",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("NormalizedName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<NormalizedName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedName },
+                unique: true);
+            index.AddAnnotation("Relational:Name", "RoleNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
new file mode 100644
index 00000000..55418a1e
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserClaim<string>",
+                typeof(IdentityUserClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
new file mode 100644
index 00000000..3ca029bd
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserLoginstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserLogin<string>",
+                typeof(IdentityUserLogin<string>),
+                baseEntityType);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerKey = runtimeEntityType.AddProperty(
+                "ProviderKey",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderKey", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderKey>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerDisplayName = runtimeEntityType.AddProperty(
+                "ProviderDisplayName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderDisplayName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderDisplayName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { loginProvider, providerKey });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserLogins");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
new file mode 100644
index 00000000..70078d7a
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
@@ -0,0 +1,82 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserRolestringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserRole<string>",
+                typeof(IdentityUserRole<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, roleId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
new file mode 100644
index 00000000..93ba6d31
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
@@ -0,0 +1,84 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserTokenstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserToken<string>",
+                typeof(IdentityUserToken<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var value = runtimeEntityType.AddProperty(
+                "Value",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Value", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Value>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, loginProvider, name });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserTokens");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/KeyEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/KeyEntityType.cs
new file mode 100644
index 00000000..f6c6b4c7
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/KeyEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class KeyEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.Key",
+                typeof(Key),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var algorithm = runtimeEntityType.AddProperty(
+                "Algorithm",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Algorithm", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Algorithm>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var created = runtimeEntityType.AddProperty(
+                "Created",
+                typeof(DateTime),
+                propertyInfo: typeof(Key).GetProperty("Created", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Created>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var dataProtected = runtimeEntityType.AddProperty(
+                "DataProtected",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("DataProtected", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<DataProtected>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var isX509Certificate = runtimeEntityType.AddProperty(
+                "IsX509Certificate",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("IsX509Certificate", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<IsX509Certificate>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var use = runtimeEntityType.AddProperty(
+                "Use",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Use", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Use>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var version = runtimeEntityType.AddProperty(
+                "Version",
+                typeof(int),
+                propertyInfo: typeof(Key).GetProperty("Version", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Version>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { use });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Keys");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/LatLongEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/LatLongEntityType.cs
new file mode 100644
index 00000000..3fd254bd
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/LatLongEntityType.cs
@@ -0,0 +1,80 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class LatLongEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.LatLong",
+                typeof(LatLong),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var latitude = runtimeEntityType.AddProperty(
+                "Latitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Latitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Latitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var longitude = runtimeEntityType.AddProperty(
+                "Longitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Longitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Longitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                ownership: true);
+
+            var deliveryLocation = principalEntityType.AddNavigation("DeliveryLocation",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(LatLong),
+                propertyInfo: typeof(Order).GetProperty("DeliveryLocation", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryLocation>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
new file mode 100644
index 00000000..db236e4c
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
@@ -0,0 +1,77 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class NotificationSubscriptionEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.NotificationSubscription",
+                typeof(NotificationSubscription),
+                baseEntityType);
+
+            var notificationSubscriptionId = runtimeEntityType.AddProperty(
+                "NotificationSubscriptionId",
+                typeof(int),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("NotificationSubscriptionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<NotificationSubscriptionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var auth = runtimeEntityType.AddProperty(
+                "Auth",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Auth", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Auth>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var p256dh = runtimeEntityType.AddProperty(
+                "P256dh",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("P256dh", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<P256dh>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var url = runtimeEntityType.AddProperty(
+                "Url",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Url", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Url>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { notificationSubscriptionId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "NotificationSubscriptions");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/OrderEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/OrderEntityType.cs
new file mode 100644
index 00000000..9d9ec6fd
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/OrderEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class OrderEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Order",
+                typeof(Order),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Order).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var createdTime = runtimeEntityType.AddProperty(
+                "CreatedTime",
+                typeof(DateTime),
+                propertyInfo: typeof(Order).GetProperty("CreatedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<CreatedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var deliveryAddressId = runtimeEntityType.AddProperty(
+                "DeliveryAddressId",
+                typeof(int?),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(Order).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deliveryAddressId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("DeliveryAddressId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var deliveryAddress = declaringEntityType.AddNavigation("DeliveryAddress",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Address),
+                propertyInfo: typeof(Order).GetProperty("DeliveryAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PersistedGrantEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
new file mode 100644
index 00000000..842d53a5
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
@@ -0,0 +1,127 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PersistedGrantEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.PersistedGrant",
+                typeof(PersistedGrant),
+                baseEntityType);
+
+            var key = runtimeEntityType.AddProperty(
+                "Key",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Key", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Key>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var consumedTime = runtimeEntityType.AddProperty(
+                "ConsumedTime",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ConsumedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ConsumedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(PersistedGrant).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var type = runtimeEntityType.AddProperty(
+                "Type",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Type", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Type>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var key0 = runtimeEntityType.AddKey(
+                new[] { key });
+            runtimeEntityType.SetPrimaryKey(key0);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { consumedTime });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            var index1 = runtimeEntityType.AddIndex(
+                new[] { subjectId, clientId, type });
+
+            var index2 = runtimeEntityType.AddIndex(
+                new[] { subjectId, sessionId, type });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PersistedGrants");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaEntityType.cs
new file mode 100644
index 00000000..3a124e63
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaEntityType.cs
@@ -0,0 +1,111 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Pizza",
+                typeof(Pizza),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var size = runtimeEntityType.AddProperty(
+                "Size",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Size", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Size>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var specialId = runtimeEntityType.AddProperty(
+                "SpecialId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("SpecialId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<SpecialId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { orderId });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { specialId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var pizzas = principalEntityType.AddNavigation("Pizzas",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<Pizza>),
+                propertyInfo: typeof(Order).GetProperty("Pizzas", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<Pizzas>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("SpecialId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var special = declaringEntityType.AddNavigation("Special",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(PizzaSpecial),
+                propertyInfo: typeof(Pizza).GetProperty("Special", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Special>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Pizzas");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
new file mode 100644
index 00000000..e86b0f50
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
@@ -0,0 +1,76 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaSpecialEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaSpecial",
+                typeof(PizzaSpecial),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var basePrice = runtimeEntityType.AddProperty(
+                "BasePrice",
+                typeof(decimal),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("BasePrice", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<BasePrice>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var imageUrl = runtimeEntityType.AddProperty(
+                "ImageUrl",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("ImageUrl", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<ImageUrl>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Specials");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaStoreContextModel.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
new file mode 100644
index 00000000..8b516a68
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
@@ -0,0 +1,28 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    [DbContext(typeof(PizzaStoreContext))]
+    public partial class PizzaStoreContextModel : RuntimeModel
+    {
+        static PizzaStoreContextModel()
+        {
+            var model = new PizzaStoreContextModel();
+            model.Initialize();
+            model.Customize();
+            _instance = model;
+        }
+
+        private static PizzaStoreContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
new file mode 100644
index 00000000..d46f50f4
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
@@ -0,0 +1,69 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    public partial class PizzaStoreContextModel
+    {
+        partial void Initialize()
+        {
+            var address = AddressEntityType.Create(this);
+            var latLong = LatLongEntityType.Create(this);
+            var notificationSubscription = NotificationSubscriptionEntityType.Create(this);
+            var order = OrderEntityType.Create(this);
+            var pizza = PizzaEntityType.Create(this);
+            var pizzaSpecial = PizzaSpecialEntityType.Create(this);
+            var pizzaTopping = PizzaToppingEntityType.Create(this);
+            var pizzaStoreUser = PizzaStoreUserEntityType.Create(this);
+            var topping = ToppingEntityType.Create(this);
+            var deviceFlowCodes = DeviceFlowCodesEntityType.Create(this);
+            var key = KeyEntityType.Create(this);
+            var persistedGrant = PersistedGrantEntityType.Create(this);
+            var identityRole = IdentityRoleEntityType.Create(this);
+            var identityRoleClaimstring = IdentityRoleClaimstringEntityType.Create(this);
+            var identityUserClaimstring = IdentityUserClaimstringEntityType.Create(this);
+            var identityUserLoginstring = IdentityUserLoginstringEntityType.Create(this);
+            var identityUserRolestring = IdentityUserRolestringEntityType.Create(this);
+            var identityUserTokenstring = IdentityUserTokenstringEntityType.Create(this);
+
+            LatLongEntityType.CreateForeignKey1(latLong, order);
+            OrderEntityType.CreateForeignKey1(order, address);
+            PizzaEntityType.CreateForeignKey1(pizza, order);
+            PizzaEntityType.CreateForeignKey2(pizza, pizzaSpecial);
+            PizzaToppingEntityType.CreateForeignKey1(pizzaTopping, pizza);
+            PizzaToppingEntityType.CreateForeignKey2(pizzaTopping, topping);
+            IdentityRoleClaimstringEntityType.CreateForeignKey1(identityRoleClaimstring, identityRole);
+            IdentityUserClaimstringEntityType.CreateForeignKey1(identityUserClaimstring, pizzaStoreUser);
+            IdentityUserLoginstringEntityType.CreateForeignKey1(identityUserLoginstring, pizzaStoreUser);
+            IdentityUserRolestringEntityType.CreateForeignKey1(identityUserRolestring, identityRole);
+            IdentityUserRolestringEntityType.CreateForeignKey2(identityUserRolestring, pizzaStoreUser);
+            IdentityUserTokenstringEntityType.CreateForeignKey1(identityUserTokenstring, pizzaStoreUser);
+
+            AddressEntityType.CreateAnnotations(address);
+            LatLongEntityType.CreateAnnotations(latLong);
+            NotificationSubscriptionEntityType.CreateAnnotations(notificationSubscription);
+            OrderEntityType.CreateAnnotations(order);
+            PizzaEntityType.CreateAnnotations(pizza);
+            PizzaSpecialEntityType.CreateAnnotations(pizzaSpecial);
+            PizzaToppingEntityType.CreateAnnotations(pizzaTopping);
+            PizzaStoreUserEntityType.CreateAnnotations(pizzaStoreUser);
+            ToppingEntityType.CreateAnnotations(topping);
+            DeviceFlowCodesEntityType.CreateAnnotations(deviceFlowCodes);
+            KeyEntityType.CreateAnnotations(key);
+            PersistedGrantEntityType.CreateAnnotations(persistedGrant);
+            IdentityRoleEntityType.CreateAnnotations(identityRole);
+            IdentityRoleClaimstringEntityType.CreateAnnotations(identityRoleClaimstring);
+            IdentityUserClaimstringEntityType.CreateAnnotations(identityUserClaimstring);
+            IdentityUserLoginstringEntityType.CreateAnnotations(identityUserLoginstring);
+            IdentityUserRolestringEntityType.CreateAnnotations(identityUserRolestring);
+            IdentityUserTokenstringEntityType.CreateAnnotations(identityUserTokenstring);
+
+            AddAnnotation("ProductVersion", "6.0.0");
+        }
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
new file mode 100644
index 00000000..18b2d96d
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
@@ -0,0 +1,156 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaStoreUserEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Server.PizzaStoreUser",
+                typeof(PizzaStoreUser),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var accessFailedCount = runtimeEntityType.AddProperty(
+                "AccessFailedCount",
+                typeof(int),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("AccessFailedCount", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<AccessFailedCount>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var email = runtimeEntityType.AddProperty(
+                "Email",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Email", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Email>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var emailConfirmed = runtimeEntityType.AddProperty(
+                "EmailConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("EmailConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<EmailConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnabled = runtimeEntityType.AddProperty(
+                "LockoutEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnd = runtimeEntityType.AddProperty(
+                "LockoutEnd",
+                typeof(DateTimeOffset?),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnd", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnd>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var normalizedEmail = runtimeEntityType.AddProperty(
+                "NormalizedEmail",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedEmail", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedEmail>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedUserName = runtimeEntityType.AddProperty(
+                "NormalizedUserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedUserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedUserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var passwordHash = runtimeEntityType.AddProperty(
+                "PasswordHash",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PasswordHash", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PasswordHash>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumber = runtimeEntityType.AddProperty(
+                "PhoneNumber",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumber", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumber>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumberConfirmed = runtimeEntityType.AddProperty(
+                "PhoneNumberConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumberConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumberConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var securityStamp = runtimeEntityType.AddProperty(
+                "SecurityStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("SecurityStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<SecurityStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var twoFactorEnabled = runtimeEntityType.AddProperty(
+                "TwoFactorEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("TwoFactorEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<TwoFactorEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var userName = runtimeEntityType.AddProperty(
+                "UserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("UserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<UserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedEmail });
+            index.AddAnnotation("Relational:Name", "EmailIndex");
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { normalizedUserName },
+                unique: true);
+            index0.AddAnnotation("Relational:Name", "UserNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUsers");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaToppingEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
new file mode 100644
index 00000000..b97d2a24
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaTopping",
+                typeof(PizzaTopping),
+                baseEntityType);
+
+            var pizzaId = runtimeEntityType.AddProperty(
+                "PizzaId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("PizzaId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<PizzaId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var toppingId = runtimeEntityType.AddProperty(
+                "ToppingId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("ToppingId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<ToppingId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { pizzaId, toppingId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { toppingId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PizzaId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var toppings = principalEntityType.AddNavigation("Toppings",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<PizzaTopping>),
+                propertyInfo: typeof(Pizza).GetProperty("Toppings", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Toppings>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("ToppingId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var topping = declaringEntityType.AddNavigation("Topping",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Topping),
+                propertyInfo: typeof(PizzaTopping).GetProperty("Topping", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<Topping>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PizzaTopping");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/ToppingEntityType.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/ToppingEntityType.cs
new file mode 100644
index 00000000..9295f9bf
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Models/ToppingEntityType.cs
@@ -0,0 +1,62 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class ToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Topping",
+                typeof(Topping),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Topping).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Topping).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var price = runtimeEntityType.AddProperty(
+                "Price",
+                typeof(decimal),
+                propertyInfo: typeof(Topping).GetProperty("Price", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Price>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Toppings");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/NotificationsController.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/NotificationsController.cs
deleted file mode 100644
index bb3b96ff..00000000
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/NotificationsController.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("notifications")]
-    [ApiController]
-    [Authorize]
-    public class NotificationsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public NotificationsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpPut("subscribe")]
-        public async Task<NotificationSubscription> Subscribe(NotificationSubscription subscription)
-        {
-            // We're storing at most one subscription per user, so delete old ones.
-            // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-            var userId = GetUserId();
-            var oldSubscriptions = _db.NotificationSubscriptions.Where(e => e.UserId == userId);
-            _db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
-
-            // Store new subscription
-            subscription.UserId = userId;
-            _db.NotificationSubscriptions.Attach(subscription);
-
-            await _db.SaveChangesAsync();
-            return subscription;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-    }
-}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/OidcConfigurationController.cs
index c074debf..d5822577 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/OidcConfigurationController.cs
@@ -1,26 +1,21 @@
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class OidcConfigurationController : Controller
 {
-    public class OidcConfigurationController : Controller
-    {
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-        {
-            ClientRequestParametersProvider = clientRequestParametersProvider;
-        }
+		public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+		{
+				ClientRequestParametersProvider = clientRequestParametersProvider;
+		}
 
-        public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+		public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-        [HttpGet("_configuration/{clientId}")]
-        public IActionResult GetClientRequestParameters([FromRoute]string clientId)
-        {
-            var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-            return Ok(parameters);
-        }
-    }
-}
+		[HttpGet("_configuration/{clientId}")]
+		public IActionResult GetClientRequestParameters([FromRoute]string clientId)
+		{
+				var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+				return Ok(parameters);
+		}
+}
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/OrdersController.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/OrdersController.cs
index 2b8bc99b..54ff6114 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/OrdersController.cs
@@ -1,114 +1,109 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+[Route("orders")]
+[ApiController]
+// [Authorize]
+public class OrdersController : Controller
 {
-    [Route("orders")]
-    [ApiController]
-    // [Authorize]
-    public class OrdersController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public OrdersController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-        {
-            var orders = await _db.Orders
-                // .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .OrderByDescending(o => o.CreatedTime)
-                .ToListAsync();
-
-            return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-        }
-
-        [HttpGet("{orderId}")]
-        public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-        {
-            var order = await _db.Orders
-                .Where(o => o.OrderId == orderId)
-                // .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .SingleOrDefaultAsync();
-
-            if (order == null)
-            {
-                return NotFound();
-            }
-
-            return OrderWithStatus.FromOrder(order);
-        }
-
-        [HttpPost]
-        public async Task<ActionResult<int>> PlaceOrder(Order order)
-        {
-            order.CreatedTime = DateTime.Now;
-            order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-            // order.UserId = GetUserId();
-
-            // Enforce existence of Pizza.SpecialId and Topping.ToppingId
-            // in the database - prevent the submitter from making up
-            // new specials and toppings
-            foreach (var pizza in order.Pizzas)
-            {
-                pizza.SpecialId = pizza.Special.Id;
-                pizza.Special = null;
-
-                foreach (var topping in pizza.Toppings)
-                {
-                    topping.ToppingId = topping.Topping.Id;
-                    topping.Topping = null;
-                }
-            }
-
-            _db.Orders.Attach(order);
-            await _db.SaveChangesAsync();
-
-            // In the background, send push notifications if possible
-            var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-            if (subscription != null)
-            {
-                _ = TrackAndSendNotificationsAsync(order, subscription);
-            }
-
-            return order.OrderId;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-
-        private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-        {
-            // In a realistic case, some other backend process would track
-            // order delivery progress and send us notifications when it
-            // changes. Since we don't have any such process here, fake it.
-            await Task.Delay(OrderWithStatus.PreparationDuration);
-            await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-            await Task.Delay(OrderWithStatus.DeliveryDuration);
-            await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-        }
-
-        private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-        {
-            // This will be implemented later
-            return Task.CompletedTask;
-        }
-    }
-}
+	private readonly PizzaStoreContext _db;
+
+	public OrdersController(PizzaStoreContext db)
+	{
+		_db = db;
+	}
+
+	[HttpGet]
+	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+	{
+		var orders = await _db.Orders
+				// .Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.OrderByDescending(o => o.CreatedTime)
+				.ToListAsync();
+
+		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+	}
+
+	[HttpGet("{orderId}")]
+	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+	{
+		var order = await _db.Orders
+				.Where(o => o.OrderId == orderId)
+				// .Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.SingleOrDefaultAsync();
+
+		if (order == null)
+		{
+			return NotFound();
+		}
+
+		return OrderWithStatus.FromOrder(order);
+	}
+
+	[HttpPost]
+	public async Task<ActionResult<int>> PlaceOrder(Order order)
+	{
+		order.CreatedTime = DateTime.Now;
+		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+		// order.UserId = GetUserId();
+
+		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
+		// in the database - prevent the submitter from making up
+		// new specials and toppings
+		foreach (var pizza in order.Pizzas)
+		{
+			pizza.SpecialId = pizza.Special.Id;
+			pizza.Special = null;
+
+			foreach (var topping in pizza.Toppings)
+			{
+				topping.ToppingId = topping.Topping.Id;
+				topping.Topping = null;
+			}
+		}
+
+		_db.Orders.Attach(order);
+		await _db.SaveChangesAsync();
+
+		// In the background, send push notifications if possible
+		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+		if (subscription != null)
+		{
+			_ = TrackAndSendNotificationsAsync(order, subscription);
+		}
+
+		return order.OrderId;
+	}
+
+	private string GetUserId()
+	{
+		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+	{
+		// In a realistic case, some other backend process would track
+		// order delivery progress and send us notifications when it
+		// changes. Since we don't have any such process here, fake it.
+		await Task.Delay(OrderWithStatus.PreparationDuration);
+		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+		await Task.Delay(OrderWithStatus.DeliveryDuration);
+		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+	}
+
+	private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+	{
+		// This will be implemented later
+		return Task.CompletedTask;
+	}
+}
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaApiExtensions.cs
new file mode 100644
index 00000000..bf6b7bde
--- /dev/null
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -0,0 +1,60 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
+
+namespace BlazingPizza.Server;
+
+public static class PizzaApiExtensions
+{
+
+	public static WebApplication MapPizzaApi(this WebApplication app)
+	{
+
+		// Subscribe to notifications
+		app.MapPut("/notifications/subscribe", [Authorize] async (
+			HttpContext context,
+			PizzaStoreContext db,
+			NotificationSubscription subscription) =>
+		{
+
+			// We're storing at most one subscription per user, so delete old ones.
+			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+			var userId = GetUserId(context);
+			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+
+			// Store new subscription
+			subscription.UserId = userId;
+			db.NotificationSubscriptions.Attach(subscription);
+
+			await db.SaveChangesAsync();
+			return Results.Ok(subscription);
+
+		});
+
+		// Specials
+		app.MapGet("/specials", async (PizzaStoreContext db) =>
+		{
+
+			var specials = await db.Specials.ToListAsync();
+			return Results.Ok(specials);
+
+		});
+
+		// Toppings
+		app.MapGet("/toppings", async (PizzaStoreContext db) =>
+		{
+			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+			return Results.Ok(toppings);
+		});
+
+		return app;
+
+	}
+
+	private static string GetUserId(HttpContext context)
+	{
+		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+}
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreContext.cs
index 9485bd12..9a2e17ee 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreContext.cs
@@ -3,37 +3,36 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-    public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
-    {
-        public PizzaStoreContext(
-            DbContextOptions options,
-            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-        {
-        }
+	public PizzaStoreContext(
+			DbContextOptions options,
+			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+	{
+	}
 
-        public DbSet<Order> Orders { get; set; }
+	public DbSet<Order> Orders { get; set; }
 
-        public DbSet<Pizza> Pizzas { get; set; }
+	public DbSet<Pizza> Pizzas { get; set; }
 
-        public DbSet<PizzaSpecial> Specials { get; set; }
+	public DbSet<PizzaSpecial> Specials { get; set; }
 
-        public DbSet<Topping> Toppings { get; set; }
+	public DbSet<Topping> Toppings { get; set; }
 
-        public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
+	protected override void OnModelCreating(ModelBuilder modelBuilder)
+	{
+		base.OnModelCreating(modelBuilder);
 
-            // Configuring a many-to-many special -> topping relationship that is friendly for serialization
-            modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-            modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-            modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
+		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-            // Inline the Lat-Long pairs in Order rather than having a FK to another table
-            modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-        }
-    }
-}
\ No newline at end of file
+		// Inline the Lat-Long pairs in Order rather than having a FK to another table
+		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+	}
+}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreUser.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreUser.cs
index 171ce83d..d446a679 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreUser.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreUser.cs
@@ -1,8 +1,6 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+public class PizzaStoreUser : IdentityUser
 {
-    public class PizzaStoreUser : IdentityUser
-    {
-    }
 }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzasController.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzasController.cs
deleted file mode 100644
index c082552c..00000000
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzasController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("pizzas")]
-    [ApiController]
-    public class PizzasController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public PizzasController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-    }
-}
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Program.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Program.cs
index 40a47641..4484d8f7 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/Program.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Program.cs
@@ -1,33 +1,67 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.EntityFrameworkCore;
+using BlazingPizza.Server;
 
-namespace BlazingPizza.Server
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddControllersWithViews()
+	.AddJsonOptions(options =>  {
+		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+	});
+builder.Services.AddRazorPages();
+
+builder.Services.AddDbContext<PizzaStoreContext>(options =>
+		options.UseSqlite("Data Source=pizza.db")
+			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+
+builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
+		.AddEntityFrameworkStores<PizzaStoreContext>();
+
+builder.Services.AddIdentityServer()
+		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+
+builder.Services.AddAuthentication()
+		.AddIdentityServerJwt();
+
+var app = builder.Build();
+
+// Initialize the database
+var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
+using (var scope = scopeFactory.CreateScope())
+{
+	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+	if (db.Database.EnsureCreated())
+	{
+		SeedData.Initialize(db);
+	}
+}
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseWebAssemblyDebugging();
+}
+else
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var host = CreateHostBuilder(args).Build();
-
-            // Initialize the database
-            var scopeFactory = host.Services.GetRequiredService<IServiceScopeFactory>();
-            using (var scope = scopeFactory.CreateScope())
-            {
-                var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-                if (db.Database.EnsureCreated())
-                {
-                    SeedData.Initialize(db);
-                }
-            }
-
-            host.Run();
-        }
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+    app.UseExceptionHandler("/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
 }
+
+app.UseHttpsRedirection();
+app.UseBlazorFrameworkFiles();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseIdentityServer();
+app.UseAuthorization();
+
+app.MapPizzaApi();
+
+app.MapRazorPages();
+app.MapControllers();
+app.MapFallbackToFile("index.html");
+
+app.Run();
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/SeedData.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/SeedData.cs
index 7c86a5b2..a1e47973 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/SeedData.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/SeedData.cs
@@ -1,193 +1,192 @@
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public static class SeedData
 {
-    public static class SeedData
-    {
-        public static void Initialize(PizzaStoreContext db)
-        {
-            var toppings = new Topping[]
-            {
-                new Topping()
-                {
-                    Name = "Extra cheese",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "American bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "British bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Canadian bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Tea and crumpets",
-                    Price = 5.00m
-                },
-                new Topping()
-                {
-                    Name = "Fresh-baked scones",
-                    Price = 4.50m,
-                },
-                new Topping()
-                {
-                    Name = "Bell peppers",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Onions",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Mushrooms",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Pepperoni",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Duck sausage",
-                    Price = 3.20m,
-                },
-                new Topping()
-                {
-                    Name = "Venison meatballs",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "Served on a silver platter",
-                    Price = 250.99m,
-                },
-                new Topping()
-                {
-                    Name = "Lobster on top",
-                    Price = 64.50m,
-                },
-                new Topping()
-                {
-                    Name = "Sturgeon caviar",
-                    Price = 101.75m,
-                },
-                new Topping()
-                {
-                    Name = "Artichoke hearts",
-                    Price = 3.40m,
-                },
-                new Topping()
-                {
-                    Name = "Fresh tomatoes",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Basil",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Steak (medium-rare)",
-                    Price = 8.50m,
-                },
-                new Topping()
-                {
-                    Name = "Blazing hot peppers",
-                    Price = 4.20m,
-                },
-                new Topping()
-                {
-                    Name = "Buffalo chicken",
-                    Price = 5.00m,
-                },
-                new Topping()
-                {
-                    Name = "Blue cheese",
-                    Price = 2.50m,
-                },
-            };
+	public static void Initialize(PizzaStoreContext db)
+	{
+		var toppings = new Topping[]
+		{
+			new Topping()
+			{
+					Name = "Extra cheese",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "American bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "British bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Canadian bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Tea and crumpets",
+					Price = 5.00m
+			},
+			new Topping()
+			{
+					Name = "Fresh-baked scones",
+					Price = 4.50m,
+			},
+			new Topping()
+			{
+					Name = "Bell peppers",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Onions",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Mushrooms",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Pepperoni",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Duck sausage",
+					Price = 3.20m,
+			},
+			new Topping()
+			{
+					Name = "Venison meatballs",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "Served on a silver platter",
+					Price = 250.99m,
+			},
+			new Topping()
+			{
+					Name = "Lobster on top",
+					Price = 64.50m,
+			},
+			new Topping()
+			{
+					Name = "Sturgeon caviar",
+					Price = 101.75m,
+			},
+			new Topping()
+			{
+					Name = "Artichoke hearts",
+					Price = 3.40m,
+			},
+			new Topping()
+			{
+					Name = "Fresh tomatoes",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Basil",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Steak (medium-rare)",
+					Price = 8.50m,
+			},
+			new Topping()
+			{
+					Name = "Blazing hot peppers",
+					Price = 4.20m,
+			},
+			new Topping()
+			{
+					Name = "Buffalo chicken",
+					Price = 5.00m,
+			},
+			new Topping()
+			{
+					Name = "Blue cheese",
+					Price = 2.50m,
+			},
+		};
 
-            var specials = new PizzaSpecial[]
-            {
-                new PizzaSpecial()
-                {
-                    Name = "Basic Cheese Pizza",
-                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/cheese.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 2,
-                    Name = "The Baconatorizor",
-                    Description = "It has EVERY kind of bacon",
-                    BasePrice = 11.99m,
-                    ImageUrl = "img/pizzas/bacon.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 3,
-                    Name = "Classic pepperoni",
-                    Description = "It's the pizza you grew up with, but Blazing hot!",
-                    BasePrice = 10.50m,
-                    ImageUrl = "img/pizzas/pepperoni.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 4,
-                    Name = "Buffalo chicken",
-                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-                    BasePrice = 12.75m,
-                    ImageUrl = "img/pizzas/meaty.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 5,
-                    Name = "Mushroom Lovers",
-                    Description = "It has mushrooms. Isn't that obvious?",
-                    BasePrice = 11.00m,
-                    ImageUrl = "img/pizzas/mushroom.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 6,
-                    Name = "The Brit",
-                    Description = "When in London...",
-                    BasePrice = 10.25m,
-                    ImageUrl = "img/pizzas/brit.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 7,
-                    Name = "Veggie Delight",
-                    Description = "It's like salad, but on a pizza",
-                    BasePrice = 11.50m,
-                    ImageUrl = "img/pizzas/salad.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 8,
-                    Name = "Margherita",
-                    Description = "Traditional Italian pizza with tomatoes and basil",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/margherita.jpg",
-                },
-            };
+		var specials = new PizzaSpecial[]
+		{
+			new PizzaSpecial()
+			{
+					Name = "Basic Cheese Pizza",
+					Description = "It's cheesy and delicious. Why wouldn't you want one?",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/cheese.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 2,
+					Name = "The Baconatorizor",
+					Description = "It has EVERY kind of bacon",
+					BasePrice = 11.99m,
+					ImageUrl = "img/pizzas/bacon.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 3,
+					Name = "Classic pepperoni",
+					Description = "It's the pizza you grew up with, but Blazing hot!",
+					BasePrice = 10.50m,
+					ImageUrl = "img/pizzas/pepperoni.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 4,
+					Name = "Buffalo chicken",
+					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+					BasePrice = 12.75m,
+					ImageUrl = "img/pizzas/meaty.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 5,
+					Name = "Mushroom Lovers",
+					Description = "It has mushrooms. Isn't that obvious?",
+					BasePrice = 11.00m,
+					ImageUrl = "img/pizzas/mushroom.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 6,
+					Name = "The Brit",
+					Description = "When in London...",
+					BasePrice = 10.25m,
+					ImageUrl = "img/pizzas/brit.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 7,
+					Name = "Veggie Delight",
+					Description = "It's like salad, but on a pizza",
+					BasePrice = 11.50m,
+					ImageUrl = "img/pizzas/salad.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 8,
+					Name = "Margherita",
+					Description = "Traditional Italian pizza with tomatoes and basil",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/margherita.jpg",
+			},
+		};
 
-            db.Toppings.AddRange(toppings);
-            db.Specials.AddRange(specials);
-            db.SaveChanges();
-        }
-    }
-}
+		db.Toppings.AddRange(toppings);
+		db.Specials.AddRange(specials);
+		db.SaveChanges();
+	}
+}
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Address.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Address.cs
index e5c0ef0d..63f1e167 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Address.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Address.cs
@@ -1,21 +1,26 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Address
 {
-    public class Address
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	[Required, MaxLength(100)]
+	public string Name { get; set; }
 
-        public string Line1 { get; set; }
+	[Required, MaxLength(100)]
+	public string Line1 { get; set; }
 
-        public string Line2 { get; set; }
+	[MaxLength(100)]
+	public string Line2 { get; set; }
 
-        public string City { get; set; }
+	[Required, MaxLength(50)]
+	public string City { get; set; }
 
-        public string Region { get; set; }
+	[Required, MaxLength(20)]
+	public string Region { get; set; }
 
-        public string PostalCode { get; set; }
-    }
+	[Required, MaxLength(20)]
+	public string PostalCode { get; set; }
 }
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/02-customize-a-pizza/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index f7b7dd02..075ddd60 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/LatLong.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/LatLong.cs
index 9b8c3811..14a94c26 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/LatLong.cs
@@ -1,27 +1,26 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class LatLong
 {
-    public class LatLong
-    {
-        public LatLong()
-        {
-        }
+	public LatLong()
+	{
+	}
 
-        public LatLong(double latitude, double longitude) : this()
-        {
-            Latitude = latitude;
-            Longitude = longitude;
-        }
+	public LatLong(double latitude, double longitude) : this()
+	{
+		Latitude = latitude;
+		Longitude = longitude;
+	}
 
-        public double Latitude { get; set; }
+	public double Latitude { get; set; }
 
-        public double Longitude { get; set; }
+	public double Longitude { get; set; }
 
-        public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-        {
-            // The Earth is flat, right? So no need for spherical interpolation.
-            return new LatLong(
-                start.Latitude + (end.Latitude - start.Latitude) * proportion,
-                start.Longitude + (end.Longitude - start.Longitude) * proportion);
-        }
-    }
-}
+	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+	{
+		// The Earth is flat, right? So no need for spherical interpolation.
+		return new LatLong(
+				start.Latitude + (end.Latitude - start.Latitude) * proportion,
+				start.Longitude + (end.Longitude - start.Longitude) * proportion);
+	}
+}
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/NotificationSubscription.cs
index 04259c2f..9109ff57 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/NotificationSubscription.cs
@@ -1,17 +1,14 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class NotificationSubscription
 {
-    public class NotificationSubscription
-    {
-        public int NotificationSubscriptionId { get; set; }
+	public int NotificationSubscriptionId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public string Url { get; set; }
+	public string Url { get; set; }
 
-        public string P256dh { get; set; }
+	public string P256dh { get; set; }
 
-        public string Auth { get; set; }
-    }
+	public string Auth { get; set; }
 }
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Order.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Order.cs
index fb003bd6..aca04ca1 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Order.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Order.cs
@@ -1,25 +1,32 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Order
 {
-    public class Order
-    {
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public DateTime CreatedTime { get; set; }
+	public DateTime CreatedTime { get; set; }
 
-        public Address DeliveryAddress { get; set; } = new Address();
+	public Address DeliveryAddress { get; set; } = new Address();
 
-        public LatLong DeliveryLocation { get; set; }
+	public LatLong DeliveryLocation { get; set; }
 
-        public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-        public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-        public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
-    }
+	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(Order))]
+[JsonSerializable(typeof(OrderWithStatus))]
+[JsonSerializable(typeof(List<OrderWithStatus>))]
+[JsonSerializable(typeof(Pizza))]
+[JsonSerializable(typeof(List<PizzaSpecial>))]
+[JsonSerializable(typeof(List<Topping>))]
+[JsonSerializable(typeof(Topping))]
+public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/OrderWithStatus.cs
index 021de78c..f5f153b6 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/OrderWithStatus.cs
@@ -1,79 +1,78 @@
-using BlazingPizza.ComponentsLibrary.Map;
-using System;
-using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using BlazingPizza.ComponentsLibrary.Map;
 
-namespace BlazingPizza
+
+namespace BlazingPizza;
+
+public class OrderWithStatus
 {
-    public class OrderWithStatus
-    {
-        public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-        public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-        public Order Order { get; set; }
+	public Order Order { get; set; }
 
-        public string StatusText { get; set; }
+	public string StatusText { get; set; }
 
-        public bool IsDelivered => StatusText == "Delivered";
+	public bool IsDelivered => StatusText == "Delivered";
 
-        public List<Marker> MapMarkers { get; set; }
+	public List<Marker> MapMarkers { get; set; }
 
-        public static OrderWithStatus FromOrder(Order order)
-        {
-            // To simulate a real backend process, we fake status updates based on the amount
-            // of time since the order was placed
-            string statusText;
-            List<Marker> mapMarkers;
-            var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+	public static OrderWithStatus FromOrder(Order order)
+	{
+		// To simulate a real backend process, we fake status updates based on the amount
+		// of time since the order was placed
+		string statusText;
+		List<Marker> mapMarkers;
+		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-            if (DateTime.Now < dispatchTime)
-            {
-                statusText = "Preparing";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-                };
-            }
-            else if (DateTime.Now < dispatchTime + DeliveryDuration)
-            {
-                statusText = "Out for delivery";
+		if (DateTime.Now < dispatchTime)
+		{
+			statusText = "Preparing";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+								};
+		}
+		else if (DateTime.Now < dispatchTime + DeliveryDuration)
+		{
+			statusText = "Out for delivery";
 
-                var startPosition = ComputeStartPosition(order);
-                var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-                var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation),
-                    ToMapMarker("Driver", driverPosition, showPopup: true),
-                };
-            }
-            else
-            {
-                statusText = "Delivered";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-                };
-            }
+			var startPosition = ComputeStartPosition(order);
+			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation),
+										ToMapMarker("Driver", driverPosition, showPopup: true),
+								};
+		}
+		else
+		{
+			statusText = "Delivered";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+								};
+		}
 
-            return new OrderWithStatus
-            {
-                Order = order,
-                StatusText = statusText,
-                MapMarkers = mapMarkers,
-            };
-        }
+		return new OrderWithStatus
+		{
+			Order = order,
+			StatusText = statusText,
+			MapMarkers = mapMarkers,
+		};
+	}
 
-        private static LatLong ComputeStartPosition(Order order)
-        {
-            // Random but deterministic based on order ID
-            var rng = new Random(order.OrderId);
-            var distance = 0.01 + rng.NextDouble() * 0.02;
-            var angle = rng.NextDouble() * Math.PI * 2;
-            var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-            return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-        }
+	private static LatLong ComputeStartPosition(Order order)
+	{
+		// Random but deterministic based on order ID
+		var rng = new Random(order.OrderId);
+		var distance = 0.01 + rng.NextDouble() * 0.02;
+		var angle = rng.NextDouble() * Math.PI * 2;
+		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+	}
 
-        static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
-    }
-}
+	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+}
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Pizza.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Pizza.cs
index ec1108a9..459298f4 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Pizza.cs
@@ -1,42 +1,44 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+///    /// Represents a customized pizza as part of an order
+/// </summary>
+public class Pizza
 {
-    /// <summary>
-    /// Represents a customized pizza as part of an order
-    /// </summary>
-    public class Pizza
-    {
-        public const int DefaultSize = 12;
-        public const int MinimumSize = 9;
-        public const int MaximumSize = 17;
+	public const int DefaultSize = 12;
+	public const int MinimumSize = 9;
+	public const int MaximumSize = 17;
 
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public PizzaSpecial Special { get; set; }
+	public PizzaSpecial Special { get; set; }
 
-        public int SpecialId { get; set; }
+	public int SpecialId { get; set; }
 
-        public int Size { get; set; }
+	public int Size { get; set; }
 
-        public List<PizzaTopping> Toppings { get; set; }
+	public List<PizzaTopping> Toppings { get; set; }
 
-        public decimal GetBasePrice()
-        {
-            return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-        }
+	public decimal GetBasePrice()
+	{
+		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+	}
 
-        public decimal GetTotalPrice()
-        {
-            return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-        }
+	public decimal GetTotalPrice()
+	{
+		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+	}
 
-        public string GetFormattedTotalPrice()
-        {
-            return GetTotalPrice().ToString("0.00");
-        }
-    }
+	public string GetFormattedTotalPrice()
+	{
+		return GetTotalPrice().ToString("0.00");
+	}
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
+[JsonSerializable(typeof(Pizza))]
+public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaSpecial.cs
index 2f2b3383..9653300c 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaSpecial.cs
@@ -1,20 +1,19 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+/// Represents a pre-configured template for a pizza a user can order
+/// </summary>
+public class PizzaSpecial
 {
-    /// <summary>
-    /// Represents a pre-configured template for a pizza a user can order
-    /// </summary>
-    public class PizzaSpecial
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal BasePrice { get; set; }
+	public decimal BasePrice { get; set; }
 
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public string ImageUrl { get; set; }
+	public string ImageUrl { get; set; }
 
-        public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
-    }
-}
+	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+}
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaTopping.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaTopping.cs
index f5a6c1ac..0a711647 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaTopping.cs
@@ -1,11 +1,11 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class PizzaTopping
 {
-    public class PizzaTopping
-    {
-        public Topping Topping { get; set; }
+	public Topping Topping { get; set; }
+
+	public int ToppingId { get; set; }
 
-        public int ToppingId { get; set; }
-        
-        public int PizzaId { get; set; }
-    }
-}
+	public int PizzaId { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Topping.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Topping.cs
index 61bdeb92..376c311a 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Topping.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Topping.cs
@@ -1,13 +1,13 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Topping
 {
-    public class Topping
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal Price { get; set; }
+	public decimal Price { get; set; }
 
-        public string GetFormattedPrice() => Price.ToString("0.00");
-    }
-}
+	public string GetFormattedPrice() => Price.ToString("0.00");
+	
+}
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/UserInfo.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/UserInfo.cs
index 4996ef80..362f8f8e 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/UserInfo.cs
@@ -1,9 +1,9 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class UserInfo
 {
-    public class UserInfo
-    {
-        public bool IsAuthenticated { get; set; }
+	public bool IsAuthenticated { get; set; }
 
-        public string Name { get; set; }
-    }
-}
+	public string Name { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/03-show-order-status/BlazingPizza.Client/BlazingPizza.Client.csproj
index 663677a1..f9ebe283 100644
--- a/save-points/03-show-order-status/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/03-show-order-status/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/03-show-order-status/BlazingPizza.Client/Program.cs b/save-points/03-show-order-status/BlazingPizza.Client/Program.cs
index 48147d6f..ab7dd4d9 100644
--- a/save-points/03-show-order-status/BlazingPizza.Client/Program.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Client/Program.cs
@@ -1,21 +1,9 @@
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
+using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
-namespace BlazingPizza.Client
-{
-    public class Program
-    {
-        public static async Task Main(string[] args)
-        {
-            var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("#app");
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<App>("#app");
 
-            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
-            await builder.Build().RunAsync();
-        }
-    }
-}
+await builder.Build().RunAsync();
diff --git a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 61ebf623..cb996b1b 100644
--- a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index f36b098e..bb84f13c 100644
--- a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -1,17 +1,15 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.ComponentsLibrary
+namespace BlazingPizza.ComponentsLibrary;
+
+public static class LocalStorage
 {
-    public static class LocalStorage
-    {
-        public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-        public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-        public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
-    }
-}
+	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index 63006067..a8e78f2a 100644
--- a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -1,13 +1,12 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Marker
 {
-    public class Marker
-    {
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public double X { get; set; }
+	public double X { get; set; }
 
-        public double Y { get; set; }
+	public double Y { get; set; }
 
-        public bool ShowPopup { get; set; }
-    }
+	public bool ShowPopup { get; set; }
 }
diff --git a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 03841826..349046d4 100644
--- a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -1,9 +1,8 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Point
 {
-    public class Point
-    {
-        public double X { get; set; }
+	public double X { get; set; }
 
-        public double Y { get; set; }
-    }
-}
+	public double Y { get; set; }
+}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/03-show-order-status/BlazingPizza.Server/BlazingPizza.Server.csproj
index b9c74fc4..227890e1 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/03-show-order-status/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/AddressEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/AddressEntityType.cs
new file mode 100644
index 00000000..82db81b6
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/AddressEntityType.cs
@@ -0,0 +1,92 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class AddressEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Address",
+                typeof(Address),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Address).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var city = runtimeEntityType.AddProperty(
+                "City",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("City", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<City>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var line1 = runtimeEntityType.AddProperty(
+                "Line1",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var line2 = runtimeEntityType.AddProperty(
+                "Line2",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var postalCode = runtimeEntityType.AddProperty(
+                "PostalCode",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("PostalCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<PostalCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var region = runtimeEntityType.AddProperty(
+                "Region",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Region", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Region>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Address");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
new file mode 100644
index 00000000..1dd4563b
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
@@ -0,0 +1,114 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class DeviceFlowCodesEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes",
+                typeof(DeviceFlowCodes),
+                baseEntityType);
+
+            var userCode = runtimeEntityType.AddProperty(
+                "UserCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("UserCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<UserCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var deviceCode = runtimeEntityType.AddProperty(
+                "DeviceCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("DeviceCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<DeviceCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userCode });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deviceCode },
+                unique: true);
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DeviceCodes");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
new file mode 100644
index 00000000..8946b261
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>",
+                typeof(IdentityRoleClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoleClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityRoleEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
new file mode 100644
index 00000000..2f1fec2b
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
@@ -0,0 +1,78 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRole",
+                typeof(IdentityRole),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedName = runtimeEntityType.AddProperty(
+                "NormalizedName",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("NormalizedName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<NormalizedName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedName },
+                unique: true);
+            index.AddAnnotation("Relational:Name", "RoleNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
new file mode 100644
index 00000000..55418a1e
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserClaim<string>",
+                typeof(IdentityUserClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
new file mode 100644
index 00000000..3ca029bd
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserLoginstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserLogin<string>",
+                typeof(IdentityUserLogin<string>),
+                baseEntityType);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerKey = runtimeEntityType.AddProperty(
+                "ProviderKey",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderKey", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderKey>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerDisplayName = runtimeEntityType.AddProperty(
+                "ProviderDisplayName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderDisplayName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderDisplayName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { loginProvider, providerKey });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserLogins");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
new file mode 100644
index 00000000..70078d7a
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
@@ -0,0 +1,82 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserRolestringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserRole<string>",
+                typeof(IdentityUserRole<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, roleId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
new file mode 100644
index 00000000..93ba6d31
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
@@ -0,0 +1,84 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserTokenstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserToken<string>",
+                typeof(IdentityUserToken<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var value = runtimeEntityType.AddProperty(
+                "Value",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Value", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Value>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, loginProvider, name });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserTokens");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/KeyEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/KeyEntityType.cs
new file mode 100644
index 00000000..f6c6b4c7
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/KeyEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class KeyEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.Key",
+                typeof(Key),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var algorithm = runtimeEntityType.AddProperty(
+                "Algorithm",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Algorithm", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Algorithm>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var created = runtimeEntityType.AddProperty(
+                "Created",
+                typeof(DateTime),
+                propertyInfo: typeof(Key).GetProperty("Created", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Created>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var dataProtected = runtimeEntityType.AddProperty(
+                "DataProtected",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("DataProtected", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<DataProtected>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var isX509Certificate = runtimeEntityType.AddProperty(
+                "IsX509Certificate",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("IsX509Certificate", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<IsX509Certificate>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var use = runtimeEntityType.AddProperty(
+                "Use",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Use", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Use>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var version = runtimeEntityType.AddProperty(
+                "Version",
+                typeof(int),
+                propertyInfo: typeof(Key).GetProperty("Version", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Version>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { use });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Keys");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/LatLongEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/LatLongEntityType.cs
new file mode 100644
index 00000000..3fd254bd
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/LatLongEntityType.cs
@@ -0,0 +1,80 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class LatLongEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.LatLong",
+                typeof(LatLong),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var latitude = runtimeEntityType.AddProperty(
+                "Latitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Latitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Latitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var longitude = runtimeEntityType.AddProperty(
+                "Longitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Longitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Longitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                ownership: true);
+
+            var deliveryLocation = principalEntityType.AddNavigation("DeliveryLocation",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(LatLong),
+                propertyInfo: typeof(Order).GetProperty("DeliveryLocation", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryLocation>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
new file mode 100644
index 00000000..db236e4c
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
@@ -0,0 +1,77 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class NotificationSubscriptionEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.NotificationSubscription",
+                typeof(NotificationSubscription),
+                baseEntityType);
+
+            var notificationSubscriptionId = runtimeEntityType.AddProperty(
+                "NotificationSubscriptionId",
+                typeof(int),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("NotificationSubscriptionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<NotificationSubscriptionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var auth = runtimeEntityType.AddProperty(
+                "Auth",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Auth", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Auth>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var p256dh = runtimeEntityType.AddProperty(
+                "P256dh",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("P256dh", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<P256dh>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var url = runtimeEntityType.AddProperty(
+                "Url",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Url", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Url>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { notificationSubscriptionId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "NotificationSubscriptions");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/OrderEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/OrderEntityType.cs
new file mode 100644
index 00000000..9d9ec6fd
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/OrderEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class OrderEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Order",
+                typeof(Order),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Order).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var createdTime = runtimeEntityType.AddProperty(
+                "CreatedTime",
+                typeof(DateTime),
+                propertyInfo: typeof(Order).GetProperty("CreatedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<CreatedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var deliveryAddressId = runtimeEntityType.AddProperty(
+                "DeliveryAddressId",
+                typeof(int?),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(Order).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deliveryAddressId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("DeliveryAddressId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var deliveryAddress = declaringEntityType.AddNavigation("DeliveryAddress",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Address),
+                propertyInfo: typeof(Order).GetProperty("DeliveryAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/PersistedGrantEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
new file mode 100644
index 00000000..842d53a5
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
@@ -0,0 +1,127 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PersistedGrantEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.PersistedGrant",
+                typeof(PersistedGrant),
+                baseEntityType);
+
+            var key = runtimeEntityType.AddProperty(
+                "Key",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Key", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Key>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var consumedTime = runtimeEntityType.AddProperty(
+                "ConsumedTime",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ConsumedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ConsumedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(PersistedGrant).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var type = runtimeEntityType.AddProperty(
+                "Type",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Type", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Type>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var key0 = runtimeEntityType.AddKey(
+                new[] { key });
+            runtimeEntityType.SetPrimaryKey(key0);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { consumedTime });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            var index1 = runtimeEntityType.AddIndex(
+                new[] { subjectId, clientId, type });
+
+            var index2 = runtimeEntityType.AddIndex(
+                new[] { subjectId, sessionId, type });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PersistedGrants");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaEntityType.cs
new file mode 100644
index 00000000..3a124e63
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaEntityType.cs
@@ -0,0 +1,111 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Pizza",
+                typeof(Pizza),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var size = runtimeEntityType.AddProperty(
+                "Size",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Size", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Size>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var specialId = runtimeEntityType.AddProperty(
+                "SpecialId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("SpecialId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<SpecialId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { orderId });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { specialId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var pizzas = principalEntityType.AddNavigation("Pizzas",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<Pizza>),
+                propertyInfo: typeof(Order).GetProperty("Pizzas", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<Pizzas>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("SpecialId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var special = declaringEntityType.AddNavigation("Special",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(PizzaSpecial),
+                propertyInfo: typeof(Pizza).GetProperty("Special", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Special>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Pizzas");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
new file mode 100644
index 00000000..e86b0f50
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
@@ -0,0 +1,76 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaSpecialEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaSpecial",
+                typeof(PizzaSpecial),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var basePrice = runtimeEntityType.AddProperty(
+                "BasePrice",
+                typeof(decimal),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("BasePrice", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<BasePrice>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var imageUrl = runtimeEntityType.AddProperty(
+                "ImageUrl",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("ImageUrl", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<ImageUrl>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Specials");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaStoreContextModel.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
new file mode 100644
index 00000000..8b516a68
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
@@ -0,0 +1,28 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    [DbContext(typeof(PizzaStoreContext))]
+    public partial class PizzaStoreContextModel : RuntimeModel
+    {
+        static PizzaStoreContextModel()
+        {
+            var model = new PizzaStoreContextModel();
+            model.Initialize();
+            model.Customize();
+            _instance = model;
+        }
+
+        private static PizzaStoreContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
new file mode 100644
index 00000000..d46f50f4
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
@@ -0,0 +1,69 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    public partial class PizzaStoreContextModel
+    {
+        partial void Initialize()
+        {
+            var address = AddressEntityType.Create(this);
+            var latLong = LatLongEntityType.Create(this);
+            var notificationSubscription = NotificationSubscriptionEntityType.Create(this);
+            var order = OrderEntityType.Create(this);
+            var pizza = PizzaEntityType.Create(this);
+            var pizzaSpecial = PizzaSpecialEntityType.Create(this);
+            var pizzaTopping = PizzaToppingEntityType.Create(this);
+            var pizzaStoreUser = PizzaStoreUserEntityType.Create(this);
+            var topping = ToppingEntityType.Create(this);
+            var deviceFlowCodes = DeviceFlowCodesEntityType.Create(this);
+            var key = KeyEntityType.Create(this);
+            var persistedGrant = PersistedGrantEntityType.Create(this);
+            var identityRole = IdentityRoleEntityType.Create(this);
+            var identityRoleClaimstring = IdentityRoleClaimstringEntityType.Create(this);
+            var identityUserClaimstring = IdentityUserClaimstringEntityType.Create(this);
+            var identityUserLoginstring = IdentityUserLoginstringEntityType.Create(this);
+            var identityUserRolestring = IdentityUserRolestringEntityType.Create(this);
+            var identityUserTokenstring = IdentityUserTokenstringEntityType.Create(this);
+
+            LatLongEntityType.CreateForeignKey1(latLong, order);
+            OrderEntityType.CreateForeignKey1(order, address);
+            PizzaEntityType.CreateForeignKey1(pizza, order);
+            PizzaEntityType.CreateForeignKey2(pizza, pizzaSpecial);
+            PizzaToppingEntityType.CreateForeignKey1(pizzaTopping, pizza);
+            PizzaToppingEntityType.CreateForeignKey2(pizzaTopping, topping);
+            IdentityRoleClaimstringEntityType.CreateForeignKey1(identityRoleClaimstring, identityRole);
+            IdentityUserClaimstringEntityType.CreateForeignKey1(identityUserClaimstring, pizzaStoreUser);
+            IdentityUserLoginstringEntityType.CreateForeignKey1(identityUserLoginstring, pizzaStoreUser);
+            IdentityUserRolestringEntityType.CreateForeignKey1(identityUserRolestring, identityRole);
+            IdentityUserRolestringEntityType.CreateForeignKey2(identityUserRolestring, pizzaStoreUser);
+            IdentityUserTokenstringEntityType.CreateForeignKey1(identityUserTokenstring, pizzaStoreUser);
+
+            AddressEntityType.CreateAnnotations(address);
+            LatLongEntityType.CreateAnnotations(latLong);
+            NotificationSubscriptionEntityType.CreateAnnotations(notificationSubscription);
+            OrderEntityType.CreateAnnotations(order);
+            PizzaEntityType.CreateAnnotations(pizza);
+            PizzaSpecialEntityType.CreateAnnotations(pizzaSpecial);
+            PizzaToppingEntityType.CreateAnnotations(pizzaTopping);
+            PizzaStoreUserEntityType.CreateAnnotations(pizzaStoreUser);
+            ToppingEntityType.CreateAnnotations(topping);
+            DeviceFlowCodesEntityType.CreateAnnotations(deviceFlowCodes);
+            KeyEntityType.CreateAnnotations(key);
+            PersistedGrantEntityType.CreateAnnotations(persistedGrant);
+            IdentityRoleEntityType.CreateAnnotations(identityRole);
+            IdentityRoleClaimstringEntityType.CreateAnnotations(identityRoleClaimstring);
+            IdentityUserClaimstringEntityType.CreateAnnotations(identityUserClaimstring);
+            IdentityUserLoginstringEntityType.CreateAnnotations(identityUserLoginstring);
+            IdentityUserRolestringEntityType.CreateAnnotations(identityUserRolestring);
+            IdentityUserTokenstringEntityType.CreateAnnotations(identityUserTokenstring);
+
+            AddAnnotation("ProductVersion", "6.0.0");
+        }
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
new file mode 100644
index 00000000..18b2d96d
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
@@ -0,0 +1,156 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaStoreUserEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Server.PizzaStoreUser",
+                typeof(PizzaStoreUser),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var accessFailedCount = runtimeEntityType.AddProperty(
+                "AccessFailedCount",
+                typeof(int),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("AccessFailedCount", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<AccessFailedCount>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var email = runtimeEntityType.AddProperty(
+                "Email",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Email", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Email>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var emailConfirmed = runtimeEntityType.AddProperty(
+                "EmailConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("EmailConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<EmailConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnabled = runtimeEntityType.AddProperty(
+                "LockoutEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnd = runtimeEntityType.AddProperty(
+                "LockoutEnd",
+                typeof(DateTimeOffset?),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnd", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnd>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var normalizedEmail = runtimeEntityType.AddProperty(
+                "NormalizedEmail",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedEmail", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedEmail>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedUserName = runtimeEntityType.AddProperty(
+                "NormalizedUserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedUserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedUserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var passwordHash = runtimeEntityType.AddProperty(
+                "PasswordHash",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PasswordHash", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PasswordHash>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumber = runtimeEntityType.AddProperty(
+                "PhoneNumber",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumber", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumber>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumberConfirmed = runtimeEntityType.AddProperty(
+                "PhoneNumberConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumberConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumberConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var securityStamp = runtimeEntityType.AddProperty(
+                "SecurityStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("SecurityStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<SecurityStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var twoFactorEnabled = runtimeEntityType.AddProperty(
+                "TwoFactorEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("TwoFactorEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<TwoFactorEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var userName = runtimeEntityType.AddProperty(
+                "UserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("UserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<UserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedEmail });
+            index.AddAnnotation("Relational:Name", "EmailIndex");
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { normalizedUserName },
+                unique: true);
+            index0.AddAnnotation("Relational:Name", "UserNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUsers");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaToppingEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
new file mode 100644
index 00000000..b97d2a24
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaTopping",
+                typeof(PizzaTopping),
+                baseEntityType);
+
+            var pizzaId = runtimeEntityType.AddProperty(
+                "PizzaId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("PizzaId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<PizzaId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var toppingId = runtimeEntityType.AddProperty(
+                "ToppingId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("ToppingId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<ToppingId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { pizzaId, toppingId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { toppingId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PizzaId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var toppings = principalEntityType.AddNavigation("Toppings",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<PizzaTopping>),
+                propertyInfo: typeof(Pizza).GetProperty("Toppings", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Toppings>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("ToppingId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var topping = declaringEntityType.AddNavigation("Topping",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Topping),
+                propertyInfo: typeof(PizzaTopping).GetProperty("Topping", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<Topping>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PizzaTopping");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Models/ToppingEntityType.cs b/save-points/03-show-order-status/BlazingPizza.Server/Models/ToppingEntityType.cs
new file mode 100644
index 00000000..9295f9bf
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Models/ToppingEntityType.cs
@@ -0,0 +1,62 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class ToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Topping",
+                typeof(Topping),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Topping).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Topping).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var price = runtimeEntityType.AddProperty(
+                "Price",
+                typeof(decimal),
+                propertyInfo: typeof(Topping).GetProperty("Price", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Price>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Toppings");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/NotificationsController.cs b/save-points/03-show-order-status/BlazingPizza.Server/NotificationsController.cs
deleted file mode 100644
index bb3b96ff..00000000
--- a/save-points/03-show-order-status/BlazingPizza.Server/NotificationsController.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("notifications")]
-    [ApiController]
-    [Authorize]
-    public class NotificationsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public NotificationsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpPut("subscribe")]
-        public async Task<NotificationSubscription> Subscribe(NotificationSubscription subscription)
-        {
-            // We're storing at most one subscription per user, so delete old ones.
-            // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-            var userId = GetUserId();
-            var oldSubscriptions = _db.NotificationSubscriptions.Where(e => e.UserId == userId);
-            _db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
-
-            // Store new subscription
-            subscription.UserId = userId;
-            _db.NotificationSubscriptions.Attach(subscription);
-
-            await _db.SaveChangesAsync();
-            return subscription;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-    }
-}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/03-show-order-status/BlazingPizza.Server/OidcConfigurationController.cs
index c074debf..b7654075 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Server/OidcConfigurationController.cs
@@ -1,26 +1,21 @@
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class OidcConfigurationController : Controller
 {
-    public class OidcConfigurationController : Controller
-    {
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-        {
-            ClientRequestParametersProvider = clientRequestParametersProvider;
-        }
+	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+	{
+		ClientRequestParametersProvider = clientRequestParametersProvider;
+	}
 
-        public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-        [HttpGet("_configuration/{clientId}")]
-        public IActionResult GetClientRequestParameters([FromRoute]string clientId)
-        {
-            var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-            return Ok(parameters);
-        }
-    }
-}
+	[HttpGet("_configuration/{clientId}")]
+	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+	{
+		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+		return Ok(parameters);
+	}
+}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/OrdersController.cs b/save-points/03-show-order-status/BlazingPizza.Server/OrdersController.cs
index 2b8bc99b..54ff6114 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Server/OrdersController.cs
@@ -1,114 +1,109 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+[Route("orders")]
+[ApiController]
+// [Authorize]
+public class OrdersController : Controller
 {
-    [Route("orders")]
-    [ApiController]
-    // [Authorize]
-    public class OrdersController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public OrdersController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-        {
-            var orders = await _db.Orders
-                // .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .OrderByDescending(o => o.CreatedTime)
-                .ToListAsync();
-
-            return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-        }
-
-        [HttpGet("{orderId}")]
-        public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-        {
-            var order = await _db.Orders
-                .Where(o => o.OrderId == orderId)
-                // .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .SingleOrDefaultAsync();
-
-            if (order == null)
-            {
-                return NotFound();
-            }
-
-            return OrderWithStatus.FromOrder(order);
-        }
-
-        [HttpPost]
-        public async Task<ActionResult<int>> PlaceOrder(Order order)
-        {
-            order.CreatedTime = DateTime.Now;
-            order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-            // order.UserId = GetUserId();
-
-            // Enforce existence of Pizza.SpecialId and Topping.ToppingId
-            // in the database - prevent the submitter from making up
-            // new specials and toppings
-            foreach (var pizza in order.Pizzas)
-            {
-                pizza.SpecialId = pizza.Special.Id;
-                pizza.Special = null;
-
-                foreach (var topping in pizza.Toppings)
-                {
-                    topping.ToppingId = topping.Topping.Id;
-                    topping.Topping = null;
-                }
-            }
-
-            _db.Orders.Attach(order);
-            await _db.SaveChangesAsync();
-
-            // In the background, send push notifications if possible
-            var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-            if (subscription != null)
-            {
-                _ = TrackAndSendNotificationsAsync(order, subscription);
-            }
-
-            return order.OrderId;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-
-        private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-        {
-            // In a realistic case, some other backend process would track
-            // order delivery progress and send us notifications when it
-            // changes. Since we don't have any such process here, fake it.
-            await Task.Delay(OrderWithStatus.PreparationDuration);
-            await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-            await Task.Delay(OrderWithStatus.DeliveryDuration);
-            await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-        }
-
-        private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-        {
-            // This will be implemented later
-            return Task.CompletedTask;
-        }
-    }
-}
+	private readonly PizzaStoreContext _db;
+
+	public OrdersController(PizzaStoreContext db)
+	{
+		_db = db;
+	}
+
+	[HttpGet]
+	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+	{
+		var orders = await _db.Orders
+				// .Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.OrderByDescending(o => o.CreatedTime)
+				.ToListAsync();
+
+		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+	}
+
+	[HttpGet("{orderId}")]
+	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+	{
+		var order = await _db.Orders
+				.Where(o => o.OrderId == orderId)
+				// .Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.SingleOrDefaultAsync();
+
+		if (order == null)
+		{
+			return NotFound();
+		}
+
+		return OrderWithStatus.FromOrder(order);
+	}
+
+	[HttpPost]
+	public async Task<ActionResult<int>> PlaceOrder(Order order)
+	{
+		order.CreatedTime = DateTime.Now;
+		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+		// order.UserId = GetUserId();
+
+		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
+		// in the database - prevent the submitter from making up
+		// new specials and toppings
+		foreach (var pizza in order.Pizzas)
+		{
+			pizza.SpecialId = pizza.Special.Id;
+			pizza.Special = null;
+
+			foreach (var topping in pizza.Toppings)
+			{
+				topping.ToppingId = topping.Topping.Id;
+				topping.Topping = null;
+			}
+		}
+
+		_db.Orders.Attach(order);
+		await _db.SaveChangesAsync();
+
+		// In the background, send push notifications if possible
+		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+		if (subscription != null)
+		{
+			_ = TrackAndSendNotificationsAsync(order, subscription);
+		}
+
+		return order.OrderId;
+	}
+
+	private string GetUserId()
+	{
+		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+	{
+		// In a realistic case, some other backend process would track
+		// order delivery progress and send us notifications when it
+		// changes. Since we don't have any such process here, fake it.
+		await Task.Delay(OrderWithStatus.PreparationDuration);
+		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+		await Task.Delay(OrderWithStatus.DeliveryDuration);
+		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+	}
+
+	private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+	{
+		// This will be implemented later
+		return Task.CompletedTask;
+	}
+}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/03-show-order-status/BlazingPizza.Server/PizzaApiExtensions.cs
new file mode 100644
index 00000000..bf6b7bde
--- /dev/null
+++ b/save-points/03-show-order-status/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -0,0 +1,60 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
+
+namespace BlazingPizza.Server;
+
+public static class PizzaApiExtensions
+{
+
+	public static WebApplication MapPizzaApi(this WebApplication app)
+	{
+
+		// Subscribe to notifications
+		app.MapPut("/notifications/subscribe", [Authorize] async (
+			HttpContext context,
+			PizzaStoreContext db,
+			NotificationSubscription subscription) =>
+		{
+
+			// We're storing at most one subscription per user, so delete old ones.
+			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+			var userId = GetUserId(context);
+			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+
+			// Store new subscription
+			subscription.UserId = userId;
+			db.NotificationSubscriptions.Attach(subscription);
+
+			await db.SaveChangesAsync();
+			return Results.Ok(subscription);
+
+		});
+
+		// Specials
+		app.MapGet("/specials", async (PizzaStoreContext db) =>
+		{
+
+			var specials = await db.Specials.ToListAsync();
+			return Results.Ok(specials);
+
+		});
+
+		// Toppings
+		app.MapGet("/toppings", async (PizzaStoreContext db) =>
+		{
+			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+			return Results.Ok(toppings);
+		});
+
+		return app;
+
+	}
+
+	private static string GetUserId(HttpContext context)
+	{
+		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreContext.cs
index 9485bd12..9a2e17ee 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreContext.cs
@@ -3,37 +3,36 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-    public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
-    {
-        public PizzaStoreContext(
-            DbContextOptions options,
-            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-        {
-        }
+	public PizzaStoreContext(
+			DbContextOptions options,
+			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+	{
+	}
 
-        public DbSet<Order> Orders { get; set; }
+	public DbSet<Order> Orders { get; set; }
 
-        public DbSet<Pizza> Pizzas { get; set; }
+	public DbSet<Pizza> Pizzas { get; set; }
 
-        public DbSet<PizzaSpecial> Specials { get; set; }
+	public DbSet<PizzaSpecial> Specials { get; set; }
 
-        public DbSet<Topping> Toppings { get; set; }
+	public DbSet<Topping> Toppings { get; set; }
 
-        public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
+	protected override void OnModelCreating(ModelBuilder modelBuilder)
+	{
+		base.OnModelCreating(modelBuilder);
 
-            // Configuring a many-to-many special -> topping relationship that is friendly for serialization
-            modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-            modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-            modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
+		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-            // Inline the Lat-Long pairs in Order rather than having a FK to another table
-            modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-        }
-    }
-}
\ No newline at end of file
+		// Inline the Lat-Long pairs in Order rather than having a FK to another table
+		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+	}
+}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreUser.cs b/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreUser.cs
index 171ce83d..d446a679 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreUser.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreUser.cs
@@ -1,8 +1,6 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+public class PizzaStoreUser : IdentityUser
 {
-    public class PizzaStoreUser : IdentityUser
-    {
-    }
 }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/PizzasController.cs b/save-points/03-show-order-status/BlazingPizza.Server/PizzasController.cs
deleted file mode 100644
index c082552c..00000000
--- a/save-points/03-show-order-status/BlazingPizza.Server/PizzasController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("pizzas")]
-    [ApiController]
-    public class PizzasController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public PizzasController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-    }
-}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Program.cs b/save-points/03-show-order-status/BlazingPizza.Server/Program.cs
index 40a47641..4484d8f7 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/Program.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Program.cs
@@ -1,33 +1,67 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.EntityFrameworkCore;
+using BlazingPizza.Server;
 
-namespace BlazingPizza.Server
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddControllersWithViews()
+	.AddJsonOptions(options =>  {
+		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+	});
+builder.Services.AddRazorPages();
+
+builder.Services.AddDbContext<PizzaStoreContext>(options =>
+		options.UseSqlite("Data Source=pizza.db")
+			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+
+builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
+		.AddEntityFrameworkStores<PizzaStoreContext>();
+
+builder.Services.AddIdentityServer()
+		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+
+builder.Services.AddAuthentication()
+		.AddIdentityServerJwt();
+
+var app = builder.Build();
+
+// Initialize the database
+var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
+using (var scope = scopeFactory.CreateScope())
+{
+	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+	if (db.Database.EnsureCreated())
+	{
+		SeedData.Initialize(db);
+	}
+}
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseWebAssemblyDebugging();
+}
+else
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var host = CreateHostBuilder(args).Build();
-
-            // Initialize the database
-            var scopeFactory = host.Services.GetRequiredService<IServiceScopeFactory>();
-            using (var scope = scopeFactory.CreateScope())
-            {
-                var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-                if (db.Database.EnsureCreated())
-                {
-                    SeedData.Initialize(db);
-                }
-            }
-
-            host.Run();
-        }
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+    app.UseExceptionHandler("/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
 }
+
+app.UseHttpsRedirection();
+app.UseBlazorFrameworkFiles();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseIdentityServer();
+app.UseAuthorization();
+
+app.MapPizzaApi();
+
+app.MapRazorPages();
+app.MapControllers();
+app.MapFallbackToFile("index.html");
+
+app.Run();
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/SeedData.cs b/save-points/03-show-order-status/BlazingPizza.Server/SeedData.cs
index 7c86a5b2..a1e47973 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/SeedData.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Server/SeedData.cs
@@ -1,193 +1,192 @@
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public static class SeedData
 {
-    public static class SeedData
-    {
-        public static void Initialize(PizzaStoreContext db)
-        {
-            var toppings = new Topping[]
-            {
-                new Topping()
-                {
-                    Name = "Extra cheese",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "American bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "British bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Canadian bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Tea and crumpets",
-                    Price = 5.00m
-                },
-                new Topping()
-                {
-                    Name = "Fresh-baked scones",
-                    Price = 4.50m,
-                },
-                new Topping()
-                {
-                    Name = "Bell peppers",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Onions",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Mushrooms",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Pepperoni",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Duck sausage",
-                    Price = 3.20m,
-                },
-                new Topping()
-                {
-                    Name = "Venison meatballs",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "Served on a silver platter",
-                    Price = 250.99m,
-                },
-                new Topping()
-                {
-                    Name = "Lobster on top",
-                    Price = 64.50m,
-                },
-                new Topping()
-                {
-                    Name = "Sturgeon caviar",
-                    Price = 101.75m,
-                },
-                new Topping()
-                {
-                    Name = "Artichoke hearts",
-                    Price = 3.40m,
-                },
-                new Topping()
-                {
-                    Name = "Fresh tomatoes",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Basil",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Steak (medium-rare)",
-                    Price = 8.50m,
-                },
-                new Topping()
-                {
-                    Name = "Blazing hot peppers",
-                    Price = 4.20m,
-                },
-                new Topping()
-                {
-                    Name = "Buffalo chicken",
-                    Price = 5.00m,
-                },
-                new Topping()
-                {
-                    Name = "Blue cheese",
-                    Price = 2.50m,
-                },
-            };
+	public static void Initialize(PizzaStoreContext db)
+	{
+		var toppings = new Topping[]
+		{
+			new Topping()
+			{
+					Name = "Extra cheese",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "American bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "British bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Canadian bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Tea and crumpets",
+					Price = 5.00m
+			},
+			new Topping()
+			{
+					Name = "Fresh-baked scones",
+					Price = 4.50m,
+			},
+			new Topping()
+			{
+					Name = "Bell peppers",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Onions",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Mushrooms",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Pepperoni",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Duck sausage",
+					Price = 3.20m,
+			},
+			new Topping()
+			{
+					Name = "Venison meatballs",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "Served on a silver platter",
+					Price = 250.99m,
+			},
+			new Topping()
+			{
+					Name = "Lobster on top",
+					Price = 64.50m,
+			},
+			new Topping()
+			{
+					Name = "Sturgeon caviar",
+					Price = 101.75m,
+			},
+			new Topping()
+			{
+					Name = "Artichoke hearts",
+					Price = 3.40m,
+			},
+			new Topping()
+			{
+					Name = "Fresh tomatoes",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Basil",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Steak (medium-rare)",
+					Price = 8.50m,
+			},
+			new Topping()
+			{
+					Name = "Blazing hot peppers",
+					Price = 4.20m,
+			},
+			new Topping()
+			{
+					Name = "Buffalo chicken",
+					Price = 5.00m,
+			},
+			new Topping()
+			{
+					Name = "Blue cheese",
+					Price = 2.50m,
+			},
+		};
 
-            var specials = new PizzaSpecial[]
-            {
-                new PizzaSpecial()
-                {
-                    Name = "Basic Cheese Pizza",
-                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/cheese.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 2,
-                    Name = "The Baconatorizor",
-                    Description = "It has EVERY kind of bacon",
-                    BasePrice = 11.99m,
-                    ImageUrl = "img/pizzas/bacon.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 3,
-                    Name = "Classic pepperoni",
-                    Description = "It's the pizza you grew up with, but Blazing hot!",
-                    BasePrice = 10.50m,
-                    ImageUrl = "img/pizzas/pepperoni.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 4,
-                    Name = "Buffalo chicken",
-                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-                    BasePrice = 12.75m,
-                    ImageUrl = "img/pizzas/meaty.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 5,
-                    Name = "Mushroom Lovers",
-                    Description = "It has mushrooms. Isn't that obvious?",
-                    BasePrice = 11.00m,
-                    ImageUrl = "img/pizzas/mushroom.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 6,
-                    Name = "The Brit",
-                    Description = "When in London...",
-                    BasePrice = 10.25m,
-                    ImageUrl = "img/pizzas/brit.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 7,
-                    Name = "Veggie Delight",
-                    Description = "It's like salad, but on a pizza",
-                    BasePrice = 11.50m,
-                    ImageUrl = "img/pizzas/salad.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 8,
-                    Name = "Margherita",
-                    Description = "Traditional Italian pizza with tomatoes and basil",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/margherita.jpg",
-                },
-            };
+		var specials = new PizzaSpecial[]
+		{
+			new PizzaSpecial()
+			{
+					Name = "Basic Cheese Pizza",
+					Description = "It's cheesy and delicious. Why wouldn't you want one?",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/cheese.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 2,
+					Name = "The Baconatorizor",
+					Description = "It has EVERY kind of bacon",
+					BasePrice = 11.99m,
+					ImageUrl = "img/pizzas/bacon.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 3,
+					Name = "Classic pepperoni",
+					Description = "It's the pizza you grew up with, but Blazing hot!",
+					BasePrice = 10.50m,
+					ImageUrl = "img/pizzas/pepperoni.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 4,
+					Name = "Buffalo chicken",
+					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+					BasePrice = 12.75m,
+					ImageUrl = "img/pizzas/meaty.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 5,
+					Name = "Mushroom Lovers",
+					Description = "It has mushrooms. Isn't that obvious?",
+					BasePrice = 11.00m,
+					ImageUrl = "img/pizzas/mushroom.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 6,
+					Name = "The Brit",
+					Description = "When in London...",
+					BasePrice = 10.25m,
+					ImageUrl = "img/pizzas/brit.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 7,
+					Name = "Veggie Delight",
+					Description = "It's like salad, but on a pizza",
+					BasePrice = 11.50m,
+					ImageUrl = "img/pizzas/salad.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 8,
+					Name = "Margherita",
+					Description = "Traditional Italian pizza with tomatoes and basil",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/margherita.jpg",
+			},
+		};
 
-            db.Toppings.AddRange(toppings);
-            db.Specials.AddRange(specials);
-            db.SaveChanges();
-        }
-    }
-}
+		db.Toppings.AddRange(toppings);
+		db.Specials.AddRange(specials);
+		db.SaveChanges();
+	}
+}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/SpecialsController.cs b/save-points/03-show-order-status/BlazingPizza.Server/SpecialsController.cs
deleted file mode 100644
index a176844c..00000000
--- a/save-points/03-show-order-status/BlazingPizza.Server/SpecialsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("specials")]
-    [ApiController]
-    public class SpecialsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public SpecialsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()
-        {
-            return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();
-        }
-    }
-}
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Startup.cs b/save-points/03-show-order-status/BlazingPizza.Server/Startup.cs
deleted file mode 100644
index ed3fca06..00000000
--- a/save-points/03-show-order-status/BlazingPizza.Server/Startup.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace BlazingPizza.Server
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllersWithViews();
-            services.AddRazorPages();
-
-            services.AddDbContext<PizzaStoreContext>(options => 
-                options.UseSqlite("Data Source=pizza.db"));
-
-            services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-                .AddEntityFrameworkStores<PizzaStoreContext>();
-
-            services.AddIdentityServer()
-                .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
-
-            services.AddAuthentication()
-                .AddIdentityServerJwt();
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                app.UseWebAssemblyDebugging();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Error");
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
-
-            app.UseHttpsRedirection();
-            app.UseBlazorFrameworkFiles();
-            app.UseStaticFiles();
-
-            app.UseRouting();
-
-            app.UseAuthentication();
-            app.UseIdentityServer();
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-                endpoints.MapRazorPages();
-                endpoints.MapFallbackToFile("index.html");
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/ToppingsController.cs b/save-points/03-show-order-status/BlazingPizza.Server/ToppingsController.cs
deleted file mode 100644
index 6a677639..00000000
--- a/save-points/03-show-order-status/BlazingPizza.Server/ToppingsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("toppings")]
-    [ApiController]
-    public class ToppingsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public ToppingsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<Topping>>> GetToppings()
-        {
-            return await _db.Toppings.OrderBy(t => t.Name).ToListAsync();
-        }
-    }
-}
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/Address.cs b/save-points/03-show-order-status/BlazingPizza.Shared/Address.cs
index e5c0ef0d..63f1e167 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/Address.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/Address.cs
@@ -1,21 +1,26 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Address
 {
-    public class Address
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	[Required, MaxLength(100)]
+	public string Name { get; set; }
 
-        public string Line1 { get; set; }
+	[Required, MaxLength(100)]
+	public string Line1 { get; set; }
 
-        public string Line2 { get; set; }
+	[MaxLength(100)]
+	public string Line2 { get; set; }
 
-        public string City { get; set; }
+	[Required, MaxLength(50)]
+	public string City { get; set; }
 
-        public string Region { get; set; }
+	[Required, MaxLength(20)]
+	public string Region { get; set; }
 
-        public string PostalCode { get; set; }
-    }
+	[Required, MaxLength(20)]
+	public string PostalCode { get; set; }
 }
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/03-show-order-status/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index f7b7dd02..075ddd60 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/LatLong.cs b/save-points/03-show-order-status/BlazingPizza.Shared/LatLong.cs
index 9b8c3811..14a94c26 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/LatLong.cs
@@ -1,27 +1,26 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class LatLong
 {
-    public class LatLong
-    {
-        public LatLong()
-        {
-        }
+	public LatLong()
+	{
+	}
 
-        public LatLong(double latitude, double longitude) : this()
-        {
-            Latitude = latitude;
-            Longitude = longitude;
-        }
+	public LatLong(double latitude, double longitude) : this()
+	{
+		Latitude = latitude;
+		Longitude = longitude;
+	}
 
-        public double Latitude { get; set; }
+	public double Latitude { get; set; }
 
-        public double Longitude { get; set; }
+	public double Longitude { get; set; }
 
-        public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-        {
-            // The Earth is flat, right? So no need for spherical interpolation.
-            return new LatLong(
-                start.Latitude + (end.Latitude - start.Latitude) * proportion,
-                start.Longitude + (end.Longitude - start.Longitude) * proportion);
-        }
-    }
-}
+	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+	{
+		// The Earth is flat, right? So no need for spherical interpolation.
+		return new LatLong(
+				start.Latitude + (end.Latitude - start.Latitude) * proportion,
+				start.Longitude + (end.Longitude - start.Longitude) * proportion);
+	}
+}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/03-show-order-status/BlazingPizza.Shared/NotificationSubscription.cs
index 04259c2f..9109ff57 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/NotificationSubscription.cs
@@ -1,17 +1,14 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class NotificationSubscription
 {
-    public class NotificationSubscription
-    {
-        public int NotificationSubscriptionId { get; set; }
+	public int NotificationSubscriptionId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public string Url { get; set; }
+	public string Url { get; set; }
 
-        public string P256dh { get; set; }
+	public string P256dh { get; set; }
 
-        public string Auth { get; set; }
-    }
+	public string Auth { get; set; }
 }
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/Order.cs b/save-points/03-show-order-status/BlazingPizza.Shared/Order.cs
index fb003bd6..aca04ca1 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/Order.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/Order.cs
@@ -1,25 +1,32 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Order
 {
-    public class Order
-    {
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public DateTime CreatedTime { get; set; }
+	public DateTime CreatedTime { get; set; }
 
-        public Address DeliveryAddress { get; set; } = new Address();
+	public Address DeliveryAddress { get; set; } = new Address();
 
-        public LatLong DeliveryLocation { get; set; }
+	public LatLong DeliveryLocation { get; set; }
 
-        public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-        public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-        public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
-    }
+	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(Order))]
+[JsonSerializable(typeof(OrderWithStatus))]
+[JsonSerializable(typeof(List<OrderWithStatus>))]
+[JsonSerializable(typeof(Pizza))]
+[JsonSerializable(typeof(List<PizzaSpecial>))]
+[JsonSerializable(typeof(List<Topping>))]
+[JsonSerializable(typeof(Topping))]
+public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/03-show-order-status/BlazingPizza.Shared/OrderWithStatus.cs
index 021de78c..f5f153b6 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/OrderWithStatus.cs
@@ -1,79 +1,78 @@
-using BlazingPizza.ComponentsLibrary.Map;
-using System;
-using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using BlazingPizza.ComponentsLibrary.Map;
 
-namespace BlazingPizza
+
+namespace BlazingPizza;
+
+public class OrderWithStatus
 {
-    public class OrderWithStatus
-    {
-        public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-        public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-        public Order Order { get; set; }
+	public Order Order { get; set; }
 
-        public string StatusText { get; set; }
+	public string StatusText { get; set; }
 
-        public bool IsDelivered => StatusText == "Delivered";
+	public bool IsDelivered => StatusText == "Delivered";
 
-        public List<Marker> MapMarkers { get; set; }
+	public List<Marker> MapMarkers { get; set; }
 
-        public static OrderWithStatus FromOrder(Order order)
-        {
-            // To simulate a real backend process, we fake status updates based on the amount
-            // of time since the order was placed
-            string statusText;
-            List<Marker> mapMarkers;
-            var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+	public static OrderWithStatus FromOrder(Order order)
+	{
+		// To simulate a real backend process, we fake status updates based on the amount
+		// of time since the order was placed
+		string statusText;
+		List<Marker> mapMarkers;
+		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-            if (DateTime.Now < dispatchTime)
-            {
-                statusText = "Preparing";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-                };
-            }
-            else if (DateTime.Now < dispatchTime + DeliveryDuration)
-            {
-                statusText = "Out for delivery";
+		if (DateTime.Now < dispatchTime)
+		{
+			statusText = "Preparing";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+								};
+		}
+		else if (DateTime.Now < dispatchTime + DeliveryDuration)
+		{
+			statusText = "Out for delivery";
 
-                var startPosition = ComputeStartPosition(order);
-                var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-                var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation),
-                    ToMapMarker("Driver", driverPosition, showPopup: true),
-                };
-            }
-            else
-            {
-                statusText = "Delivered";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-                };
-            }
+			var startPosition = ComputeStartPosition(order);
+			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation),
+										ToMapMarker("Driver", driverPosition, showPopup: true),
+								};
+		}
+		else
+		{
+			statusText = "Delivered";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+								};
+		}
 
-            return new OrderWithStatus
-            {
-                Order = order,
-                StatusText = statusText,
-                MapMarkers = mapMarkers,
-            };
-        }
+		return new OrderWithStatus
+		{
+			Order = order,
+			StatusText = statusText,
+			MapMarkers = mapMarkers,
+		};
+	}
 
-        private static LatLong ComputeStartPosition(Order order)
-        {
-            // Random but deterministic based on order ID
-            var rng = new Random(order.OrderId);
-            var distance = 0.01 + rng.NextDouble() * 0.02;
-            var angle = rng.NextDouble() * Math.PI * 2;
-            var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-            return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-        }
+	private static LatLong ComputeStartPosition(Order order)
+	{
+		// Random but deterministic based on order ID
+		var rng = new Random(order.OrderId);
+		var distance = 0.01 + rng.NextDouble() * 0.02;
+		var angle = rng.NextDouble() * Math.PI * 2;
+		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+	}
 
-        static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
-    }
-}
+	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/Pizza.cs b/save-points/03-show-order-status/BlazingPizza.Shared/Pizza.cs
index ec1108a9..459298f4 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/Pizza.cs
@@ -1,42 +1,44 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+///    /// Represents a customized pizza as part of an order
+/// </summary>
+public class Pizza
 {
-    /// <summary>
-    /// Represents a customized pizza as part of an order
-    /// </summary>
-    public class Pizza
-    {
-        public const int DefaultSize = 12;
-        public const int MinimumSize = 9;
-        public const int MaximumSize = 17;
+	public const int DefaultSize = 12;
+	public const int MinimumSize = 9;
+	public const int MaximumSize = 17;
 
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public PizzaSpecial Special { get; set; }
+	public PizzaSpecial Special { get; set; }
 
-        public int SpecialId { get; set; }
+	public int SpecialId { get; set; }
 
-        public int Size { get; set; }
+	public int Size { get; set; }
 
-        public List<PizzaTopping> Toppings { get; set; }
+	public List<PizzaTopping> Toppings { get; set; }
 
-        public decimal GetBasePrice()
-        {
-            return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-        }
+	public decimal GetBasePrice()
+	{
+		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+	}
 
-        public decimal GetTotalPrice()
-        {
-            return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-        }
+	public decimal GetTotalPrice()
+	{
+		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+	}
 
-        public string GetFormattedTotalPrice()
-        {
-            return GetTotalPrice().ToString("0.00");
-        }
-    }
+	public string GetFormattedTotalPrice()
+	{
+		return GetTotalPrice().ToString("0.00");
+	}
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
+[JsonSerializable(typeof(Pizza))]
+public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/03-show-order-status/BlazingPizza.Shared/PizzaSpecial.cs
index 2f2b3383..9653300c 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/PizzaSpecial.cs
@@ -1,20 +1,19 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+/// Represents a pre-configured template for a pizza a user can order
+/// </summary>
+public class PizzaSpecial
 {
-    /// <summary>
-    /// Represents a pre-configured template for a pizza a user can order
-    /// </summary>
-    public class PizzaSpecial
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal BasePrice { get; set; }
+	public decimal BasePrice { get; set; }
 
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public string ImageUrl { get; set; }
+	public string ImageUrl { get; set; }
 
-        public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
-    }
-}
+	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/PizzaTopping.cs b/save-points/03-show-order-status/BlazingPizza.Shared/PizzaTopping.cs
index f5a6c1ac..0a711647 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/PizzaTopping.cs
@@ -1,11 +1,11 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class PizzaTopping
 {
-    public class PizzaTopping
-    {
-        public Topping Topping { get; set; }
+	public Topping Topping { get; set; }
+
+	public int ToppingId { get; set; }
 
-        public int ToppingId { get; set; }
-        
-        public int PizzaId { get; set; }
-    }
-}
+	public int PizzaId { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/Topping.cs b/save-points/03-show-order-status/BlazingPizza.Shared/Topping.cs
index 61bdeb92..376c311a 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/Topping.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/Topping.cs
@@ -1,13 +1,13 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Topping
 {
-    public class Topping
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal Price { get; set; }
+	public decimal Price { get; set; }
 
-        public string GetFormattedPrice() => Price.ToString("0.00");
-    }
-}
+	public string GetFormattedPrice() => Price.ToString("0.00");
+	
+}
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/UserInfo.cs b/save-points/03-show-order-status/BlazingPizza.Shared/UserInfo.cs
index 4996ef80..362f8f8e 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/UserInfo.cs
@@ -1,9 +1,9 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class UserInfo
 {
-    public class UserInfo
-    {
-        public bool IsAuthenticated { get; set; }
+	public bool IsAuthenticated { get; set; }
 
-        public string Name { get; set; }
-    }
-}
+	public string Name { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/04-refactor-state-management/BlazingPizza.Client/BlazingPizza.Client.csproj
index 663677a1..f9ebe283 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/04-refactor-state-management/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/OrderState.cs b/save-points/04-refactor-state-management/BlazingPizza.Client/OrderState.cs
index f44ac786..064f65a7 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Client/OrderState.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Client/OrderState.cs
@@ -1,50 +1,47 @@
-using System.Collections.Generic;
+namespace BlazingPizza.Client;
 
-namespace BlazingPizza.Client
+public class OrderState
 {
-    public class OrderState
-    {
-        public bool ShowingConfigureDialog { get; private set; }
-
-        public Pizza ConfiguringPizza { get; private set; }
-
-        public Order Order { get; private set; } = new Order();
-
-        public void ShowConfigurePizzaDialog(PizzaSpecial special)
-        {
-            ConfiguringPizza = new Pizza()
-            {
-                Special = special,
-                SpecialId = special.Id,
-                Size = Pizza.DefaultSize,
-                Toppings = new List<PizzaTopping>(),
-            };
-
-            ShowingConfigureDialog = true;
-        }
-
-        public void CancelConfigurePizzaDialog()
-        {
-            ConfiguringPizza = null;
-            ShowingConfigureDialog = false;
-        }
-
-        public void ConfirmConfigurePizzaDialog()
-        {
-            Order.Pizzas.Add(ConfiguringPizza);
-            ConfiguringPizza = null;
-
-            ShowingConfigureDialog = false;
-        }
-
-        public void RemoveConfiguredPizza(Pizza pizza)
-        {
-            Order.Pizzas.Remove(pizza);
-        }
-
-        public void ResetOrder()
-        {
-            Order = new Order();
-        }
-    }
+		public bool ShowingConfigureDialog { get; private set; }
+
+		public Pizza ConfiguringPizza { get; private set; }
+
+		public Order Order { get; private set; } = new Order();
+
+		public void ShowConfigurePizzaDialog(PizzaSpecial special)
+		{
+				ConfiguringPizza = new Pizza()
+				{
+						Special = special,
+						SpecialId = special.Id,
+						Size = Pizza.DefaultSize,
+						Toppings = new List<PizzaTopping>(),
+				};
+
+				ShowingConfigureDialog = true;
+		}
+
+		public void CancelConfigurePizzaDialog()
+		{
+				ConfiguringPizza = null;
+				ShowingConfigureDialog = false;
+		}
+
+		public void ConfirmConfigurePizzaDialog()
+		{
+				Order.Pizzas.Add(ConfiguringPizza);
+				ConfiguringPizza = null;
+
+				ShowingConfigureDialog = false;
+		}
+
+		public void RemoveConfiguredPizza(Pizza pizza)
+		{
+				Order.Pizzas.Remove(pizza);
+		}
+
+		public void ResetOrder()
+		{
+				Order = new Order();
+		}
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs b/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs
index e0c88943..3363acbb 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs
@@ -1,22 +1,10 @@
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
+using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
-namespace BlazingPizza.Client
-{
-    public class Program
-    {
-        public static async Task Main(string[] args)
-        {
-            var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("#app");
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<App>("#app");
 
-            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
-            builder.Services.AddScoped<OrderState>();
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddScoped<OrderState>();
 
-            await builder.Build().RunAsync();
-        }
-    }
-}
+await builder.Build().RunAsync();
diff --git a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 61ebf623..cb996b1b 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index f36b098e..bb84f13c 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -1,17 +1,15 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.ComponentsLibrary
+namespace BlazingPizza.ComponentsLibrary;
+
+public static class LocalStorage
 {
-    public static class LocalStorage
-    {
-        public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-        public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-        public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
-    }
-}
+	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+}
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index 63006067..a8e78f2a 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -1,13 +1,12 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Marker
 {
-    public class Marker
-    {
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public double X { get; set; }
+	public double X { get; set; }
 
-        public double Y { get; set; }
+	public double Y { get; set; }
 
-        public bool ShowPopup { get; set; }
-    }
+	public bool ShowPopup { get; set; }
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 03841826..349046d4 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -1,9 +1,8 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Point
 {
-    public class Point
-    {
-        public double X { get; set; }
+	public double X { get; set; }
 
-        public double Y { get; set; }
-    }
-}
+	public double Y { get; set; }
+}
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/04-refactor-state-management/BlazingPizza.Server/BlazingPizza.Server.csproj
index b9c74fc4..ddfe5f60 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,6 +14,7 @@
     <PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EntityFrameworkVersion)" />
+    <PackageReference Include="WebPush" Version="1.0.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/AddressEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/AddressEntityType.cs
new file mode 100644
index 00000000..82db81b6
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/AddressEntityType.cs
@@ -0,0 +1,92 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class AddressEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Address",
+                typeof(Address),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Address).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var city = runtimeEntityType.AddProperty(
+                "City",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("City", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<City>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var line1 = runtimeEntityType.AddProperty(
+                "Line1",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var line2 = runtimeEntityType.AddProperty(
+                "Line2",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var postalCode = runtimeEntityType.AddProperty(
+                "PostalCode",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("PostalCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<PostalCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var region = runtimeEntityType.AddProperty(
+                "Region",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Region", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Region>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Address");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
new file mode 100644
index 00000000..1dd4563b
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
@@ -0,0 +1,114 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class DeviceFlowCodesEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes",
+                typeof(DeviceFlowCodes),
+                baseEntityType);
+
+            var userCode = runtimeEntityType.AddProperty(
+                "UserCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("UserCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<UserCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var deviceCode = runtimeEntityType.AddProperty(
+                "DeviceCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("DeviceCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<DeviceCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userCode });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deviceCode },
+                unique: true);
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DeviceCodes");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
new file mode 100644
index 00000000..8946b261
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>",
+                typeof(IdentityRoleClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoleClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityRoleEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
new file mode 100644
index 00000000..2f1fec2b
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
@@ -0,0 +1,78 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRole",
+                typeof(IdentityRole),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedName = runtimeEntityType.AddProperty(
+                "NormalizedName",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("NormalizedName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<NormalizedName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedName },
+                unique: true);
+            index.AddAnnotation("Relational:Name", "RoleNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
new file mode 100644
index 00000000..55418a1e
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserClaim<string>",
+                typeof(IdentityUserClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
new file mode 100644
index 00000000..3ca029bd
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserLoginstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserLogin<string>",
+                typeof(IdentityUserLogin<string>),
+                baseEntityType);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerKey = runtimeEntityType.AddProperty(
+                "ProviderKey",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderKey", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderKey>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerDisplayName = runtimeEntityType.AddProperty(
+                "ProviderDisplayName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderDisplayName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderDisplayName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { loginProvider, providerKey });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserLogins");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
new file mode 100644
index 00000000..70078d7a
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
@@ -0,0 +1,82 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserRolestringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserRole<string>",
+                typeof(IdentityUserRole<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, roleId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
new file mode 100644
index 00000000..93ba6d31
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
@@ -0,0 +1,84 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserTokenstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserToken<string>",
+                typeof(IdentityUserToken<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var value = runtimeEntityType.AddProperty(
+                "Value",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Value", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Value>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, loginProvider, name });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserTokens");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/KeyEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/KeyEntityType.cs
new file mode 100644
index 00000000..f6c6b4c7
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/KeyEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class KeyEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.Key",
+                typeof(Key),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var algorithm = runtimeEntityType.AddProperty(
+                "Algorithm",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Algorithm", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Algorithm>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var created = runtimeEntityType.AddProperty(
+                "Created",
+                typeof(DateTime),
+                propertyInfo: typeof(Key).GetProperty("Created", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Created>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var dataProtected = runtimeEntityType.AddProperty(
+                "DataProtected",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("DataProtected", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<DataProtected>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var isX509Certificate = runtimeEntityType.AddProperty(
+                "IsX509Certificate",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("IsX509Certificate", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<IsX509Certificate>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var use = runtimeEntityType.AddProperty(
+                "Use",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Use", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Use>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var version = runtimeEntityType.AddProperty(
+                "Version",
+                typeof(int),
+                propertyInfo: typeof(Key).GetProperty("Version", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Version>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { use });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Keys");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/LatLongEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/LatLongEntityType.cs
new file mode 100644
index 00000000..3fd254bd
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/LatLongEntityType.cs
@@ -0,0 +1,80 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class LatLongEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.LatLong",
+                typeof(LatLong),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var latitude = runtimeEntityType.AddProperty(
+                "Latitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Latitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Latitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var longitude = runtimeEntityType.AddProperty(
+                "Longitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Longitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Longitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                ownership: true);
+
+            var deliveryLocation = principalEntityType.AddNavigation("DeliveryLocation",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(LatLong),
+                propertyInfo: typeof(Order).GetProperty("DeliveryLocation", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryLocation>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
new file mode 100644
index 00000000..db236e4c
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
@@ -0,0 +1,77 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class NotificationSubscriptionEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.NotificationSubscription",
+                typeof(NotificationSubscription),
+                baseEntityType);
+
+            var notificationSubscriptionId = runtimeEntityType.AddProperty(
+                "NotificationSubscriptionId",
+                typeof(int),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("NotificationSubscriptionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<NotificationSubscriptionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var auth = runtimeEntityType.AddProperty(
+                "Auth",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Auth", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Auth>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var p256dh = runtimeEntityType.AddProperty(
+                "P256dh",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("P256dh", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<P256dh>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var url = runtimeEntityType.AddProperty(
+                "Url",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Url", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Url>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { notificationSubscriptionId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "NotificationSubscriptions");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/OrderEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/OrderEntityType.cs
new file mode 100644
index 00000000..9d9ec6fd
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/OrderEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class OrderEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Order",
+                typeof(Order),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Order).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var createdTime = runtimeEntityType.AddProperty(
+                "CreatedTime",
+                typeof(DateTime),
+                propertyInfo: typeof(Order).GetProperty("CreatedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<CreatedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var deliveryAddressId = runtimeEntityType.AddProperty(
+                "DeliveryAddressId",
+                typeof(int?),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(Order).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deliveryAddressId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("DeliveryAddressId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var deliveryAddress = declaringEntityType.AddNavigation("DeliveryAddress",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Address),
+                propertyInfo: typeof(Order).GetProperty("DeliveryAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PersistedGrantEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
new file mode 100644
index 00000000..842d53a5
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
@@ -0,0 +1,127 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PersistedGrantEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.PersistedGrant",
+                typeof(PersistedGrant),
+                baseEntityType);
+
+            var key = runtimeEntityType.AddProperty(
+                "Key",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Key", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Key>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var consumedTime = runtimeEntityType.AddProperty(
+                "ConsumedTime",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ConsumedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ConsumedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(PersistedGrant).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var type = runtimeEntityType.AddProperty(
+                "Type",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Type", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Type>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var key0 = runtimeEntityType.AddKey(
+                new[] { key });
+            runtimeEntityType.SetPrimaryKey(key0);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { consumedTime });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            var index1 = runtimeEntityType.AddIndex(
+                new[] { subjectId, clientId, type });
+
+            var index2 = runtimeEntityType.AddIndex(
+                new[] { subjectId, sessionId, type });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PersistedGrants");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaEntityType.cs
new file mode 100644
index 00000000..3a124e63
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaEntityType.cs
@@ -0,0 +1,111 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Pizza",
+                typeof(Pizza),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var size = runtimeEntityType.AddProperty(
+                "Size",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Size", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Size>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var specialId = runtimeEntityType.AddProperty(
+                "SpecialId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("SpecialId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<SpecialId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { orderId });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { specialId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var pizzas = principalEntityType.AddNavigation("Pizzas",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<Pizza>),
+                propertyInfo: typeof(Order).GetProperty("Pizzas", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<Pizzas>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("SpecialId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var special = declaringEntityType.AddNavigation("Special",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(PizzaSpecial),
+                propertyInfo: typeof(Pizza).GetProperty("Special", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Special>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Pizzas");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
new file mode 100644
index 00000000..e86b0f50
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
@@ -0,0 +1,76 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaSpecialEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaSpecial",
+                typeof(PizzaSpecial),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var basePrice = runtimeEntityType.AddProperty(
+                "BasePrice",
+                typeof(decimal),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("BasePrice", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<BasePrice>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var imageUrl = runtimeEntityType.AddProperty(
+                "ImageUrl",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("ImageUrl", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<ImageUrl>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Specials");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaStoreContextModel.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
new file mode 100644
index 00000000..8b516a68
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
@@ -0,0 +1,28 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    [DbContext(typeof(PizzaStoreContext))]
+    public partial class PizzaStoreContextModel : RuntimeModel
+    {
+        static PizzaStoreContextModel()
+        {
+            var model = new PizzaStoreContextModel();
+            model.Initialize();
+            model.Customize();
+            _instance = model;
+        }
+
+        private static PizzaStoreContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
new file mode 100644
index 00000000..d46f50f4
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
@@ -0,0 +1,69 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    public partial class PizzaStoreContextModel
+    {
+        partial void Initialize()
+        {
+            var address = AddressEntityType.Create(this);
+            var latLong = LatLongEntityType.Create(this);
+            var notificationSubscription = NotificationSubscriptionEntityType.Create(this);
+            var order = OrderEntityType.Create(this);
+            var pizza = PizzaEntityType.Create(this);
+            var pizzaSpecial = PizzaSpecialEntityType.Create(this);
+            var pizzaTopping = PizzaToppingEntityType.Create(this);
+            var pizzaStoreUser = PizzaStoreUserEntityType.Create(this);
+            var topping = ToppingEntityType.Create(this);
+            var deviceFlowCodes = DeviceFlowCodesEntityType.Create(this);
+            var key = KeyEntityType.Create(this);
+            var persistedGrant = PersistedGrantEntityType.Create(this);
+            var identityRole = IdentityRoleEntityType.Create(this);
+            var identityRoleClaimstring = IdentityRoleClaimstringEntityType.Create(this);
+            var identityUserClaimstring = IdentityUserClaimstringEntityType.Create(this);
+            var identityUserLoginstring = IdentityUserLoginstringEntityType.Create(this);
+            var identityUserRolestring = IdentityUserRolestringEntityType.Create(this);
+            var identityUserTokenstring = IdentityUserTokenstringEntityType.Create(this);
+
+            LatLongEntityType.CreateForeignKey1(latLong, order);
+            OrderEntityType.CreateForeignKey1(order, address);
+            PizzaEntityType.CreateForeignKey1(pizza, order);
+            PizzaEntityType.CreateForeignKey2(pizza, pizzaSpecial);
+            PizzaToppingEntityType.CreateForeignKey1(pizzaTopping, pizza);
+            PizzaToppingEntityType.CreateForeignKey2(pizzaTopping, topping);
+            IdentityRoleClaimstringEntityType.CreateForeignKey1(identityRoleClaimstring, identityRole);
+            IdentityUserClaimstringEntityType.CreateForeignKey1(identityUserClaimstring, pizzaStoreUser);
+            IdentityUserLoginstringEntityType.CreateForeignKey1(identityUserLoginstring, pizzaStoreUser);
+            IdentityUserRolestringEntityType.CreateForeignKey1(identityUserRolestring, identityRole);
+            IdentityUserRolestringEntityType.CreateForeignKey2(identityUserRolestring, pizzaStoreUser);
+            IdentityUserTokenstringEntityType.CreateForeignKey1(identityUserTokenstring, pizzaStoreUser);
+
+            AddressEntityType.CreateAnnotations(address);
+            LatLongEntityType.CreateAnnotations(latLong);
+            NotificationSubscriptionEntityType.CreateAnnotations(notificationSubscription);
+            OrderEntityType.CreateAnnotations(order);
+            PizzaEntityType.CreateAnnotations(pizza);
+            PizzaSpecialEntityType.CreateAnnotations(pizzaSpecial);
+            PizzaToppingEntityType.CreateAnnotations(pizzaTopping);
+            PizzaStoreUserEntityType.CreateAnnotations(pizzaStoreUser);
+            ToppingEntityType.CreateAnnotations(topping);
+            DeviceFlowCodesEntityType.CreateAnnotations(deviceFlowCodes);
+            KeyEntityType.CreateAnnotations(key);
+            PersistedGrantEntityType.CreateAnnotations(persistedGrant);
+            IdentityRoleEntityType.CreateAnnotations(identityRole);
+            IdentityRoleClaimstringEntityType.CreateAnnotations(identityRoleClaimstring);
+            IdentityUserClaimstringEntityType.CreateAnnotations(identityUserClaimstring);
+            IdentityUserLoginstringEntityType.CreateAnnotations(identityUserLoginstring);
+            IdentityUserRolestringEntityType.CreateAnnotations(identityUserRolestring);
+            IdentityUserTokenstringEntityType.CreateAnnotations(identityUserTokenstring);
+
+            AddAnnotation("ProductVersion", "6.0.0");
+        }
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
new file mode 100644
index 00000000..18b2d96d
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
@@ -0,0 +1,156 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaStoreUserEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Server.PizzaStoreUser",
+                typeof(PizzaStoreUser),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var accessFailedCount = runtimeEntityType.AddProperty(
+                "AccessFailedCount",
+                typeof(int),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("AccessFailedCount", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<AccessFailedCount>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var email = runtimeEntityType.AddProperty(
+                "Email",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Email", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Email>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var emailConfirmed = runtimeEntityType.AddProperty(
+                "EmailConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("EmailConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<EmailConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnabled = runtimeEntityType.AddProperty(
+                "LockoutEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnd = runtimeEntityType.AddProperty(
+                "LockoutEnd",
+                typeof(DateTimeOffset?),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnd", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnd>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var normalizedEmail = runtimeEntityType.AddProperty(
+                "NormalizedEmail",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedEmail", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedEmail>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedUserName = runtimeEntityType.AddProperty(
+                "NormalizedUserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedUserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedUserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var passwordHash = runtimeEntityType.AddProperty(
+                "PasswordHash",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PasswordHash", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PasswordHash>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumber = runtimeEntityType.AddProperty(
+                "PhoneNumber",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumber", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumber>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumberConfirmed = runtimeEntityType.AddProperty(
+                "PhoneNumberConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumberConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumberConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var securityStamp = runtimeEntityType.AddProperty(
+                "SecurityStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("SecurityStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<SecurityStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var twoFactorEnabled = runtimeEntityType.AddProperty(
+                "TwoFactorEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("TwoFactorEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<TwoFactorEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var userName = runtimeEntityType.AddProperty(
+                "UserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("UserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<UserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedEmail });
+            index.AddAnnotation("Relational:Name", "EmailIndex");
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { normalizedUserName },
+                unique: true);
+            index0.AddAnnotation("Relational:Name", "UserNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUsers");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaToppingEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
new file mode 100644
index 00000000..b97d2a24
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaTopping",
+                typeof(PizzaTopping),
+                baseEntityType);
+
+            var pizzaId = runtimeEntityType.AddProperty(
+                "PizzaId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("PizzaId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<PizzaId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var toppingId = runtimeEntityType.AddProperty(
+                "ToppingId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("ToppingId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<ToppingId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { pizzaId, toppingId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { toppingId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PizzaId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var toppings = principalEntityType.AddNavigation("Toppings",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<PizzaTopping>),
+                propertyInfo: typeof(Pizza).GetProperty("Toppings", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Toppings>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("ToppingId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var topping = declaringEntityType.AddNavigation("Topping",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Topping),
+                propertyInfo: typeof(PizzaTopping).GetProperty("Topping", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<Topping>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PizzaTopping");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Models/ToppingEntityType.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/ToppingEntityType.cs
new file mode 100644
index 00000000..9295f9bf
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Models/ToppingEntityType.cs
@@ -0,0 +1,62 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class ToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Topping",
+                typeof(Topping),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Topping).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Topping).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var price = runtimeEntityType.AddProperty(
+                "Price",
+                typeof(decimal),
+                propertyInfo: typeof(Topping).GetProperty("Price", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Price>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Toppings");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/NotificationsController.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/NotificationsController.cs
deleted file mode 100644
index bb3b96ff..00000000
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/NotificationsController.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("notifications")]
-    [ApiController]
-    [Authorize]
-    public class NotificationsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public NotificationsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpPut("subscribe")]
-        public async Task<NotificationSubscription> Subscribe(NotificationSubscription subscription)
-        {
-            // We're storing at most one subscription per user, so delete old ones.
-            // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-            var userId = GetUserId();
-            var oldSubscriptions = _db.NotificationSubscriptions.Where(e => e.UserId == userId);
-            _db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
-
-            // Store new subscription
-            subscription.UserId = userId;
-            _db.NotificationSubscriptions.Attach(subscription);
-
-            await _db.SaveChangesAsync();
-            return subscription;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-    }
-}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/OidcConfigurationController.cs
index c074debf..dc75ecb3 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/OidcConfigurationController.cs
@@ -1,26 +1,21 @@
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class OidcConfigurationController : Controller
 {
-    public class OidcConfigurationController : Controller
-    {
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-        {
-            ClientRequestParametersProvider = clientRequestParametersProvider;
-        }
+	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+	{
+		ClientRequestParametersProvider = clientRequestParametersProvider;
+	}
 
-        public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-        [HttpGet("_configuration/{clientId}")]
-        public IActionResult GetClientRequestParameters([FromRoute]string clientId)
-        {
-            var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-            return Ok(parameters);
-        }
-    }
+	[HttpGet("_configuration/{clientId}")]
+	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+	{
+		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+		return Ok(parameters);
+	}
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/OrdersController.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/OrdersController.cs
index 2b8bc99b..4cc7115e 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/OrdersController.cs
@@ -1,114 +1,130 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
+using System.Text.Json;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using WebPush;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+[Route("orders")]
+[ApiController]
+// [Authorize]
+public class OrdersController : Controller
 {
-    [Route("orders")]
-    [ApiController]
-    // [Authorize]
-    public class OrdersController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public OrdersController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-        {
-            var orders = await _db.Orders
-                // .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .OrderByDescending(o => o.CreatedTime)
-                .ToListAsync();
-
-            return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-        }
-
-        [HttpGet("{orderId}")]
-        public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-        {
-            var order = await _db.Orders
-                .Where(o => o.OrderId == orderId)
-                // .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .SingleOrDefaultAsync();
-
-            if (order == null)
-            {
-                return NotFound();
-            }
-
-            return OrderWithStatus.FromOrder(order);
-        }
-
-        [HttpPost]
-        public async Task<ActionResult<int>> PlaceOrder(Order order)
-        {
-            order.CreatedTime = DateTime.Now;
-            order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-            // order.UserId = GetUserId();
-
-            // Enforce existence of Pizza.SpecialId and Topping.ToppingId
-            // in the database - prevent the submitter from making up
-            // new specials and toppings
-            foreach (var pizza in order.Pizzas)
-            {
-                pizza.SpecialId = pizza.Special.Id;
-                pizza.Special = null;
-
-                foreach (var topping in pizza.Toppings)
-                {
-                    topping.ToppingId = topping.Topping.Id;
-                    topping.Topping = null;
-                }
-            }
-
-            _db.Orders.Attach(order);
-            await _db.SaveChangesAsync();
-
-            // In the background, send push notifications if possible
-            var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-            if (subscription != null)
-            {
-                _ = TrackAndSendNotificationsAsync(order, subscription);
-            }
-
-            return order.OrderId;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-
-        private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-        {
-            // In a realistic case, some other backend process would track
-            // order delivery progress and send us notifications when it
-            // changes. Since we don't have any such process here, fake it.
-            await Task.Delay(OrderWithStatus.PreparationDuration);
-            await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-            await Task.Delay(OrderWithStatus.DeliveryDuration);
-            await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-        }
-
-        private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-        {
-            // This will be implemented later
-            return Task.CompletedTask;
-        }
-    }
+	private readonly PizzaStoreContext _db;
+
+	public OrdersController(PizzaStoreContext db)
+	{
+		_db = db;
+	}
+
+	[HttpGet]
+	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+	{
+		var orders = await _db.Orders
+				.Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.OrderByDescending(o => o.CreatedTime)
+				.ToListAsync();
+
+		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+	}
+
+	[HttpGet("{orderId}")]
+	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+	{
+		var order = await _db.Orders
+				.Where(o => o.OrderId == orderId)
+				.Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.SingleOrDefaultAsync();
+
+		if (order == null)
+		{
+			return NotFound();
+		}
+
+		return OrderWithStatus.FromOrder(order);
+	}
+
+	[HttpPost]
+	public async Task<ActionResult<int>> PlaceOrder(Order order)
+	{
+		order.CreatedTime = DateTime.Now;
+		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+		order.UserId = GetUserId();
+
+		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
+		// in the database - prevent the submitter from making up
+		// new specials and toppings
+		foreach (var pizza in order.Pizzas)
+		{
+			pizza.SpecialId = pizza.Special.Id;
+			pizza.Special = null;
+
+			foreach (var topping in pizza.Toppings)
+			{
+				topping.ToppingId = topping.Topping.Id;
+				topping.Topping = null;
+			}
+		}
+
+		_db.Orders.Attach(order);
+		await _db.SaveChangesAsync();
+
+		// In the background, send push notifications if possible
+		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+		if (subscription != null)
+		{
+			_ = TrackAndSendNotificationsAsync(order, subscription);
+		}
+
+		return order.OrderId;
+	}
+
+	private string GetUserId()
+	{
+		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+	{
+		// In a realistic case, some other backend process would track
+		// order delivery progress and send us notifications when it
+		// changes. Since we don't have any such process here, fake it.
+		await Task.Delay(OrderWithStatus.PreparationDuration);
+		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+		await Task.Delay(OrderWithStatus.DeliveryDuration);
+		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+	}
+
+	private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+	{
+		// For a real application, generate your own
+		var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
+		var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
+
+		var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
+		var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
+		var webPushClient = new WebPushClient();
+		try
+		{
+			var payload = JsonSerializer.Serialize(new
+			{
+				message,
+				url = $"myorders/{order.OrderId}",
+			});
+			await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
+		}
+		catch (Exception ex)
+		{
+			Console.Error.WriteLine("Error sending push notification: " + ex.Message);
+		}
+	}
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaApiExtensions.cs
new file mode 100644
index 00000000..bf6b7bde
--- /dev/null
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -0,0 +1,60 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
+
+namespace BlazingPizza.Server;
+
+public static class PizzaApiExtensions
+{
+
+	public static WebApplication MapPizzaApi(this WebApplication app)
+	{
+
+		// Subscribe to notifications
+		app.MapPut("/notifications/subscribe", [Authorize] async (
+			HttpContext context,
+			PizzaStoreContext db,
+			NotificationSubscription subscription) =>
+		{
+
+			// We're storing at most one subscription per user, so delete old ones.
+			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+			var userId = GetUserId(context);
+			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+
+			// Store new subscription
+			subscription.UserId = userId;
+			db.NotificationSubscriptions.Attach(subscription);
+
+			await db.SaveChangesAsync();
+			return Results.Ok(subscription);
+
+		});
+
+		// Specials
+		app.MapGet("/specials", async (PizzaStoreContext db) =>
+		{
+
+			var specials = await db.Specials.ToListAsync();
+			return Results.Ok(specials);
+
+		});
+
+		// Toppings
+		app.MapGet("/toppings", async (PizzaStoreContext db) =>
+		{
+			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+			return Results.Ok(toppings);
+		});
+
+		return app;
+
+	}
+
+	private static string GetUserId(HttpContext context)
+	{
+		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+}
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreContext.cs
index 9485bd12..9a2e17ee 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreContext.cs
@@ -3,37 +3,36 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-    public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
-    {
-        public PizzaStoreContext(
-            DbContextOptions options,
-            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-        {
-        }
+	public PizzaStoreContext(
+			DbContextOptions options,
+			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+	{
+	}
 
-        public DbSet<Order> Orders { get; set; }
+	public DbSet<Order> Orders { get; set; }
 
-        public DbSet<Pizza> Pizzas { get; set; }
+	public DbSet<Pizza> Pizzas { get; set; }
 
-        public DbSet<PizzaSpecial> Specials { get; set; }
+	public DbSet<PizzaSpecial> Specials { get; set; }
 
-        public DbSet<Topping> Toppings { get; set; }
+	public DbSet<Topping> Toppings { get; set; }
 
-        public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
+	protected override void OnModelCreating(ModelBuilder modelBuilder)
+	{
+		base.OnModelCreating(modelBuilder);
 
-            // Configuring a many-to-many special -> topping relationship that is friendly for serialization
-            modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-            modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-            modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
+		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-            // Inline the Lat-Long pairs in Order rather than having a FK to another table
-            modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-        }
-    }
-}
\ No newline at end of file
+		// Inline the Lat-Long pairs in Order rather than having a FK to another table
+		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+	}
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreUser.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreUser.cs
index 171ce83d..7ab40235 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreUser.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreUser.cs
@@ -1,8 +1,5 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace BlazingPizza.Server
-{
-    public class PizzaStoreUser : IdentityUser
-    {
-    }
-}
\ No newline at end of file
+namespace BlazingPizza.Server;
+
+public class PizzaStoreUser : IdentityUser { }
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzasController.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzasController.cs
deleted file mode 100644
index c082552c..00000000
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzasController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("pizzas")]
-    [ApiController]
-    public class PizzasController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public PizzasController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-    }
-}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Program.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Program.cs
index 40a47641..4484d8f7 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/Program.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Program.cs
@@ -1,33 +1,67 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.EntityFrameworkCore;
+using BlazingPizza.Server;
 
-namespace BlazingPizza.Server
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddControllersWithViews()
+	.AddJsonOptions(options =>  {
+		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+	});
+builder.Services.AddRazorPages();
+
+builder.Services.AddDbContext<PizzaStoreContext>(options =>
+		options.UseSqlite("Data Source=pizza.db")
+			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+
+builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
+		.AddEntityFrameworkStores<PizzaStoreContext>();
+
+builder.Services.AddIdentityServer()
+		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+
+builder.Services.AddAuthentication()
+		.AddIdentityServerJwt();
+
+var app = builder.Build();
+
+// Initialize the database
+var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
+using (var scope = scopeFactory.CreateScope())
+{
+	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+	if (db.Database.EnsureCreated())
+	{
+		SeedData.Initialize(db);
+	}
+}
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseWebAssemblyDebugging();
+}
+else
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var host = CreateHostBuilder(args).Build();
-
-            // Initialize the database
-            var scopeFactory = host.Services.GetRequiredService<IServiceScopeFactory>();
-            using (var scope = scopeFactory.CreateScope())
-            {
-                var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-                if (db.Database.EnsureCreated())
-                {
-                    SeedData.Initialize(db);
-                }
-            }
-
-            host.Run();
-        }
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+    app.UseExceptionHandler("/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
 }
+
+app.UseHttpsRedirection();
+app.UseBlazorFrameworkFiles();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseIdentityServer();
+app.UseAuthorization();
+
+app.MapPizzaApi();
+
+app.MapRazorPages();
+app.MapControllers();
+app.MapFallbackToFile("index.html");
+
+app.Run();
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/SeedData.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/SeedData.cs
index 7c86a5b2..a1e47973 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/SeedData.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/SeedData.cs
@@ -1,193 +1,192 @@
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public static class SeedData
 {
-    public static class SeedData
-    {
-        public static void Initialize(PizzaStoreContext db)
-        {
-            var toppings = new Topping[]
-            {
-                new Topping()
-                {
-                    Name = "Extra cheese",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "American bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "British bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Canadian bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Tea and crumpets",
-                    Price = 5.00m
-                },
-                new Topping()
-                {
-                    Name = "Fresh-baked scones",
-                    Price = 4.50m,
-                },
-                new Topping()
-                {
-                    Name = "Bell peppers",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Onions",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Mushrooms",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Pepperoni",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Duck sausage",
-                    Price = 3.20m,
-                },
-                new Topping()
-                {
-                    Name = "Venison meatballs",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "Served on a silver platter",
-                    Price = 250.99m,
-                },
-                new Topping()
-                {
-                    Name = "Lobster on top",
-                    Price = 64.50m,
-                },
-                new Topping()
-                {
-                    Name = "Sturgeon caviar",
-                    Price = 101.75m,
-                },
-                new Topping()
-                {
-                    Name = "Artichoke hearts",
-                    Price = 3.40m,
-                },
-                new Topping()
-                {
-                    Name = "Fresh tomatoes",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Basil",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Steak (medium-rare)",
-                    Price = 8.50m,
-                },
-                new Topping()
-                {
-                    Name = "Blazing hot peppers",
-                    Price = 4.20m,
-                },
-                new Topping()
-                {
-                    Name = "Buffalo chicken",
-                    Price = 5.00m,
-                },
-                new Topping()
-                {
-                    Name = "Blue cheese",
-                    Price = 2.50m,
-                },
-            };
+	public static void Initialize(PizzaStoreContext db)
+	{
+		var toppings = new Topping[]
+		{
+			new Topping()
+			{
+					Name = "Extra cheese",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "American bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "British bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Canadian bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Tea and crumpets",
+					Price = 5.00m
+			},
+			new Topping()
+			{
+					Name = "Fresh-baked scones",
+					Price = 4.50m,
+			},
+			new Topping()
+			{
+					Name = "Bell peppers",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Onions",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Mushrooms",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Pepperoni",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Duck sausage",
+					Price = 3.20m,
+			},
+			new Topping()
+			{
+					Name = "Venison meatballs",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "Served on a silver platter",
+					Price = 250.99m,
+			},
+			new Topping()
+			{
+					Name = "Lobster on top",
+					Price = 64.50m,
+			},
+			new Topping()
+			{
+					Name = "Sturgeon caviar",
+					Price = 101.75m,
+			},
+			new Topping()
+			{
+					Name = "Artichoke hearts",
+					Price = 3.40m,
+			},
+			new Topping()
+			{
+					Name = "Fresh tomatoes",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Basil",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Steak (medium-rare)",
+					Price = 8.50m,
+			},
+			new Topping()
+			{
+					Name = "Blazing hot peppers",
+					Price = 4.20m,
+			},
+			new Topping()
+			{
+					Name = "Buffalo chicken",
+					Price = 5.00m,
+			},
+			new Topping()
+			{
+					Name = "Blue cheese",
+					Price = 2.50m,
+			},
+		};
 
-            var specials = new PizzaSpecial[]
-            {
-                new PizzaSpecial()
-                {
-                    Name = "Basic Cheese Pizza",
-                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/cheese.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 2,
-                    Name = "The Baconatorizor",
-                    Description = "It has EVERY kind of bacon",
-                    BasePrice = 11.99m,
-                    ImageUrl = "img/pizzas/bacon.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 3,
-                    Name = "Classic pepperoni",
-                    Description = "It's the pizza you grew up with, but Blazing hot!",
-                    BasePrice = 10.50m,
-                    ImageUrl = "img/pizzas/pepperoni.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 4,
-                    Name = "Buffalo chicken",
-                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-                    BasePrice = 12.75m,
-                    ImageUrl = "img/pizzas/meaty.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 5,
-                    Name = "Mushroom Lovers",
-                    Description = "It has mushrooms. Isn't that obvious?",
-                    BasePrice = 11.00m,
-                    ImageUrl = "img/pizzas/mushroom.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 6,
-                    Name = "The Brit",
-                    Description = "When in London...",
-                    BasePrice = 10.25m,
-                    ImageUrl = "img/pizzas/brit.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 7,
-                    Name = "Veggie Delight",
-                    Description = "It's like salad, but on a pizza",
-                    BasePrice = 11.50m,
-                    ImageUrl = "img/pizzas/salad.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 8,
-                    Name = "Margherita",
-                    Description = "Traditional Italian pizza with tomatoes and basil",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/margherita.jpg",
-                },
-            };
+		var specials = new PizzaSpecial[]
+		{
+			new PizzaSpecial()
+			{
+					Name = "Basic Cheese Pizza",
+					Description = "It's cheesy and delicious. Why wouldn't you want one?",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/cheese.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 2,
+					Name = "The Baconatorizor",
+					Description = "It has EVERY kind of bacon",
+					BasePrice = 11.99m,
+					ImageUrl = "img/pizzas/bacon.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 3,
+					Name = "Classic pepperoni",
+					Description = "It's the pizza you grew up with, but Blazing hot!",
+					BasePrice = 10.50m,
+					ImageUrl = "img/pizzas/pepperoni.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 4,
+					Name = "Buffalo chicken",
+					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+					BasePrice = 12.75m,
+					ImageUrl = "img/pizzas/meaty.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 5,
+					Name = "Mushroom Lovers",
+					Description = "It has mushrooms. Isn't that obvious?",
+					BasePrice = 11.00m,
+					ImageUrl = "img/pizzas/mushroom.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 6,
+					Name = "The Brit",
+					Description = "When in London...",
+					BasePrice = 10.25m,
+					ImageUrl = "img/pizzas/brit.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 7,
+					Name = "Veggie Delight",
+					Description = "It's like salad, but on a pizza",
+					BasePrice = 11.50m,
+					ImageUrl = "img/pizzas/salad.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 8,
+					Name = "Margherita",
+					Description = "Traditional Italian pizza with tomatoes and basil",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/margherita.jpg",
+			},
+		};
 
-            db.Toppings.AddRange(toppings);
-            db.Specials.AddRange(specials);
-            db.SaveChanges();
-        }
-    }
-}
+		db.Toppings.AddRange(toppings);
+		db.Specials.AddRange(specials);
+		db.SaveChanges();
+	}
+}
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/SpecialsController.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/SpecialsController.cs
deleted file mode 100644
index a176844c..00000000
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/SpecialsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("specials")]
-    [ApiController]
-    public class SpecialsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public SpecialsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()
-        {
-            return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();
-        }
-    }
-}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Startup.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Startup.cs
deleted file mode 100644
index ed3fca06..00000000
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/Startup.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace BlazingPizza.Server
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllersWithViews();
-            services.AddRazorPages();
-
-            services.AddDbContext<PizzaStoreContext>(options => 
-                options.UseSqlite("Data Source=pizza.db"));
-
-            services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-                .AddEntityFrameworkStores<PizzaStoreContext>();
-
-            services.AddIdentityServer()
-                .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
-
-            services.AddAuthentication()
-                .AddIdentityServerJwt();
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                app.UseWebAssemblyDebugging();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Error");
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
-
-            app.UseHttpsRedirection();
-            app.UseBlazorFrameworkFiles();
-            app.UseStaticFiles();
-
-            app.UseRouting();
-
-            app.UseAuthentication();
-            app.UseIdentityServer();
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-                endpoints.MapRazorPages();
-                endpoints.MapFallbackToFile("index.html");
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/ToppingsController.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/ToppingsController.cs
deleted file mode 100644
index 6a677639..00000000
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/ToppingsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("toppings")]
-    [ApiController]
-    public class ToppingsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public ToppingsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<Topping>>> GetToppings()
-        {
-            return await _db.Toppings.OrderBy(t => t.Name).ToListAsync();
-        }
-    }
-}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/pizza.db-shm b/save-points/04-refactor-state-management/BlazingPizza.Server/pizza.db-shm
new file mode 100644
index 0000000000000000000000000000000000000000..0ba16f0cb838a14216aa22cdaa5553f246a133be
GIT binary patch
literal 32768
zcmeI*xiW)c7{&3A*tf(Ud#te&6e^w4j7I4q+=t6hxdV+-L$6RUN;kndMMla;VR+y9
zpP4fg=9@@<z4KJxcZz1(ilTC)9~$c0S^f6>?y2#5ef4<q@N#kgar0b1J-)2|@cHI@
z`+YxK()xS9*55AL)sotwcB)-!x7wrjs(os|I-m}!Luy&AsKe@rI;xJT<LZPusaDk~
zby}TKXVp1%UR_XY>Y}=&E~_i*s=B7u)pd14-Bh>KZPjYK>Ylo<+RUH5`FZq`Ab<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagkfDJ8^PWTmyn8?*0$!a+Bi@`K5dklLkcfcyR?^7#
zMok)@_wPQXw{A#8pi~@09{UH+cxQ-21ibP@A_CsnN+Vv_A`t=an~{is*X7cPx8+Dg
zz{`FlBH&%cG~!i75)tsGC5Z@lQIzB*;5Ang5%88S$xFaH#v~%(6={-}fET<;M8Ny$
zBrkzlUSH=Izl|>kkh}zZwShzgd^3aOCE$A{BqHEzF(fYmU+N(d0pCd?c?tMN6^RIx
zi^IrcJd==sud|VeK&9~IJ(81v?-G)TfUiQ5yaaralSBl350&I4;9ImLBH&BFBrgG9
YVI~m)-@qn$3Hbgvi3s@mJBbK<0sk;F>Hq)$

literal 0
HcmV?d00001

diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/pizza.db-wal b/save-points/04-refactor-state-management/BlazingPizza.Server/pizza.db-wal
new file mode 100644
index 0000000000000000000000000000000000000000..435bedc6a6aeb137805dda08f553d088e56512e6
GIT binary patch
literal 214272
zcmeI54R9Q1dB^Xh^PMD1Iwy*JksZbBlO5|KOSbGN!QsO>pHB86`6QoCj@^)4R(G$Z
zjqh&HyL+}Jnt&|FkisOCQrbd+6hi5cCX_H~389pRmhw^P2M}gRTbS?-878G6G_+;<
zzPtP0erQjUJCn}j=6^HR?fdyW&+mEOci(-q8sGG$;052{vse3kn|$o^?YE!#^6NhT
z%*=x)9{BmA*9?AxR{8DqU+cQ|j;FtyxMBL(grpJSl&q9QP1sLIH#PZg5d_+|iT)dA
zW6Vz<{SNQ~{nqERmAx*Td_$9WZ=fwr;TKu^b>aUCzu5L<$Mvm&wu_;6v^*0W4-|v#
z%}Ueb{`SuEUQ_)4)h%DQDHQ4H@n71diL*sAsT7E!8b7Z{WRmf0Qpm;+O(cb=Q5hBb
zJK6;LG0LezR7j<>$-~Kvke<v6>6wWMAu*Yr&Sv7YUWiVO=lH;>OzLPnb5a;jp4@HD
zkx+=JkwR7~k*JVOo}d$$lkgrhDp8maqmj<e8%9Y{I!ly=2{|unl3dPB&@Zi8pc7HG
zCv;8f_m#_YYjutn3JOtGhlQ4WyNzSq#+*4O$Cb0qF*cb=rVgi>^+JDiWrrA5dn}nr
zrW46&A!-h!w4+pkSVvoI>E>`K(%b95a9DR#R<2Z}@|?=QH#wcft1Wjq?5N`@Yn07b
zLVPAWnM%|7k0#Sujx;S=F0-garxYpgb|q8(T&J%5a$Hw_x<c}jSXB9U*r`0PzC7iv
zQEMuHNK}cJrrfwuqUIH;!otcU@=_&nj?5@Uk0uutYWZ?+dnht6;J^2bZut~lU6M*e
z{;(pJHPuz@aB^_9S~$kZ0vBG#lPiYWm~bl-MTwL(YjL?&UP3Ob)sk~@+B~f<T?%NG
zwL2<mqDxOMdv(Ie^A$<aS2Z7Q6Ff~9C6#OGZEvg2-bL~@n`~{_g^EXHzP2M6IX2+;
zN#z1LubwH=8$(X4YO-F=xiIF2T@{@d4s8rY4j%Mh?9$zvmNn^=WNb*&)!AAUsdXFL
zoi4B2&vJgfF6&v~^~S1E!4@FiD?VP;<~`gowQuCcf>(q03R$tA(=~G8NNXt4-R-}q
z>JVvktL$H!6Ai1fC|K^VvjU9nHmi8(#fx*YB5Cs_Zj3wbjeAm^*41K~hWnHvYcv3f
z$8C|zPpKzH_8v$O#S9f1l<qqy?@D2DHEe-=ob4fOXL1jtD0j65Bd_kR7tV}HZkYYt
zc;W6)DAL#Gzt`B2N6A^baVO*gQEitkP7l~xEJrYhvT<C|I__|c_3+ACn-O!$%e32A
zs<~|7Zdkb;xkBc0w<PMQk(OX2)mP6^mP*uLwnFR0;s)Jq_ifXcN?fg^iN;)@+Af1m
zx7k`Ox2?H;9HTrO7SHGDMm#1;MN&w})v~rS9yvdHC&^b8g_QFP)0$YSaLl%tPL}9I
z_3G*PQ<6e&MfF9{Q{ZX2swK<p5WAj!UPsC_dmt!Ei=<Fb9jgap?z-D^bEiaAJtr%L
zBckfHFHX(NWs<IzW{Kiqu&s3+W=|6eR?_NX&7PCT#JnaeYl88xhec^{wJ5cPNN(6x
z2rb>-tVijx-xj4Axk$_?)h`2HQL49Gc9fc<Jfd_Rp;yO?maAPI7?!}=Sah8@7QMh8
z30v5c-BeSM9SKkBaLhA@O3qa20wJzqvjdW=vA;|Y;k)U`*o6UqD6(~{|Kgwl+<0^`
zA0nC@bJ!j&%!jb`92{!TBR0m~$Akn8M;_O%ZE`{?li^j`_VG5`#$bo<nr=#_=Y^uj
zy@xNv44KpKlg6_n1%Fk9{^;tYKiG4AEniSf5BWaV{$f`Lt29yx><S+c009sH0T2KI
z5C8!X009sH0T2Lz#w5_p%;N76eBs64YbyQu<fF(7G^Vp*6$pR;2!H?xfB*=900@8p
z2!H?xxCrQf1HkhFyZ-E<iyyvcYy^1$7bO%y00ck)1V8`;KmY_l00ck)1VErM39!HE
zsJ$=n^pAewd;g>HAGWbd{2c+KfDZ_O00@8p2!H?xfB*=900@8p2sAQ*ATy4?FYs{e
z{%7~y`oKH!zCa_p9JYY~2!H?xfB*=900@8p2!H?xfIy8vh+Xl#z=j)s@cwr_{IO5s
zeSsPuTz~)wfB*=900@8p2!H?xfB*=9KqC{-|6d567r6A^;}1UH^R79(FVM&?hixDL
z0w4eaAOHd&00JNY0w4eaAW$RF%C2}`;7dOyZ@Bcf9U|TrsPVxC2!H?xfB*=900@8p
z2!H?xfB*<IG66jW!1Dql|9<=Hv}3P%0q+Ymvddu`2!H?xfB*=900@8p2!H?xfB*>8
z2yA3mJTLJ2Ti*Gp&i8&XiuVO-d~g8*AOHd&00JNY0w4eaAOHd&00NCnpq&}V^8#D<
z{mW}^_}ttA-WO<Om%}y?009sH0T2KI5C8!X009sH0T8GW&{F_BFYvrH@o%AzH9v>E
zK#dPBKmY_l00ck)1V8`;KmY_l00cmwkqLA%<9J@+jZb}lOYCH15r0R}$S#L%AOHd&
z00JNY0w4eaAOHd&00JOTBM@d+JTLH4^zYuV?YXg!<9&e|A6$R{2!H?xfB*=900@8p
z2!H?xfIuS?*u;$Ed4c=h_t<Bi_|<I}kr!xWm%}y?009sH0T2KI5C8!X009sH0T8GW
zxPo2ryg>N#{dc~*@*f{UUZBPY7a#xvAOHd&00JNY0w4eaAOHd&(8vU?WXAElz%{>k
zWY+hlzI%`tXk?eeHV^;-5C8!X009sH0T2KI5C8!Xs1fL5S3EE9&ZV)>KC$7$109{`
zeVxsUuk)Wf-`pW~#@n9kxV|;eb}{shmS=+FfrkUdW~J$Ie>?5g@So1}O{XF~J^o9(
zG;y{_CY1tFRO9CriA*w{O$yogp^2mrH7cV*e@B}@KSnuKhzhB6HhDOi5z>=cAw4rO
zAtWZ#)7ea%)(g?8@f;sGl}R0qXHE*^$&<UyIT8vHHB!h*B@z{~$rE$}a}wTTMkNXp
zVl>j(dBZ3vN@t0(Fd^qfO_IyG3Hqf~3v?o?_JpoU{l0Q}ZmrJoLO~&_>afs~Z?|!b
z+n6)Q<hXLSImRY4$<*OAvtH<ruIvz_YL6u|$#fz)Ekw<Mly;OV5bJ1*E!`XrMS6Sv
z7Y^%=%F30BRGw4$_a>*ac(vs&haGi1WsS1=N{G*7CsS!U|IuVR%aNu<%Vido=#(Pm
z-L7QHpX=0>Uykd_Pgh7@5{oMT4m*|S)t9HdHEK=e4~Z)A(v%xFO4Pg}RajVgL|&>S
z&XF0V=+We&LM?x7M=)}1!0(gF1#(_JQ<OB46RVo6mvd8eu}Laj0f!Z_tf{$SS4HP?
zZ+j>*FyO!Uj1JD#>?(FRF}hkUn&V`F>s}`iRt&Wv<&Y9ZiIg>KZMqh2LN2S-l5=g_
z0!3f>l<z7_e^k^&m!4eq>JCbtuSkl%De&Po!P9h2Q@NJj_O|NmT_kU_$<~%#sCWeS
zg+m)dk%I^Q7rS)-q-9MyB^evibal2CMQYuKcBjwk_OrZKugiKCc)hV|RIqv2d&S4A
z+PnwPseL0i7Q7m~SICO}oUV}zM_NOX?r#4@RfkB!Q)U0!oM>2;MZxl4oe(y<+pOZT
z6EDumiloh#xH0a)HSS4uT2~878n07|tkDP}9=Am<Kc$`+*?S;C6f;z4RJre<yeoyp
z)v!h4akgo&oyk3nqTJOMjJ&$L-gd*7<c8VLjTi0?g(7`@{(Frbd6b-`8+Sr35Y=|s
z;`D&6#c~95C>zHWt>X^ISP!qPwVN=fyiD7LrJBnI?uM27i7R9-cTb^?8fgheQhoIt
zWvN8{Wh=B^EN;-<cHcIAsl?SvnrO@gs_io9bepZka@(5g$1%#oVex#P?xbU)R3wFj
zTrF!W<B{{Dw}O0CQAjzzFs+HD3dd}V>12scRIi?nKP4&jUQ%BKJq4bYt6H+m4zcU$
z=XIn^%SuTsN{ggWPaUfVWA3`!b91LeRXrywg(ITswJ%Q1%Vm<TmS&0KVX&=r9cE7x
z3RcqUV$GhD$HcrQD{F%Bu!luyaJ4A4g-CALRtPQK-mFLIvfmb^8M#QzDAg|mUQw#I
zTy~V2qdcN?9idmpi<YZh9T=9t+E{d*I2OIIfj&&Oum{SirXV}hoz&r&XF`>nsnP{P
zT*YPwBv)g9nI6J-(~+?Y1O8BC>sJ58K?At)=wd!ZG&$z5JzAI#Ve2_K)SgFdjJ=Nu
z2^x+(u3g*Ygj6QOtF-OoZMKcU4&OE1luXYHMUQ(AUx*npr{5<X50=z@)CE^DKk&T3
z7pw9Q0<(Yc-HxWbuhsXIFP!LjPs^U*p9Ve|Jl*tAV8QoP`#{GF8$Yt~K-=SO!>y0`
z?qs7c|3jyr-QMS4YSj<_`W};Fj|H}+v%~aNDm|J!Aw;b{QDHJo9}BJho-UH86{E(6
z6<fYG5{e8C`tOx(3y&@BtbCf3ZTASHyu}q6wb_kkYaOyFR@^Z-<_URDD$|3{S&8Nj
zxC>prTE&gW#bUK~dayiif54_m1j}-+n>`Zyqo#(tg{V^<TA|C1ncCW?rO)l|X>Ap1
zj$7?~bT?~V&+9dG?2M{EvonW{CMS|KgOZ3(C*q??8hSK%;?slmZu={=vF)mc*;|)0
z-TDLJrQ2K{*0&gI0=;;3J^$*h>vS*cThI4)nhqzK0_yq5oO4a5=+l@!F|N&#g3~8_
zK4%U^_lZ8NzE9Q)3qz{K^<{~Q*KS@dNni;#l(7YcUeU9>w@Y93myCx{tG~V!Y^&ZV
zZ>|>=Mza+b&XweypX2MEK2+3M`n<=eq*jXJf_*2jRy$w6o<izI8CTdDW=^%~2Ea97
zI<6UV#+)zrK5+1=U}Qb}fT@km<wi|p*>|O})9-if1Bs$2m25sY%H8#RZZumyU)N!v
zw%PH~b_aN-3-yln6pGFDdRv{lz`EnYv6mZaz1%)r_Fb{k1#Cqc;*Di!m9O-2fz|wf
zae;mG%jW_nWj!~5nhPwoUe>K!Kgl)!=-_~VsaHQyrB2vf&XiDdhVIsmsMq$Ho-hwt
zb%(jnT>4;kD=}t`#+LlsLXr5Oe`)(l`R2+sP79U-Ms;)*4IBgADwxBm4*VFh<iEDA
z4(2*=>tIxGUquJUK(`J?BjdnzDE5XTyXe7otB!%uVY|HTY^#$KOo21$)UlZ)&0gt8
zTt{!aD18i*Vx4l0liZU38c&Pa08?>xnJTzf;I=vzuNdf7!?M_zI7%NOn!gd*xzm4X
zQr~{3q{T(i{OyVTy4RFw{tC_BWUY6-)@$G82W)fVRl2zDkWM-FouNO<rP2GMHE*4}
zqJ5s6UQmrMri$|f#;0{2i;XeNiF8D4<%!t)^yLt%E4h5#rVxHh$$q)YV`Akm5Uq5u
z)y*CkbbB^_6N}$cdj0Ot$P09{r+S_jxc$T@-tpC!p8hKSj^Ofh9T))uAOHd&00JNY
z0w4eaAOHd&00OT-0-Kr6JTK7pjlX`+AKje!F!BPgKu<zt5C8!X009sH0T2KI5C8!X
z009uVd;$?Rgy#kB>3{CmFZ}$%N7`7W{y!M93w%HT1V8`;KmY_l00ck)1V8`;KmY_9
zl)%-@E}j?I|2u#DC!6os`$4=f(4gLiSs(xcAOHd&00JNY0w4eaAOHd&;3Uw)iaamy
z{3m|;_Tv3puEzTUPDm($00@8p2!H?xfB*=900@8p2!KF?64=7*;(39GIs)%L>$@j{
z_XQf%+b|0RKmY_l00ck)1V8`;KmY_l00f)_wz4A63mo~5_Nlk-dtSu*0!~OMfdB}A
z00@8p2!H?xfB*=900@9UgA%xg*~Rk$7r%4$_dfcnhez?gK!bW4W`O_*fB*=900@8p
z2!H?xfB*=9fRjKkEAqU+5C699(OX_~uZp~Y6B0@w00JNY0w4eaAOHd&00JNY0wB<!
z1g>Rv@w~tbZ(X?ZN5}r>5&RuNgL)fgfdB}A00@8p2!H?xfB*=900@A9lfX7s<avRA
z694h|_y@)wKwiKJ2_+B!0T2KI5C8!X009sH0T2KI5NJ>W0<(+f1$zJcTb~;G;7bRP
z7ids#!z>U00T2KI5C8!X009sH0T2KI5O5OM&Wb!QaR0@>xo5WNo8!m}I3b|~0w4ea
zAOHd&00JNY0w4eaAOHdlN+8PY;(38vDhHqa;xE7cedGli)Y~u%1V8`;KmY_l00ck)
z1V8`;KmY`s1o~K!=LNp|%hv0Db+GLt$O||jp#%aT00JNY0w4eaAOHd&00JNY0u4%F
z2eXUk1quh-e(UJc$3Bj{K!bW4W`O_*fB*=900@8p2!H?xfB*=9fRn&ZR^)ks_9yO4
z-_i8shmaR=LP7}yKmY_l00ck)1V8`;KmY_l00bJ8z;(<no)_>1zVcXm+mX9FXx--K
zHedL!I-YCq+xU}>r`rCrO>2F=^-OEH<$Wz%LLUen4}L3nWW%R7GzShh|D^d6?Tily
zG#r7&!BFJjPXAJ`R4$P7sS~*=X>n1^%9V;#p39lvse-+BIFU)lvq>S99!;JQqIJha
zg~_xKwU3Mn{n6T#(b(+nP-K6Pe`$k5wwjx+kh~-oO{wZ$Z+W(UHc2XzQJWwdyKNvC
z+0)~{+a+RBDG-GV*i%n{*~>jWuZ}GpxIPrg5BQhP)TSqjDybSN99G1#MpdlN-bM0S
zs*sx|sw&B4dX-(MkSS-sp_LjqJJg-X)XmvjXTT*#cMH*)a8_XQqp_tMW1)yhbuX>0
zd!i_jGBd(M^})+f-7(MlH0MKXinsQMB8REsgY^_op07xXs8QN3%)8gr)f!q?JzJO9
zQg~M=GEQ|Fsi#XqF00iNDP*OR+vx*qYGWT<S06{G*y44eNP@1Zom?S3Sk>GpDN1LF
zvJfv66dH-Cf>D3{3LWb8H{=_wEWTDu7>ym?8I1IG`w164P8QVMj7r#dY=t1+YD~;Z
zY+Bkq8e7;wH>Ez?rZh^<N_moy3q;LX{B5=UE2g(K+J+dyY;8=YH6vXXzCJ_t0Jp-{
znNs9>SXb&UQ}#?cb!^7IE!z6nMtZ7Xb&bX<(NJU;wZ2c+fC5p{Vu_^K{v1~;X`-<z
zb*HCPM{h%tZ45IuEh{ClC@qo#?;DNXxjhuwP9?VL5|brSD!Rq(a00gatRY127>(U6
zP^xsD)NV7DRvEcSy~=*33a;8dr%-yQadj|<xpmN|WX2k^Qm^{Ag(C4m|I&8dLdQfC
z@|;xG<CNYItoe=V=qegG2D()+hZ_-1CuTZaTUUofQItw6bug;8ucCuvpj!u{(Ogx!
z4#i$0w6^LP7#&w=>Er}cpfjKyz3rm(G0xCpvoedX@wAu?FcoK)oVr!Lt&YW34-dy%
zjdsu9v^5wR-|6@12CHX^l16f3Rg?9y^RP2)KdM~2Jhmki*}2nyX;Kqsi^Se$zwR|v
z&BhN+Bv+hvI@$#KG0s3V2I!F~n>?J%2<geJke->C*ll*O4n_64Bqr0-*-V^HK&Kmb
zC>|B2GO45S%t>K9d6EX4t{#=fZuQ1Fj)k8o%0ADSa~@+-)%arCj!kBgsl#d4v@s!*
z97|@B=|pncG)>>RnGkm38%<6m>FF>LpH9R_lj{&`DydqhO}A*984lrmBy+g8_>Q*N
z@>EYK($nL=^hV2(s?JEg#>08c7Sk(?f!kw(9UylE9b<Pvd?q`YO4GTICevB&V*SqP
zH6!mZP50!L@@lR8OkB5%T`}%iHD}(=Yto%Q<<(A~8e<q#tNn5uTRWN8E|}d;$+jc9
z!=+~ZDiK9pdhqICWO}gPqPF(%tbCf#t$o;Cvz0!^?P8B|JTK7o<40b6?CGHo;C+FH
zd%%T3AOHd&00JNY0w4eaAOHd&00JQ3MWCNm^1ML)#Kzxv@S$(shrECnD%61h2!H?x
zfB*=900@8p2!H?xfI!0$h%t+JUf>@-`_#3w4}akq<OLee&oBrCKmY_l00ck)1V8`;
zKmY_l00g`UT+b?bUf{;DuV47tSK1y&Ucd_#>OcSlKmY_l00ck)1V8`;KmY_lpy3D%
zFpGFz;DO<veg5trp8N~s1scxJFbD)d00ck)1V8`;KmY_l00ck)1iT3BW|cfI@RdVv
zyZ(Kj5&g&uc%eca2!H?xfB*=900@8p2!H?xfB*<I9DzY*5zh-eH~EX7O+NC6`;ixD
zI6uQ65C8!X009sH0T2KI5C8!X009v2A~3`%d0yc7r8Ai~=lmt)1-ww94g^2|1V8`;
zKmY_l00ck)1V8`;8jipoW)aT|eE;YZ@4n$JU6aTQG@PGd5D0((2!H?xfB*=900@8p
z2!H?xcoEpkDtTUD$Jzd01s4}zLSDcN73x3$1V8`;KmY_l00ck)1V8`;K%n6W3{#7S
zd0ybyjwe4eG4iF2$O|-_pJ5OPfB*=900@8p2!H?xfB*=900?*yXl9i>FYuSI`_~7)
z{odc4>7aE@;qUpvKc_$N0Ra#I0T2KI5C8!X009sH0T2KI5O~EBXm4un^=IWuMJms!
zo7?@gG+iNiNi3=@)Tl5sjOPXJKXS6=w`cG9GRq6Jbd31IzaO6H{6VMExwYfjj^Cvf
z_<#TifB*=900@8p2!H?xfB*>ie0Q`2eckfG?FWVq9LOqSLDD3-EEa{7CKe^JEL5b$
zMNv2>Y4d_6mqbk_svwpN!mOxDMX5BmNAIBSDT&J5JW(V~9J;GAceGX-57GI@M`FXn
zLnA3|mnsyc(?n3kqFC51%vLo)E(@X|#WtJX&L%oe=H?_KjFO@>H?Q3k4EiE__V*6&
z9ojc?>pUq7QdyXg%LTbSG&E!zKT8#1!?W{5I7F{!Hc%~Yef0p<VsA<l=0#N~Rn>V#
zmP_i8kW$OLG(npesW!7`CAq2|w9Umk>UNofsL-=SQI$Z*7g_2W85rI-bkoRmManM-
z`FSaSnv{17^Rh<mtmcWqt4OM}jS!XW7Urs=B9=8m3KXhvPE<<5f?O4<6}wm>Y70!}
zq3WqqVo~N37n+&FUb}}fFo0^*M#D>NjyZ*#qZ8>KGXNhdii`9qn(4FMHh+awDnyaX
z5|fcAimEE*g<9q7n<(k{$Q}ypzyXt3@^~_HQaCM9@5`rX0OaXlD**IzjX7(i!J<fu
zvU18#H9mLKFbgp~1au4wI+g-;Y@QJx5^kMe5YEZfVu3k>nR1RIqTxa8&M*k-SZDy|
zg@jI2m|{^%m-8n2ul9EYAKi8IJHvnf#1zX5Z0`8AFZ|Q+*TSC;KNNmjxDviCJQ2P*
z+#l}he5vzmolkZ?*!h;uO6P3nSm*VfSJKY-fB*=900@8p2!H?xfB*=900_Lo2wb^2
z;Opx;RIC#7@q6FU$mZ^VZ=lQdU_COlcgs})-+tP+_P}gD5UV!~?c37D+NL!ko)-E`
zq##vGgNmq-*sF#{+OG`wB3*}AN`$64x~~ZMVqIejQLUT_t&VI8_y)V;iYDdfWtsz-
zC!(UM`-g7m2~%x)rnRavM`$)AFP@b|Wq9u}O(|^dq*HZI$g`?O6qYK{<jRdV42|sQ
z2>9YX(?mH-QwVwng^H#b387LHHQIIG$X@!eeRX@lx2NkkDN8EtQ=$olS+Q7DDS)nx
z0pHH9(Q5uQOHrue9N9m#Z&O>qx2<c6=LKl0WK%1vIm$C7w5Fpa;Ops{EYl>BN{d|~
zHqRkaEOJt`vL_hu4IB0k&Wfk0hAPbl5DIZ5vVk$k5>bEn&nwkZg=i`zzd67RO^9Wh
wfudO_J(;kNn$X=G@a^hmDIAH?tW|GrV%_5<nsCb7yLb7SKFRZ%B3j=5Utx(JdjJ3c

literal 0
HcmV?d00001

diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/Address.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/Address.cs
index e5c0ef0d..63f1e167 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/Address.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/Address.cs
@@ -1,21 +1,26 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Address
 {
-    public class Address
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	[Required, MaxLength(100)]
+	public string Name { get; set; }
 
-        public string Line1 { get; set; }
+	[Required, MaxLength(100)]
+	public string Line1 { get; set; }
 
-        public string Line2 { get; set; }
+	[MaxLength(100)]
+	public string Line2 { get; set; }
 
-        public string City { get; set; }
+	[Required, MaxLength(50)]
+	public string City { get; set; }
 
-        public string Region { get; set; }
+	[Required, MaxLength(20)]
+	public string Region { get; set; }
 
-        public string PostalCode { get; set; }
-    }
+	[Required, MaxLength(20)]
+	public string PostalCode { get; set; }
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/04-refactor-state-management/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index f7b7dd02..075ddd60 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/LatLong.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/LatLong.cs
index 9b8c3811..14a94c26 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/LatLong.cs
@@ -1,27 +1,26 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class LatLong
 {
-    public class LatLong
-    {
-        public LatLong()
-        {
-        }
+	public LatLong()
+	{
+	}
 
-        public LatLong(double latitude, double longitude) : this()
-        {
-            Latitude = latitude;
-            Longitude = longitude;
-        }
+	public LatLong(double latitude, double longitude) : this()
+	{
+		Latitude = latitude;
+		Longitude = longitude;
+	}
 
-        public double Latitude { get; set; }
+	public double Latitude { get; set; }
 
-        public double Longitude { get; set; }
+	public double Longitude { get; set; }
 
-        public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-        {
-            // The Earth is flat, right? So no need for spherical interpolation.
-            return new LatLong(
-                start.Latitude + (end.Latitude - start.Latitude) * proportion,
-                start.Longitude + (end.Longitude - start.Longitude) * proportion);
-        }
-    }
-}
+	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+	{
+		// The Earth is flat, right? So no need for spherical interpolation.
+		return new LatLong(
+				start.Latitude + (end.Latitude - start.Latitude) * proportion,
+				start.Longitude + (end.Longitude - start.Longitude) * proportion);
+	}
+}
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/NotificationSubscription.cs
index 04259c2f..9109ff57 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/NotificationSubscription.cs
@@ -1,17 +1,14 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class NotificationSubscription
 {
-    public class NotificationSubscription
-    {
-        public int NotificationSubscriptionId { get; set; }
+	public int NotificationSubscriptionId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public string Url { get; set; }
+	public string Url { get; set; }
 
-        public string P256dh { get; set; }
+	public string P256dh { get; set; }
 
-        public string Auth { get; set; }
-    }
+	public string Auth { get; set; }
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/Order.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/Order.cs
index fb003bd6..aca04ca1 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/Order.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/Order.cs
@@ -1,25 +1,32 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Order
 {
-    public class Order
-    {
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public DateTime CreatedTime { get; set; }
+	public DateTime CreatedTime { get; set; }
 
-        public Address DeliveryAddress { get; set; } = new Address();
+	public Address DeliveryAddress { get; set; } = new Address();
 
-        public LatLong DeliveryLocation { get; set; }
+	public LatLong DeliveryLocation { get; set; }
 
-        public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-        public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-        public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
-    }
+	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(Order))]
+[JsonSerializable(typeof(OrderWithStatus))]
+[JsonSerializable(typeof(List<OrderWithStatus>))]
+[JsonSerializable(typeof(Pizza))]
+[JsonSerializable(typeof(List<PizzaSpecial>))]
+[JsonSerializable(typeof(List<Topping>))]
+[JsonSerializable(typeof(Topping))]
+public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/OrderWithStatus.cs
index 021de78c..f5f153b6 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/OrderWithStatus.cs
@@ -1,79 +1,78 @@
-using BlazingPizza.ComponentsLibrary.Map;
-using System;
-using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using BlazingPizza.ComponentsLibrary.Map;
 
-namespace BlazingPizza
+
+namespace BlazingPizza;
+
+public class OrderWithStatus
 {
-    public class OrderWithStatus
-    {
-        public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-        public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-        public Order Order { get; set; }
+	public Order Order { get; set; }
 
-        public string StatusText { get; set; }
+	public string StatusText { get; set; }
 
-        public bool IsDelivered => StatusText == "Delivered";
+	public bool IsDelivered => StatusText == "Delivered";
 
-        public List<Marker> MapMarkers { get; set; }
+	public List<Marker> MapMarkers { get; set; }
 
-        public static OrderWithStatus FromOrder(Order order)
-        {
-            // To simulate a real backend process, we fake status updates based on the amount
-            // of time since the order was placed
-            string statusText;
-            List<Marker> mapMarkers;
-            var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+	public static OrderWithStatus FromOrder(Order order)
+	{
+		// To simulate a real backend process, we fake status updates based on the amount
+		// of time since the order was placed
+		string statusText;
+		List<Marker> mapMarkers;
+		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-            if (DateTime.Now < dispatchTime)
-            {
-                statusText = "Preparing";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-                };
-            }
-            else if (DateTime.Now < dispatchTime + DeliveryDuration)
-            {
-                statusText = "Out for delivery";
+		if (DateTime.Now < dispatchTime)
+		{
+			statusText = "Preparing";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+								};
+		}
+		else if (DateTime.Now < dispatchTime + DeliveryDuration)
+		{
+			statusText = "Out for delivery";
 
-                var startPosition = ComputeStartPosition(order);
-                var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-                var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation),
-                    ToMapMarker("Driver", driverPosition, showPopup: true),
-                };
-            }
-            else
-            {
-                statusText = "Delivered";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-                };
-            }
+			var startPosition = ComputeStartPosition(order);
+			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation),
+										ToMapMarker("Driver", driverPosition, showPopup: true),
+								};
+		}
+		else
+		{
+			statusText = "Delivered";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+								};
+		}
 
-            return new OrderWithStatus
-            {
-                Order = order,
-                StatusText = statusText,
-                MapMarkers = mapMarkers,
-            };
-        }
+		return new OrderWithStatus
+		{
+			Order = order,
+			StatusText = statusText,
+			MapMarkers = mapMarkers,
+		};
+	}
 
-        private static LatLong ComputeStartPosition(Order order)
-        {
-            // Random but deterministic based on order ID
-            var rng = new Random(order.OrderId);
-            var distance = 0.01 + rng.NextDouble() * 0.02;
-            var angle = rng.NextDouble() * Math.PI * 2;
-            var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-            return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-        }
+	private static LatLong ComputeStartPosition(Order order)
+	{
+		// Random but deterministic based on order ID
+		var rng = new Random(order.OrderId);
+		var distance = 0.01 + rng.NextDouble() * 0.02;
+		var angle = rng.NextDouble() * Math.PI * 2;
+		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+	}
 
-        static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
-    }
-}
+	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+}
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/Pizza.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/Pizza.cs
index ec1108a9..459298f4 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/Pizza.cs
@@ -1,42 +1,44 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+///    /// Represents a customized pizza as part of an order
+/// </summary>
+public class Pizza
 {
-    /// <summary>
-    /// Represents a customized pizza as part of an order
-    /// </summary>
-    public class Pizza
-    {
-        public const int DefaultSize = 12;
-        public const int MinimumSize = 9;
-        public const int MaximumSize = 17;
+	public const int DefaultSize = 12;
+	public const int MinimumSize = 9;
+	public const int MaximumSize = 17;
 
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public PizzaSpecial Special { get; set; }
+	public PizzaSpecial Special { get; set; }
 
-        public int SpecialId { get; set; }
+	public int SpecialId { get; set; }
 
-        public int Size { get; set; }
+	public int Size { get; set; }
 
-        public List<PizzaTopping> Toppings { get; set; }
+	public List<PizzaTopping> Toppings { get; set; }
 
-        public decimal GetBasePrice()
-        {
-            return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-        }
+	public decimal GetBasePrice()
+	{
+		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+	}
 
-        public decimal GetTotalPrice()
-        {
-            return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-        }
+	public decimal GetTotalPrice()
+	{
+		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+	}
 
-        public string GetFormattedTotalPrice()
-        {
-            return GetTotalPrice().ToString("0.00");
-        }
-    }
+	public string GetFormattedTotalPrice()
+	{
+		return GetTotalPrice().ToString("0.00");
+	}
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
+[JsonSerializable(typeof(Pizza))]
+public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaSpecial.cs
index 2f2b3383..9653300c 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaSpecial.cs
@@ -1,20 +1,19 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+/// Represents a pre-configured template for a pizza a user can order
+/// </summary>
+public class PizzaSpecial
 {
-    /// <summary>
-    /// Represents a pre-configured template for a pizza a user can order
-    /// </summary>
-    public class PizzaSpecial
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal BasePrice { get; set; }
+	public decimal BasePrice { get; set; }
 
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public string ImageUrl { get; set; }
+	public string ImageUrl { get; set; }
 
-        public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
-    }
-}
+	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+}
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaTopping.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaTopping.cs
index f5a6c1ac..0a711647 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaTopping.cs
@@ -1,11 +1,11 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class PizzaTopping
 {
-    public class PizzaTopping
-    {
-        public Topping Topping { get; set; }
+	public Topping Topping { get; set; }
+
+	public int ToppingId { get; set; }
 
-        public int ToppingId { get; set; }
-        
-        public int PizzaId { get; set; }
-    }
-}
+	public int PizzaId { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/Topping.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/Topping.cs
index 61bdeb92..376c311a 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/Topping.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/Topping.cs
@@ -1,13 +1,13 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Topping
 {
-    public class Topping
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal Price { get; set; }
+	public decimal Price { get; set; }
 
-        public string GetFormattedPrice() => Price.ToString("0.00");
-    }
-}
+	public string GetFormattedPrice() => Price.ToString("0.00");
+	
+}
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/UserInfo.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/UserInfo.cs
index 4996ef80..362f8f8e 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/UserInfo.cs
@@ -1,9 +1,9 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class UserInfo
 {
-    public class UserInfo
-    {
-        public bool IsAuthenticated { get; set; }
+	public bool IsAuthenticated { get; set; }
 
-        public string Name { get; set; }
-    }
-}
+	public string Name { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj
index 663677a1..44802d79 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -2,16 +2,19 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer"  Version="$(BlazorVersion)" PrivateAssets="all"  />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="$(SystemNetHttpJsonVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\BlazingComponents\BlazingComponents.csproj" />
     <ProjectReference Include="..\BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj" />
     <ProjectReference Include="..\BlazingPizza.Shared\BlazingPizza.Shared.csproj" />
   </ItemGroup>
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/OrderState.cs b/save-points/05-checkout-with-validation/BlazingPizza.Client/OrderState.cs
index f44ac786..4f47979d 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/OrderState.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/OrderState.cs
@@ -1,50 +1,52 @@
-using System.Collections.Generic;
+namespace BlazingPizza.Client;
 
-namespace BlazingPizza.Client
+public class OrderState
 {
-    public class OrderState
-    {
-        public bool ShowingConfigureDialog { get; private set; }
-
-        public Pizza ConfiguringPizza { get; private set; }
-
-        public Order Order { get; private set; } = new Order();
-
-        public void ShowConfigurePizzaDialog(PizzaSpecial special)
-        {
-            ConfiguringPizza = new Pizza()
-            {
-                Special = special,
-                SpecialId = special.Id,
-                Size = Pizza.DefaultSize,
-                Toppings = new List<PizzaTopping>(),
-            };
-
-            ShowingConfigureDialog = true;
-        }
-
-        public void CancelConfigurePizzaDialog()
-        {
-            ConfiguringPizza = null;
-            ShowingConfigureDialog = false;
-        }
-
-        public void ConfirmConfigurePizzaDialog()
-        {
-            Order.Pizzas.Add(ConfiguringPizza);
-            ConfiguringPizza = null;
-
-            ShowingConfigureDialog = false;
-        }
-
-        public void RemoveConfiguredPizza(Pizza pizza)
-        {
-            Order.Pizzas.Remove(pizza);
-        }
-
-        public void ResetOrder()
-        {
-            Order = new Order();
-        }
-    }
+	public bool ShowingConfigureDialog { get; private set; }
+
+	public Pizza ConfiguringPizza { get; private set; }
+
+	public Order Order { get; private set; } = new Order();
+
+	public void ShowConfigurePizzaDialog(PizzaSpecial special)
+	{
+		ConfiguringPizza = new Pizza()
+		{
+			Special = special,
+			SpecialId = special.Id,
+			Size = Pizza.DefaultSize,
+			Toppings = new List<PizzaTopping>(),
+		};
+
+		ShowingConfigureDialog = true;
+	}
+
+	public void CancelConfigurePizzaDialog()
+	{
+		ConfiguringPizza = null;
+		ShowingConfigureDialog = false;
+	}
+
+	public void ConfirmConfigurePizzaDialog()
+	{
+		Order.Pizzas.Add(ConfiguringPizza);
+		ConfiguringPizza = null;
+
+		ShowingConfigureDialog = false;
+	}
+
+	public void RemoveConfiguredPizza(Pizza pizza)
+	{
+		Order.Pizzas.Remove(pizza);
+	}
+
+	public void ResetOrder()
+	{
+		Order = new Order();
+	}
+
+	public void ReplaceOrder(Order order)
+	{
+		Order = order;
+	}
 }
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs b/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs
index e0c88943..8c6740d5 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs
@@ -1,22 +1,10 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
+using BlazingPizza.Client;
 
-namespace BlazingPizza.Client
-{
-    public class Program
-    {
-        public static async Task Main(string[] args)
-        {
-            var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("#app");
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<App>("#app");
 
-            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
-            builder.Services.AddScoped<OrderState>();
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddScoped<OrderState>();
 
-            await builder.Build().RunAsync();
-        }
-    }
-}
+await builder.Build().RunAsync();
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 61ebf623..cb996b1b 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index f36b098e..bb84f13c 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -1,17 +1,15 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.ComponentsLibrary
+namespace BlazingPizza.ComponentsLibrary;
+
+public static class LocalStorage
 {
-    public static class LocalStorage
-    {
-        public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-        public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-        public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
-    }
-}
+	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+}
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index 63006067..a8e78f2a 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -1,13 +1,12 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Marker
 {
-    public class Marker
-    {
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public double X { get; set; }
+	public double X { get; set; }
 
-        public double Y { get; set; }
+	public double Y { get; set; }
 
-        public bool ShowPopup { get; set; }
-    }
+	public bool ShowPopup { get; set; }
 }
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 03841826..349046d4 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -1,9 +1,8 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Point
 {
-    public class Point
-    {
-        public double X { get; set; }
+	public double X { get; set; }
 
-        public double Y { get; set; }
-    }
-}
+	public double Y { get; set; }
+}
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/05-checkout-with-validation/BlazingPizza.Server/BlazingPizza.Server.csproj
index b9c74fc4..abd2317b 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,6 +14,7 @@
     <PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EntityFrameworkVersion)" />
+    <PackageReference Include="WebPush" Version="1.0.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/NotificationsController.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/NotificationsController.cs
deleted file mode 100644
index bb3b96ff..00000000
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/NotificationsController.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("notifications")]
-    [ApiController]
-    [Authorize]
-    public class NotificationsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public NotificationsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpPut("subscribe")]
-        public async Task<NotificationSubscription> Subscribe(NotificationSubscription subscription)
-        {
-            // We're storing at most one subscription per user, so delete old ones.
-            // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-            var userId = GetUserId();
-            var oldSubscriptions = _db.NotificationSubscriptions.Where(e => e.UserId == userId);
-            _db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
-
-            // Store new subscription
-            subscription.UserId = userId;
-            _db.NotificationSubscriptions.Attach(subscription);
-
-            await _db.SaveChangesAsync();
-            return subscription;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-    }
-}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/OidcConfigurationController.cs
index c074debf..dc75ecb3 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/OidcConfigurationController.cs
@@ -1,26 +1,21 @@
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class OidcConfigurationController : Controller
 {
-    public class OidcConfigurationController : Controller
-    {
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-        {
-            ClientRequestParametersProvider = clientRequestParametersProvider;
-        }
+	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+	{
+		ClientRequestParametersProvider = clientRequestParametersProvider;
+	}
 
-        public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-        [HttpGet("_configuration/{clientId}")]
-        public IActionResult GetClientRequestParameters([FromRoute]string clientId)
-        {
-            var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-            return Ok(parameters);
-        }
-    }
+	[HttpGet("_configuration/{clientId}")]
+	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+	{
+		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+		return Ok(parameters);
+	}
 }
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/OrdersController.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/OrdersController.cs
index 2b8bc99b..4cc7115e 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/OrdersController.cs
@@ -1,114 +1,130 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
+using System.Text.Json;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using WebPush;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+[Route("orders")]
+[ApiController]
+// [Authorize]
+public class OrdersController : Controller
 {
-    [Route("orders")]
-    [ApiController]
-    // [Authorize]
-    public class OrdersController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public OrdersController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-        {
-            var orders = await _db.Orders
-                // .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .OrderByDescending(o => o.CreatedTime)
-                .ToListAsync();
-
-            return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-        }
-
-        [HttpGet("{orderId}")]
-        public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-        {
-            var order = await _db.Orders
-                .Where(o => o.OrderId == orderId)
-                // .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .SingleOrDefaultAsync();
-
-            if (order == null)
-            {
-                return NotFound();
-            }
-
-            return OrderWithStatus.FromOrder(order);
-        }
-
-        [HttpPost]
-        public async Task<ActionResult<int>> PlaceOrder(Order order)
-        {
-            order.CreatedTime = DateTime.Now;
-            order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-            // order.UserId = GetUserId();
-
-            // Enforce existence of Pizza.SpecialId and Topping.ToppingId
-            // in the database - prevent the submitter from making up
-            // new specials and toppings
-            foreach (var pizza in order.Pizzas)
-            {
-                pizza.SpecialId = pizza.Special.Id;
-                pizza.Special = null;
-
-                foreach (var topping in pizza.Toppings)
-                {
-                    topping.ToppingId = topping.Topping.Id;
-                    topping.Topping = null;
-                }
-            }
-
-            _db.Orders.Attach(order);
-            await _db.SaveChangesAsync();
-
-            // In the background, send push notifications if possible
-            var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-            if (subscription != null)
-            {
-                _ = TrackAndSendNotificationsAsync(order, subscription);
-            }
-
-            return order.OrderId;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-
-        private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-        {
-            // In a realistic case, some other backend process would track
-            // order delivery progress and send us notifications when it
-            // changes. Since we don't have any such process here, fake it.
-            await Task.Delay(OrderWithStatus.PreparationDuration);
-            await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-            await Task.Delay(OrderWithStatus.DeliveryDuration);
-            await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-        }
-
-        private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-        {
-            // This will be implemented later
-            return Task.CompletedTask;
-        }
-    }
+	private readonly PizzaStoreContext _db;
+
+	public OrdersController(PizzaStoreContext db)
+	{
+		_db = db;
+	}
+
+	[HttpGet]
+	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+	{
+		var orders = await _db.Orders
+				.Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.OrderByDescending(o => o.CreatedTime)
+				.ToListAsync();
+
+		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+	}
+
+	[HttpGet("{orderId}")]
+	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+	{
+		var order = await _db.Orders
+				.Where(o => o.OrderId == orderId)
+				.Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.SingleOrDefaultAsync();
+
+		if (order == null)
+		{
+			return NotFound();
+		}
+
+		return OrderWithStatus.FromOrder(order);
+	}
+
+	[HttpPost]
+	public async Task<ActionResult<int>> PlaceOrder(Order order)
+	{
+		order.CreatedTime = DateTime.Now;
+		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+		order.UserId = GetUserId();
+
+		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
+		// in the database - prevent the submitter from making up
+		// new specials and toppings
+		foreach (var pizza in order.Pizzas)
+		{
+			pizza.SpecialId = pizza.Special.Id;
+			pizza.Special = null;
+
+			foreach (var topping in pizza.Toppings)
+			{
+				topping.ToppingId = topping.Topping.Id;
+				topping.Topping = null;
+			}
+		}
+
+		_db.Orders.Attach(order);
+		await _db.SaveChangesAsync();
+
+		// In the background, send push notifications if possible
+		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+		if (subscription != null)
+		{
+			_ = TrackAndSendNotificationsAsync(order, subscription);
+		}
+
+		return order.OrderId;
+	}
+
+	private string GetUserId()
+	{
+		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+	{
+		// In a realistic case, some other backend process would track
+		// order delivery progress and send us notifications when it
+		// changes. Since we don't have any such process here, fake it.
+		await Task.Delay(OrderWithStatus.PreparationDuration);
+		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+		await Task.Delay(OrderWithStatus.DeliveryDuration);
+		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+	}
+
+	private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+	{
+		// For a real application, generate your own
+		var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
+		var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
+
+		var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
+		var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
+		var webPushClient = new WebPushClient();
+		try
+		{
+			var payload = JsonSerializer.Serialize(new
+			{
+				message,
+				url = $"myorders/{order.OrderId}",
+			});
+			await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
+		}
+		catch (Exception ex)
+		{
+			Console.Error.WriteLine("Error sending push notification: " + ex.Message);
+		}
+	}
 }
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaApiExtensions.cs
new file mode 100644
index 00000000..bf6b7bde
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -0,0 +1,60 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
+
+namespace BlazingPizza.Server;
+
+public static class PizzaApiExtensions
+{
+
+	public static WebApplication MapPizzaApi(this WebApplication app)
+	{
+
+		// Subscribe to notifications
+		app.MapPut("/notifications/subscribe", [Authorize] async (
+			HttpContext context,
+			PizzaStoreContext db,
+			NotificationSubscription subscription) =>
+		{
+
+			// We're storing at most one subscription per user, so delete old ones.
+			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+			var userId = GetUserId(context);
+			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+
+			// Store new subscription
+			subscription.UserId = userId;
+			db.NotificationSubscriptions.Attach(subscription);
+
+			await db.SaveChangesAsync();
+			return Results.Ok(subscription);
+
+		});
+
+		// Specials
+		app.MapGet("/specials", async (PizzaStoreContext db) =>
+		{
+
+			var specials = await db.Specials.ToListAsync();
+			return Results.Ok(specials);
+
+		});
+
+		// Toppings
+		app.MapGet("/toppings", async (PizzaStoreContext db) =>
+		{
+			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+			return Results.Ok(toppings);
+		});
+
+		return app;
+
+	}
+
+	private static string GetUserId(HttpContext context)
+	{
+		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+}
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreContext.cs
index 9485bd12..9a2e17ee 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreContext.cs
@@ -3,37 +3,36 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-    public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
-    {
-        public PizzaStoreContext(
-            DbContextOptions options,
-            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-        {
-        }
+	public PizzaStoreContext(
+			DbContextOptions options,
+			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+	{
+	}
 
-        public DbSet<Order> Orders { get; set; }
+	public DbSet<Order> Orders { get; set; }
 
-        public DbSet<Pizza> Pizzas { get; set; }
+	public DbSet<Pizza> Pizzas { get; set; }
 
-        public DbSet<PizzaSpecial> Specials { get; set; }
+	public DbSet<PizzaSpecial> Specials { get; set; }
 
-        public DbSet<Topping> Toppings { get; set; }
+	public DbSet<Topping> Toppings { get; set; }
 
-        public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
+	protected override void OnModelCreating(ModelBuilder modelBuilder)
+	{
+		base.OnModelCreating(modelBuilder);
 
-            // Configuring a many-to-many special -> topping relationship that is friendly for serialization
-            modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-            modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-            modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
+		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-            // Inline the Lat-Long pairs in Order rather than having a FK to another table
-            modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-        }
-    }
-}
\ No newline at end of file
+		// Inline the Lat-Long pairs in Order rather than having a FK to another table
+		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+	}
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreUser.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreUser.cs
index 171ce83d..7ab40235 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreUser.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreUser.cs
@@ -1,8 +1,5 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace BlazingPizza.Server
-{
-    public class PizzaStoreUser : IdentityUser
-    {
-    }
-}
\ No newline at end of file
+namespace BlazingPizza.Server;
+
+public class PizzaStoreUser : IdentityUser { }
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzasController.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzasController.cs
deleted file mode 100644
index c082552c..00000000
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzasController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("pizzas")]
-    [ApiController]
-    public class PizzasController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public PizzasController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-    }
-}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Program.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Program.cs
index 40a47641..4484d8f7 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/Program.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Program.cs
@@ -1,33 +1,67 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.EntityFrameworkCore;
+using BlazingPizza.Server;
 
-namespace BlazingPizza.Server
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddControllersWithViews()
+	.AddJsonOptions(options =>  {
+		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+	});
+builder.Services.AddRazorPages();
+
+builder.Services.AddDbContext<PizzaStoreContext>(options =>
+		options.UseSqlite("Data Source=pizza.db")
+			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+
+builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
+		.AddEntityFrameworkStores<PizzaStoreContext>();
+
+builder.Services.AddIdentityServer()
+		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+
+builder.Services.AddAuthentication()
+		.AddIdentityServerJwt();
+
+var app = builder.Build();
+
+// Initialize the database
+var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
+using (var scope = scopeFactory.CreateScope())
+{
+	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+	if (db.Database.EnsureCreated())
+	{
+		SeedData.Initialize(db);
+	}
+}
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseWebAssemblyDebugging();
+}
+else
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var host = CreateHostBuilder(args).Build();
-
-            // Initialize the database
-            var scopeFactory = host.Services.GetRequiredService<IServiceScopeFactory>();
-            using (var scope = scopeFactory.CreateScope())
-            {
-                var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-                if (db.Database.EnsureCreated())
-                {
-                    SeedData.Initialize(db);
-                }
-            }
-
-            host.Run();
-        }
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+    app.UseExceptionHandler("/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
 }
+
+app.UseHttpsRedirection();
+app.UseBlazorFrameworkFiles();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseIdentityServer();
+app.UseAuthorization();
+
+app.MapPizzaApi();
+
+app.MapRazorPages();
+app.MapControllers();
+app.MapFallbackToFile("index.html");
+
+app.Run();
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/SeedData.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/SeedData.cs
index 7c86a5b2..a1e47973 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/SeedData.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/SeedData.cs
@@ -1,193 +1,192 @@
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public static class SeedData
 {
-    public static class SeedData
-    {
-        public static void Initialize(PizzaStoreContext db)
-        {
-            var toppings = new Topping[]
-            {
-                new Topping()
-                {
-                    Name = "Extra cheese",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "American bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "British bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Canadian bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Tea and crumpets",
-                    Price = 5.00m
-                },
-                new Topping()
-                {
-                    Name = "Fresh-baked scones",
-                    Price = 4.50m,
-                },
-                new Topping()
-                {
-                    Name = "Bell peppers",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Onions",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Mushrooms",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Pepperoni",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Duck sausage",
-                    Price = 3.20m,
-                },
-                new Topping()
-                {
-                    Name = "Venison meatballs",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "Served on a silver platter",
-                    Price = 250.99m,
-                },
-                new Topping()
-                {
-                    Name = "Lobster on top",
-                    Price = 64.50m,
-                },
-                new Topping()
-                {
-                    Name = "Sturgeon caviar",
-                    Price = 101.75m,
-                },
-                new Topping()
-                {
-                    Name = "Artichoke hearts",
-                    Price = 3.40m,
-                },
-                new Topping()
-                {
-                    Name = "Fresh tomatoes",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Basil",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Steak (medium-rare)",
-                    Price = 8.50m,
-                },
-                new Topping()
-                {
-                    Name = "Blazing hot peppers",
-                    Price = 4.20m,
-                },
-                new Topping()
-                {
-                    Name = "Buffalo chicken",
-                    Price = 5.00m,
-                },
-                new Topping()
-                {
-                    Name = "Blue cheese",
-                    Price = 2.50m,
-                },
-            };
+	public static void Initialize(PizzaStoreContext db)
+	{
+		var toppings = new Topping[]
+		{
+			new Topping()
+			{
+					Name = "Extra cheese",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "American bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "British bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Canadian bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Tea and crumpets",
+					Price = 5.00m
+			},
+			new Topping()
+			{
+					Name = "Fresh-baked scones",
+					Price = 4.50m,
+			},
+			new Topping()
+			{
+					Name = "Bell peppers",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Onions",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Mushrooms",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Pepperoni",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Duck sausage",
+					Price = 3.20m,
+			},
+			new Topping()
+			{
+					Name = "Venison meatballs",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "Served on a silver platter",
+					Price = 250.99m,
+			},
+			new Topping()
+			{
+					Name = "Lobster on top",
+					Price = 64.50m,
+			},
+			new Topping()
+			{
+					Name = "Sturgeon caviar",
+					Price = 101.75m,
+			},
+			new Topping()
+			{
+					Name = "Artichoke hearts",
+					Price = 3.40m,
+			},
+			new Topping()
+			{
+					Name = "Fresh tomatoes",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Basil",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Steak (medium-rare)",
+					Price = 8.50m,
+			},
+			new Topping()
+			{
+					Name = "Blazing hot peppers",
+					Price = 4.20m,
+			},
+			new Topping()
+			{
+					Name = "Buffalo chicken",
+					Price = 5.00m,
+			},
+			new Topping()
+			{
+					Name = "Blue cheese",
+					Price = 2.50m,
+			},
+		};
 
-            var specials = new PizzaSpecial[]
-            {
-                new PizzaSpecial()
-                {
-                    Name = "Basic Cheese Pizza",
-                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/cheese.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 2,
-                    Name = "The Baconatorizor",
-                    Description = "It has EVERY kind of bacon",
-                    BasePrice = 11.99m,
-                    ImageUrl = "img/pizzas/bacon.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 3,
-                    Name = "Classic pepperoni",
-                    Description = "It's the pizza you grew up with, but Blazing hot!",
-                    BasePrice = 10.50m,
-                    ImageUrl = "img/pizzas/pepperoni.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 4,
-                    Name = "Buffalo chicken",
-                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-                    BasePrice = 12.75m,
-                    ImageUrl = "img/pizzas/meaty.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 5,
-                    Name = "Mushroom Lovers",
-                    Description = "It has mushrooms. Isn't that obvious?",
-                    BasePrice = 11.00m,
-                    ImageUrl = "img/pizzas/mushroom.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 6,
-                    Name = "The Brit",
-                    Description = "When in London...",
-                    BasePrice = 10.25m,
-                    ImageUrl = "img/pizzas/brit.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 7,
-                    Name = "Veggie Delight",
-                    Description = "It's like salad, but on a pizza",
-                    BasePrice = 11.50m,
-                    ImageUrl = "img/pizzas/salad.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 8,
-                    Name = "Margherita",
-                    Description = "Traditional Italian pizza with tomatoes and basil",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/margherita.jpg",
-                },
-            };
+		var specials = new PizzaSpecial[]
+		{
+			new PizzaSpecial()
+			{
+					Name = "Basic Cheese Pizza",
+					Description = "It's cheesy and delicious. Why wouldn't you want one?",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/cheese.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 2,
+					Name = "The Baconatorizor",
+					Description = "It has EVERY kind of bacon",
+					BasePrice = 11.99m,
+					ImageUrl = "img/pizzas/bacon.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 3,
+					Name = "Classic pepperoni",
+					Description = "It's the pizza you grew up with, but Blazing hot!",
+					BasePrice = 10.50m,
+					ImageUrl = "img/pizzas/pepperoni.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 4,
+					Name = "Buffalo chicken",
+					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+					BasePrice = 12.75m,
+					ImageUrl = "img/pizzas/meaty.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 5,
+					Name = "Mushroom Lovers",
+					Description = "It has mushrooms. Isn't that obvious?",
+					BasePrice = 11.00m,
+					ImageUrl = "img/pizzas/mushroom.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 6,
+					Name = "The Brit",
+					Description = "When in London...",
+					BasePrice = 10.25m,
+					ImageUrl = "img/pizzas/brit.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 7,
+					Name = "Veggie Delight",
+					Description = "It's like salad, but on a pizza",
+					BasePrice = 11.50m,
+					ImageUrl = "img/pizzas/salad.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 8,
+					Name = "Margherita",
+					Description = "Traditional Italian pizza with tomatoes and basil",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/margherita.jpg",
+			},
+		};
 
-            db.Toppings.AddRange(toppings);
-            db.Specials.AddRange(specials);
-            db.SaveChanges();
-        }
-    }
-}
+		db.Toppings.AddRange(toppings);
+		db.Specials.AddRange(specials);
+		db.SaveChanges();
+	}
+}
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/SpecialsController.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/SpecialsController.cs
deleted file mode 100644
index a176844c..00000000
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/SpecialsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("specials")]
-    [ApiController]
-    public class SpecialsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public SpecialsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()
-        {
-            return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();
-        }
-    }
-}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Startup.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Startup.cs
deleted file mode 100644
index ed3fca06..00000000
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/Startup.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace BlazingPizza.Server
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllersWithViews();
-            services.AddRazorPages();
-
-            services.AddDbContext<PizzaStoreContext>(options => 
-                options.UseSqlite("Data Source=pizza.db"));
-
-            services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-                .AddEntityFrameworkStores<PizzaStoreContext>();
-
-            services.AddIdentityServer()
-                .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
-
-            services.AddAuthentication()
-                .AddIdentityServerJwt();
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                app.UseWebAssemblyDebugging();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Error");
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
-
-            app.UseHttpsRedirection();
-            app.UseBlazorFrameworkFiles();
-            app.UseStaticFiles();
-
-            app.UseRouting();
-
-            app.UseAuthentication();
-            app.UseIdentityServer();
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-                endpoints.MapRazorPages();
-                endpoints.MapFallbackToFile("index.html");
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/ToppingsController.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/ToppingsController.cs
deleted file mode 100644
index 6a677639..00000000
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/ToppingsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("toppings")]
-    [ApiController]
-    public class ToppingsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public ToppingsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<Topping>>> GetToppings()
-        {
-            return await _db.Toppings.OrderBy(t => t.Name).ToListAsync();
-        }
-    }
-}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Address.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Address.cs
index d76bc52a..79be9c5b 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Address.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Address.cs
@@ -1,27 +1,24 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class Address
 {
-    public class Address
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        [Required, MaxLength(100)]
-        public string Name { get; set; }
+	[Required, MaxLength(100)]
+	public string Name { get; set; }
 
-        [Required, MaxLength(100)]
-        public string Line1 { get; set; }
+	[Required, MaxLength(100)]
+	public string Line1 { get; set; }
 
-        [MaxLength(100)]
-        public string Line2 { get; set; }
+	[MaxLength(100)]
+	public string Line2 { get; set; }
 
-        [Required, MaxLength(50)]
-        public string City { get; set; }
+	[Required, MaxLength(50)]
+	public string City { get; set; }
 
-        [Required, MaxLength(20)]
-        public string Region { get; set; }
+	[Required, MaxLength(20)]
+	public string Region { get; set; }
 
-        [Required, MaxLength(20)]
-        public string PostalCode { get; set; }
-    }
+	[Required, MaxLength(20)]
+	public string PostalCode { get; set; }
 }
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/05-checkout-with-validation/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index f7b7dd02..fb17e53b 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -3,8 +3,13 @@
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
+	<ItemGroup>
+		<Using Include="System.ComponentModel.DataAnnotations" />
+	</ItemGroup>
+	
   <ItemGroup>
     <ProjectReference Include="..\BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj" />
   </ItemGroup>
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/LatLong.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/LatLong.cs
index 9b8c3811..14a94c26 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/LatLong.cs
@@ -1,27 +1,26 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class LatLong
 {
-    public class LatLong
-    {
-        public LatLong()
-        {
-        }
+	public LatLong()
+	{
+	}
 
-        public LatLong(double latitude, double longitude) : this()
-        {
-            Latitude = latitude;
-            Longitude = longitude;
-        }
+	public LatLong(double latitude, double longitude) : this()
+	{
+		Latitude = latitude;
+		Longitude = longitude;
+	}
 
-        public double Latitude { get; set; }
+	public double Latitude { get; set; }
 
-        public double Longitude { get; set; }
+	public double Longitude { get; set; }
 
-        public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-        {
-            // The Earth is flat, right? So no need for spherical interpolation.
-            return new LatLong(
-                start.Latitude + (end.Latitude - start.Latitude) * proportion,
-                start.Longitude + (end.Longitude - start.Longitude) * proportion);
-        }
-    }
-}
+	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+	{
+		// The Earth is flat, right? So no need for spherical interpolation.
+		return new LatLong(
+				start.Latitude + (end.Latitude - start.Latitude) * proportion,
+				start.Longitude + (end.Longitude - start.Longitude) * proportion);
+	}
+}
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/NotificationSubscription.cs
index 04259c2f..9109ff57 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/NotificationSubscription.cs
@@ -1,17 +1,14 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class NotificationSubscription
 {
-    public class NotificationSubscription
-    {
-        public int NotificationSubscriptionId { get; set; }
+	public int NotificationSubscriptionId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public string Url { get; set; }
+	public string Url { get; set; }
 
-        public string P256dh { get; set; }
+	public string P256dh { get; set; }
 
-        public string Auth { get; set; }
-    }
+	public string Auth { get; set; }
 }
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Order.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Order.cs
index fb003bd6..aca04ca1 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Order.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Order.cs
@@ -1,25 +1,32 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Order
 {
-    public class Order
-    {
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public DateTime CreatedTime { get; set; }
+	public DateTime CreatedTime { get; set; }
 
-        public Address DeliveryAddress { get; set; } = new Address();
+	public Address DeliveryAddress { get; set; } = new Address();
 
-        public LatLong DeliveryLocation { get; set; }
+	public LatLong DeliveryLocation { get; set; }
 
-        public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-        public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-        public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
-    }
+	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(Order))]
+[JsonSerializable(typeof(OrderWithStatus))]
+[JsonSerializable(typeof(List<OrderWithStatus>))]
+[JsonSerializable(typeof(Pizza))]
+[JsonSerializable(typeof(List<PizzaSpecial>))]
+[JsonSerializable(typeof(List<Topping>))]
+[JsonSerializable(typeof(Topping))]
+public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/OrderWithStatus.cs
index 021de78c..f5f153b6 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/OrderWithStatus.cs
@@ -1,79 +1,78 @@
-using BlazingPizza.ComponentsLibrary.Map;
-using System;
-using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using BlazingPizza.ComponentsLibrary.Map;
 
-namespace BlazingPizza
+
+namespace BlazingPizza;
+
+public class OrderWithStatus
 {
-    public class OrderWithStatus
-    {
-        public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-        public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-        public Order Order { get; set; }
+	public Order Order { get; set; }
 
-        public string StatusText { get; set; }
+	public string StatusText { get; set; }
 
-        public bool IsDelivered => StatusText == "Delivered";
+	public bool IsDelivered => StatusText == "Delivered";
 
-        public List<Marker> MapMarkers { get; set; }
+	public List<Marker> MapMarkers { get; set; }
 
-        public static OrderWithStatus FromOrder(Order order)
-        {
-            // To simulate a real backend process, we fake status updates based on the amount
-            // of time since the order was placed
-            string statusText;
-            List<Marker> mapMarkers;
-            var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+	public static OrderWithStatus FromOrder(Order order)
+	{
+		// To simulate a real backend process, we fake status updates based on the amount
+		// of time since the order was placed
+		string statusText;
+		List<Marker> mapMarkers;
+		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-            if (DateTime.Now < dispatchTime)
-            {
-                statusText = "Preparing";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-                };
-            }
-            else if (DateTime.Now < dispatchTime + DeliveryDuration)
-            {
-                statusText = "Out for delivery";
+		if (DateTime.Now < dispatchTime)
+		{
+			statusText = "Preparing";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+								};
+		}
+		else if (DateTime.Now < dispatchTime + DeliveryDuration)
+		{
+			statusText = "Out for delivery";
 
-                var startPosition = ComputeStartPosition(order);
-                var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-                var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation),
-                    ToMapMarker("Driver", driverPosition, showPopup: true),
-                };
-            }
-            else
-            {
-                statusText = "Delivered";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-                };
-            }
+			var startPosition = ComputeStartPosition(order);
+			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation),
+										ToMapMarker("Driver", driverPosition, showPopup: true),
+								};
+		}
+		else
+		{
+			statusText = "Delivered";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+								};
+		}
 
-            return new OrderWithStatus
-            {
-                Order = order,
-                StatusText = statusText,
-                MapMarkers = mapMarkers,
-            };
-        }
+		return new OrderWithStatus
+		{
+			Order = order,
+			StatusText = statusText,
+			MapMarkers = mapMarkers,
+		};
+	}
 
-        private static LatLong ComputeStartPosition(Order order)
-        {
-            // Random but deterministic based on order ID
-            var rng = new Random(order.OrderId);
-            var distance = 0.01 + rng.NextDouble() * 0.02;
-            var angle = rng.NextDouble() * Math.PI * 2;
-            var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-            return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-        }
+	private static LatLong ComputeStartPosition(Order order)
+	{
+		// Random but deterministic based on order ID
+		var rng = new Random(order.OrderId);
+		var distance = 0.01 + rng.NextDouble() * 0.02;
+		var angle = rng.NextDouble() * Math.PI * 2;
+		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+	}
 
-        static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
-    }
-}
+	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+}
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Pizza.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Pizza.cs
index ec1108a9..459298f4 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Pizza.cs
@@ -1,42 +1,44 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+///    /// Represents a customized pizza as part of an order
+/// </summary>
+public class Pizza
 {
-    /// <summary>
-    /// Represents a customized pizza as part of an order
-    /// </summary>
-    public class Pizza
-    {
-        public const int DefaultSize = 12;
-        public const int MinimumSize = 9;
-        public const int MaximumSize = 17;
+	public const int DefaultSize = 12;
+	public const int MinimumSize = 9;
+	public const int MaximumSize = 17;
 
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public PizzaSpecial Special { get; set; }
+	public PizzaSpecial Special { get; set; }
 
-        public int SpecialId { get; set; }
+	public int SpecialId { get; set; }
 
-        public int Size { get; set; }
+	public int Size { get; set; }
 
-        public List<PizzaTopping> Toppings { get; set; }
+	public List<PizzaTopping> Toppings { get; set; }
 
-        public decimal GetBasePrice()
-        {
-            return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-        }
+	public decimal GetBasePrice()
+	{
+		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+	}
 
-        public decimal GetTotalPrice()
-        {
-            return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-        }
+	public decimal GetTotalPrice()
+	{
+		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+	}
 
-        public string GetFormattedTotalPrice()
-        {
-            return GetTotalPrice().ToString("0.00");
-        }
-    }
+	public string GetFormattedTotalPrice()
+	{
+		return GetTotalPrice().ToString("0.00");
+	}
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
+[JsonSerializable(typeof(Pizza))]
+public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaSpecial.cs
index 2f2b3383..9653300c 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaSpecial.cs
@@ -1,20 +1,19 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+/// Represents a pre-configured template for a pizza a user can order
+/// </summary>
+public class PizzaSpecial
 {
-    /// <summary>
-    /// Represents a pre-configured template for a pizza a user can order
-    /// </summary>
-    public class PizzaSpecial
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal BasePrice { get; set; }
+	public decimal BasePrice { get; set; }
 
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public string ImageUrl { get; set; }
+	public string ImageUrl { get; set; }
 
-        public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
-    }
-}
+	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+}
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaTopping.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaTopping.cs
index f5a6c1ac..0a711647 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaTopping.cs
@@ -1,11 +1,11 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class PizzaTopping
 {
-    public class PizzaTopping
-    {
-        public Topping Topping { get; set; }
+	public Topping Topping { get; set; }
+
+	public int ToppingId { get; set; }
 
-        public int ToppingId { get; set; }
-        
-        public int PizzaId { get; set; }
-    }
-}
+	public int PizzaId { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Topping.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Topping.cs
index 61bdeb92..376c311a 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Topping.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Topping.cs
@@ -1,13 +1,13 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Topping
 {
-    public class Topping
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal Price { get; set; }
+	public decimal Price { get; set; }
 
-        public string GetFormattedPrice() => Price.ToString("0.00");
-    }
-}
+	public string GetFormattedPrice() => Price.ToString("0.00");
+	
+}
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/UserInfo.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/UserInfo.cs
index 4996ef80..362f8f8e 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/UserInfo.cs
@@ -1,9 +1,9 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class UserInfo
 {
-    public class UserInfo
-    {
-        public bool IsAuthenticated { get; set; }
+	public bool IsAuthenticated { get; set; }
 
-        public string Name { get; set; }
-    }
-}
+	public string Name { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj
index 663677a1..44802d79 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -2,16 +2,19 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer"  Version="$(BlazorVersion)" PrivateAssets="all"  />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="$(SystemNetHttpJsonVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\BlazingComponents\BlazingComponents.csproj" />
     <ProjectReference Include="..\BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj" />
     <ProjectReference Include="..\BlazingPizza.Shared\BlazingPizza.Shared.csproj" />
   </ItemGroup>
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrderState.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrderState.cs
index 5265ae39..7309fbad 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrderState.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrderState.cs
@@ -1,55 +1,52 @@
-using System.Collections.Generic;
+namespace BlazingPizza.Client;
 
-namespace BlazingPizza.Client
+public class OrderState
 {
-    public class OrderState
-    {
-        public bool ShowingConfigureDialog { get; private set; }
-
-        public Pizza ConfiguringPizza { get; private set; }
-
-        public Order Order { get; private set; } = new Order();
-
-        public void ShowConfigurePizzaDialog(PizzaSpecial special)
-        {
-            ConfiguringPizza = new Pizza()
-            {
-                Special = special,
-                SpecialId = special.Id,
-                Size = Pizza.DefaultSize,
-                Toppings = new List<PizzaTopping>(),
-            };
-
-            ShowingConfigureDialog = true;
-        }
-
-        public void CancelConfigurePizzaDialog()
-        {
-            ConfiguringPizza = null;
-            ShowingConfigureDialog = false;
-        }
-
-        public void ConfirmConfigurePizzaDialog()
-        {
-            Order.Pizzas.Add(ConfiguringPizza);
-            ConfiguringPizza = null;
-
-            ShowingConfigureDialog = false;
-        }
-
-        public void RemoveConfiguredPizza(Pizza pizza)
-        {
-            Order.Pizzas.Remove(pizza);
-        }
-
-        public void ResetOrder()
-        {
-            Order = new Order();
-        }
-
-        public void ReplaceOrder(Order order)
-        {
-            Order = order;
-        }
-    }
+		public bool ShowingConfigureDialog { get; private set; }
+
+		public Pizza ConfiguringPizza { get; private set; }
+
+		public Order Order { get; private set; } = new Order();
+
+		public void ShowConfigurePizzaDialog(PizzaSpecial special)
+		{
+				ConfiguringPizza = new Pizza()
+				{
+						Special = special,
+						SpecialId = special.Id,
+						Size = Pizza.DefaultSize,
+						Toppings = new List<PizzaTopping>(),
+				};
+
+				ShowingConfigureDialog = true;
+		}
+
+		public void CancelConfigurePizzaDialog()
+		{
+				ConfiguringPizza = null;
+				ShowingConfigureDialog = false;
+		}
+
+		public void ConfirmConfigurePizzaDialog()
+		{
+				Order.Pizzas.Add(ConfiguringPizza);
+				ConfiguringPizza = null;
+
+				ShowingConfigureDialog = false;
+		}
+
+		public void RemoveConfiguredPizza(Pizza pizza)
+		{
+				Order.Pizzas.Remove(pizza);
+		}
+
+		public void ResetOrder()
+		{
+				Order = new Order();
+		}
+
+		public void ReplaceOrder(Order order)
+		{
+				Order = order;
+		}
 }
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrdersClient.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrdersClient.cs
index 0f800e6f..d90979ae 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrdersClient.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrdersClient.cs
@@ -1,35 +1,30 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Threading.Tasks;
-
-namespace BlazingPizza.Client
+using System.Net.Http.Json;
+
+namespace BlazingPizza.Client;
+
+public class OrdersClient
 {
-    public class OrdersClient
-    {
-        private readonly HttpClient httpClient;
+	private readonly HttpClient httpClient;
+
+	public OrdersClient(HttpClient httpClient)
+	{
+		this.httpClient = httpClient;
+	}
 
-        public OrdersClient(HttpClient httpClient)
-        {
-            this.httpClient = httpClient;
-        }
+	public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
+			await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
 
-        public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
-            await httpClient.GetFromJsonAsync<IEnumerable<OrderWithStatus>>("orders");
 
+	public async Task<OrderWithStatus> GetOrder(int orderId) =>
+			await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
 
-        public async Task<OrderWithStatus> GetOrder(int orderId) =>
-            await httpClient.GetFromJsonAsync<OrderWithStatus>($"orders/{orderId}");
 
+	public async Task<int> PlaceOrder(Order order)
+	{
+		var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
+		response.EnsureSuccessStatusCode();
+		var orderId = await response.Content.ReadFromJsonAsync<int>();
+		return orderId;
+	}
 
-        public async Task<int> PlaceOrder(Order order)
-        {
-            var response = await httpClient.PostAsJsonAsync("orders", order);
-            response.EnsureSuccessStatusCode();
-            var orderId = await response.Content.ReadFromJsonAsync<int>();
-            return orderId;
-        }
-    }
-}
\ No newline at end of file
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/PizzaAuthenticationState.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Client/PizzaAuthenticationState.cs
index 3f295928..f5bfef65 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/PizzaAuthenticationState.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/PizzaAuthenticationState.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 
-namespace BlazingPizza.Client
+namespace BlazingPizza.Client;
+
+public class PizzaAuthenticationState : RemoteAuthenticationState
 {
-    public class PizzaAuthenticationState : RemoteAuthenticationState
-    {
-        public Order Order { get; set; }
-    }
+	public Order Order { get; set; }
 }
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs
index afeee128..41eedccb 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs
@@ -1,31 +1,20 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
+using BlazingPizza.Client;
 
-namespace BlazingPizza.Client
-{
-    public class Program
-    {
-        public static async Task Main(string[] args)
-        {
-            var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("#app");
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<App>("#app");
 
-            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
-            builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
-                .AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
-            builder.Services.AddScoped<OrderState>();
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
+		.AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
+builder.Services.AddScoped<OrderState>();
 
-            // Add auth services
-            builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
-            {
-                options.AuthenticationPaths.LogOutSucceededPath = "";
-            });
+// Add auth services
+builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
+{
+	options.AuthenticationPaths.LogOutSucceededPath = "";
+});
 
-            await builder.Build().RunAsync();
-        }
-    }
-}
+await builder.Build().RunAsync();
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 61ebf623..cb996b1b 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index f36b098e..bb84f13c 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -1,17 +1,15 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.ComponentsLibrary
+namespace BlazingPizza.ComponentsLibrary;
+
+public static class LocalStorage
 {
-    public static class LocalStorage
-    {
-        public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-        public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-        public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
-    }
-}
+	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+}
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index 63006067..a8e78f2a 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -1,13 +1,12 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Marker
 {
-    public class Marker
-    {
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public double X { get; set; }
+	public double X { get; set; }
 
-        public double Y { get; set; }
+	public double Y { get; set; }
 
-        public bool ShowPopup { get; set; }
-    }
+	public bool ShowPopup { get; set; }
 }
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 03841826..349046d4 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -1,9 +1,8 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Point
 {
-    public class Point
-    {
-        public double X { get; set; }
+	public double X { get; set; }
 
-        public double Y { get; set; }
-    }
-}
+	public double Y { get; set; }
+}
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/AddressEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/AddressEntityType.cs
new file mode 100644
index 00000000..82db81b6
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/AddressEntityType.cs
@@ -0,0 +1,92 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class AddressEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Address",
+                typeof(Address),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Address).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var city = runtimeEntityType.AddProperty(
+                "City",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("City", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<City>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var line1 = runtimeEntityType.AddProperty(
+                "Line1",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var line2 = runtimeEntityType.AddProperty(
+                "Line2",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var postalCode = runtimeEntityType.AddProperty(
+                "PostalCode",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("PostalCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<PostalCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var region = runtimeEntityType.AddProperty(
+                "Region",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Region", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Region>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Address");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
new file mode 100644
index 00000000..1dd4563b
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
@@ -0,0 +1,114 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class DeviceFlowCodesEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes",
+                typeof(DeviceFlowCodes),
+                baseEntityType);
+
+            var userCode = runtimeEntityType.AddProperty(
+                "UserCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("UserCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<UserCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var deviceCode = runtimeEntityType.AddProperty(
+                "DeviceCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("DeviceCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<DeviceCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userCode });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deviceCode },
+                unique: true);
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DeviceCodes");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
new file mode 100644
index 00000000..8946b261
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>",
+                typeof(IdentityRoleClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoleClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityRoleEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
new file mode 100644
index 00000000..2f1fec2b
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
@@ -0,0 +1,78 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRole",
+                typeof(IdentityRole),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedName = runtimeEntityType.AddProperty(
+                "NormalizedName",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("NormalizedName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<NormalizedName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedName },
+                unique: true);
+            index.AddAnnotation("Relational:Name", "RoleNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
new file mode 100644
index 00000000..55418a1e
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserClaim<string>",
+                typeof(IdentityUserClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
new file mode 100644
index 00000000..3ca029bd
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserLoginstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserLogin<string>",
+                typeof(IdentityUserLogin<string>),
+                baseEntityType);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerKey = runtimeEntityType.AddProperty(
+                "ProviderKey",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderKey", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderKey>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerDisplayName = runtimeEntityType.AddProperty(
+                "ProviderDisplayName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderDisplayName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderDisplayName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { loginProvider, providerKey });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserLogins");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
new file mode 100644
index 00000000..70078d7a
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
@@ -0,0 +1,82 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserRolestringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserRole<string>",
+                typeof(IdentityUserRole<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, roleId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
new file mode 100644
index 00000000..93ba6d31
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
@@ -0,0 +1,84 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserTokenstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserToken<string>",
+                typeof(IdentityUserToken<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var value = runtimeEntityType.AddProperty(
+                "Value",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Value", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Value>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, loginProvider, name });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserTokens");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/KeyEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/KeyEntityType.cs
new file mode 100644
index 00000000..f6c6b4c7
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/KeyEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class KeyEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.Key",
+                typeof(Key),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var algorithm = runtimeEntityType.AddProperty(
+                "Algorithm",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Algorithm", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Algorithm>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var created = runtimeEntityType.AddProperty(
+                "Created",
+                typeof(DateTime),
+                propertyInfo: typeof(Key).GetProperty("Created", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Created>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var dataProtected = runtimeEntityType.AddProperty(
+                "DataProtected",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("DataProtected", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<DataProtected>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var isX509Certificate = runtimeEntityType.AddProperty(
+                "IsX509Certificate",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("IsX509Certificate", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<IsX509Certificate>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var use = runtimeEntityType.AddProperty(
+                "Use",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Use", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Use>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var version = runtimeEntityType.AddProperty(
+                "Version",
+                typeof(int),
+                propertyInfo: typeof(Key).GetProperty("Version", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Version>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { use });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Keys");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/LatLongEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/LatLongEntityType.cs
new file mode 100644
index 00000000..3fd254bd
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/LatLongEntityType.cs
@@ -0,0 +1,80 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class LatLongEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.LatLong",
+                typeof(LatLong),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var latitude = runtimeEntityType.AddProperty(
+                "Latitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Latitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Latitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var longitude = runtimeEntityType.AddProperty(
+                "Longitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Longitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Longitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                ownership: true);
+
+            var deliveryLocation = principalEntityType.AddNavigation("DeliveryLocation",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(LatLong),
+                propertyInfo: typeof(Order).GetProperty("DeliveryLocation", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryLocation>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
new file mode 100644
index 00000000..db236e4c
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
@@ -0,0 +1,77 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class NotificationSubscriptionEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.NotificationSubscription",
+                typeof(NotificationSubscription),
+                baseEntityType);
+
+            var notificationSubscriptionId = runtimeEntityType.AddProperty(
+                "NotificationSubscriptionId",
+                typeof(int),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("NotificationSubscriptionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<NotificationSubscriptionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var auth = runtimeEntityType.AddProperty(
+                "Auth",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Auth", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Auth>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var p256dh = runtimeEntityType.AddProperty(
+                "P256dh",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("P256dh", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<P256dh>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var url = runtimeEntityType.AddProperty(
+                "Url",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Url", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Url>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { notificationSubscriptionId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "NotificationSubscriptions");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/OrderEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/OrderEntityType.cs
new file mode 100644
index 00000000..9d9ec6fd
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/OrderEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class OrderEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Order",
+                typeof(Order),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Order).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var createdTime = runtimeEntityType.AddProperty(
+                "CreatedTime",
+                typeof(DateTime),
+                propertyInfo: typeof(Order).GetProperty("CreatedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<CreatedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var deliveryAddressId = runtimeEntityType.AddProperty(
+                "DeliveryAddressId",
+                typeof(int?),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(Order).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deliveryAddressId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("DeliveryAddressId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var deliveryAddress = declaringEntityType.AddNavigation("DeliveryAddress",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Address),
+                propertyInfo: typeof(Order).GetProperty("DeliveryAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PersistedGrantEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
new file mode 100644
index 00000000..842d53a5
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
@@ -0,0 +1,127 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PersistedGrantEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.PersistedGrant",
+                typeof(PersistedGrant),
+                baseEntityType);
+
+            var key = runtimeEntityType.AddProperty(
+                "Key",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Key", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Key>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var consumedTime = runtimeEntityType.AddProperty(
+                "ConsumedTime",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ConsumedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ConsumedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(PersistedGrant).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var type = runtimeEntityType.AddProperty(
+                "Type",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Type", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Type>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var key0 = runtimeEntityType.AddKey(
+                new[] { key });
+            runtimeEntityType.SetPrimaryKey(key0);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { consumedTime });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            var index1 = runtimeEntityType.AddIndex(
+                new[] { subjectId, clientId, type });
+
+            var index2 = runtimeEntityType.AddIndex(
+                new[] { subjectId, sessionId, type });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PersistedGrants");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaEntityType.cs
new file mode 100644
index 00000000..3a124e63
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaEntityType.cs
@@ -0,0 +1,111 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Pizza",
+                typeof(Pizza),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var size = runtimeEntityType.AddProperty(
+                "Size",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Size", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Size>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var specialId = runtimeEntityType.AddProperty(
+                "SpecialId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("SpecialId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<SpecialId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { orderId });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { specialId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var pizzas = principalEntityType.AddNavigation("Pizzas",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<Pizza>),
+                propertyInfo: typeof(Order).GetProperty("Pizzas", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<Pizzas>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("SpecialId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var special = declaringEntityType.AddNavigation("Special",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(PizzaSpecial),
+                propertyInfo: typeof(Pizza).GetProperty("Special", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Special>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Pizzas");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
new file mode 100644
index 00000000..e86b0f50
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
@@ -0,0 +1,76 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaSpecialEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaSpecial",
+                typeof(PizzaSpecial),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var basePrice = runtimeEntityType.AddProperty(
+                "BasePrice",
+                typeof(decimal),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("BasePrice", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<BasePrice>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var imageUrl = runtimeEntityType.AddProperty(
+                "ImageUrl",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("ImageUrl", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<ImageUrl>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Specials");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaStoreContextModel.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
new file mode 100644
index 00000000..8b516a68
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
@@ -0,0 +1,28 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    [DbContext(typeof(PizzaStoreContext))]
+    public partial class PizzaStoreContextModel : RuntimeModel
+    {
+        static PizzaStoreContextModel()
+        {
+            var model = new PizzaStoreContextModel();
+            model.Initialize();
+            model.Customize();
+            _instance = model;
+        }
+
+        private static PizzaStoreContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
new file mode 100644
index 00000000..d46f50f4
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
@@ -0,0 +1,69 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    public partial class PizzaStoreContextModel
+    {
+        partial void Initialize()
+        {
+            var address = AddressEntityType.Create(this);
+            var latLong = LatLongEntityType.Create(this);
+            var notificationSubscription = NotificationSubscriptionEntityType.Create(this);
+            var order = OrderEntityType.Create(this);
+            var pizza = PizzaEntityType.Create(this);
+            var pizzaSpecial = PizzaSpecialEntityType.Create(this);
+            var pizzaTopping = PizzaToppingEntityType.Create(this);
+            var pizzaStoreUser = PizzaStoreUserEntityType.Create(this);
+            var topping = ToppingEntityType.Create(this);
+            var deviceFlowCodes = DeviceFlowCodesEntityType.Create(this);
+            var key = KeyEntityType.Create(this);
+            var persistedGrant = PersistedGrantEntityType.Create(this);
+            var identityRole = IdentityRoleEntityType.Create(this);
+            var identityRoleClaimstring = IdentityRoleClaimstringEntityType.Create(this);
+            var identityUserClaimstring = IdentityUserClaimstringEntityType.Create(this);
+            var identityUserLoginstring = IdentityUserLoginstringEntityType.Create(this);
+            var identityUserRolestring = IdentityUserRolestringEntityType.Create(this);
+            var identityUserTokenstring = IdentityUserTokenstringEntityType.Create(this);
+
+            LatLongEntityType.CreateForeignKey1(latLong, order);
+            OrderEntityType.CreateForeignKey1(order, address);
+            PizzaEntityType.CreateForeignKey1(pizza, order);
+            PizzaEntityType.CreateForeignKey2(pizza, pizzaSpecial);
+            PizzaToppingEntityType.CreateForeignKey1(pizzaTopping, pizza);
+            PizzaToppingEntityType.CreateForeignKey2(pizzaTopping, topping);
+            IdentityRoleClaimstringEntityType.CreateForeignKey1(identityRoleClaimstring, identityRole);
+            IdentityUserClaimstringEntityType.CreateForeignKey1(identityUserClaimstring, pizzaStoreUser);
+            IdentityUserLoginstringEntityType.CreateForeignKey1(identityUserLoginstring, pizzaStoreUser);
+            IdentityUserRolestringEntityType.CreateForeignKey1(identityUserRolestring, identityRole);
+            IdentityUserRolestringEntityType.CreateForeignKey2(identityUserRolestring, pizzaStoreUser);
+            IdentityUserTokenstringEntityType.CreateForeignKey1(identityUserTokenstring, pizzaStoreUser);
+
+            AddressEntityType.CreateAnnotations(address);
+            LatLongEntityType.CreateAnnotations(latLong);
+            NotificationSubscriptionEntityType.CreateAnnotations(notificationSubscription);
+            OrderEntityType.CreateAnnotations(order);
+            PizzaEntityType.CreateAnnotations(pizza);
+            PizzaSpecialEntityType.CreateAnnotations(pizzaSpecial);
+            PizzaToppingEntityType.CreateAnnotations(pizzaTopping);
+            PizzaStoreUserEntityType.CreateAnnotations(pizzaStoreUser);
+            ToppingEntityType.CreateAnnotations(topping);
+            DeviceFlowCodesEntityType.CreateAnnotations(deviceFlowCodes);
+            KeyEntityType.CreateAnnotations(key);
+            PersistedGrantEntityType.CreateAnnotations(persistedGrant);
+            IdentityRoleEntityType.CreateAnnotations(identityRole);
+            IdentityRoleClaimstringEntityType.CreateAnnotations(identityRoleClaimstring);
+            IdentityUserClaimstringEntityType.CreateAnnotations(identityUserClaimstring);
+            IdentityUserLoginstringEntityType.CreateAnnotations(identityUserLoginstring);
+            IdentityUserRolestringEntityType.CreateAnnotations(identityUserRolestring);
+            IdentityUserTokenstringEntityType.CreateAnnotations(identityUserTokenstring);
+
+            AddAnnotation("ProductVersion", "6.0.0");
+        }
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
new file mode 100644
index 00000000..18b2d96d
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
@@ -0,0 +1,156 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaStoreUserEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Server.PizzaStoreUser",
+                typeof(PizzaStoreUser),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var accessFailedCount = runtimeEntityType.AddProperty(
+                "AccessFailedCount",
+                typeof(int),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("AccessFailedCount", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<AccessFailedCount>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var email = runtimeEntityType.AddProperty(
+                "Email",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Email", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Email>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var emailConfirmed = runtimeEntityType.AddProperty(
+                "EmailConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("EmailConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<EmailConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnabled = runtimeEntityType.AddProperty(
+                "LockoutEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnd = runtimeEntityType.AddProperty(
+                "LockoutEnd",
+                typeof(DateTimeOffset?),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnd", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnd>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var normalizedEmail = runtimeEntityType.AddProperty(
+                "NormalizedEmail",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedEmail", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedEmail>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedUserName = runtimeEntityType.AddProperty(
+                "NormalizedUserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedUserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedUserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var passwordHash = runtimeEntityType.AddProperty(
+                "PasswordHash",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PasswordHash", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PasswordHash>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumber = runtimeEntityType.AddProperty(
+                "PhoneNumber",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumber", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumber>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumberConfirmed = runtimeEntityType.AddProperty(
+                "PhoneNumberConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumberConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumberConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var securityStamp = runtimeEntityType.AddProperty(
+                "SecurityStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("SecurityStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<SecurityStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var twoFactorEnabled = runtimeEntityType.AddProperty(
+                "TwoFactorEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("TwoFactorEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<TwoFactorEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var userName = runtimeEntityType.AddProperty(
+                "UserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("UserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<UserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedEmail });
+            index.AddAnnotation("Relational:Name", "EmailIndex");
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { normalizedUserName },
+                unique: true);
+            index0.AddAnnotation("Relational:Name", "UserNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUsers");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaToppingEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
new file mode 100644
index 00000000..b97d2a24
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaTopping",
+                typeof(PizzaTopping),
+                baseEntityType);
+
+            var pizzaId = runtimeEntityType.AddProperty(
+                "PizzaId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("PizzaId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<PizzaId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var toppingId = runtimeEntityType.AddProperty(
+                "ToppingId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("ToppingId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<ToppingId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { pizzaId, toppingId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { toppingId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PizzaId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var toppings = principalEntityType.AddNavigation("Toppings",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<PizzaTopping>),
+                propertyInfo: typeof(Pizza).GetProperty("Toppings", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Toppings>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("ToppingId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var topping = declaringEntityType.AddNavigation("Topping",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Topping),
+                propertyInfo: typeof(PizzaTopping).GetProperty("Topping", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<Topping>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PizzaTopping");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/ToppingEntityType.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/ToppingEntityType.cs
new file mode 100644
index 00000000..9295f9bf
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Models/ToppingEntityType.cs
@@ -0,0 +1,62 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class ToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Topping",
+                typeof(Topping),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Topping).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Topping).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var price = runtimeEntityType.AddProperty(
+                "Price",
+                typeof(decimal),
+                propertyInfo: typeof(Topping).GetProperty("Price", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Price>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Toppings");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/SeedData.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/SeedData.cs
index 7c86a5b2..a1e47973 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Server/SeedData.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/SeedData.cs
@@ -1,193 +1,192 @@
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public static class SeedData
 {
-    public static class SeedData
-    {
-        public static void Initialize(PizzaStoreContext db)
-        {
-            var toppings = new Topping[]
-            {
-                new Topping()
-                {
-                    Name = "Extra cheese",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "American bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "British bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Canadian bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Tea and crumpets",
-                    Price = 5.00m
-                },
-                new Topping()
-                {
-                    Name = "Fresh-baked scones",
-                    Price = 4.50m,
-                },
-                new Topping()
-                {
-                    Name = "Bell peppers",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Onions",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Mushrooms",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Pepperoni",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Duck sausage",
-                    Price = 3.20m,
-                },
-                new Topping()
-                {
-                    Name = "Venison meatballs",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "Served on a silver platter",
-                    Price = 250.99m,
-                },
-                new Topping()
-                {
-                    Name = "Lobster on top",
-                    Price = 64.50m,
-                },
-                new Topping()
-                {
-                    Name = "Sturgeon caviar",
-                    Price = 101.75m,
-                },
-                new Topping()
-                {
-                    Name = "Artichoke hearts",
-                    Price = 3.40m,
-                },
-                new Topping()
-                {
-                    Name = "Fresh tomatoes",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Basil",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Steak (medium-rare)",
-                    Price = 8.50m,
-                },
-                new Topping()
-                {
-                    Name = "Blazing hot peppers",
-                    Price = 4.20m,
-                },
-                new Topping()
-                {
-                    Name = "Buffalo chicken",
-                    Price = 5.00m,
-                },
-                new Topping()
-                {
-                    Name = "Blue cheese",
-                    Price = 2.50m,
-                },
-            };
+	public static void Initialize(PizzaStoreContext db)
+	{
+		var toppings = new Topping[]
+		{
+			new Topping()
+			{
+					Name = "Extra cheese",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "American bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "British bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Canadian bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Tea and crumpets",
+					Price = 5.00m
+			},
+			new Topping()
+			{
+					Name = "Fresh-baked scones",
+					Price = 4.50m,
+			},
+			new Topping()
+			{
+					Name = "Bell peppers",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Onions",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Mushrooms",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Pepperoni",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Duck sausage",
+					Price = 3.20m,
+			},
+			new Topping()
+			{
+					Name = "Venison meatballs",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "Served on a silver platter",
+					Price = 250.99m,
+			},
+			new Topping()
+			{
+					Name = "Lobster on top",
+					Price = 64.50m,
+			},
+			new Topping()
+			{
+					Name = "Sturgeon caviar",
+					Price = 101.75m,
+			},
+			new Topping()
+			{
+					Name = "Artichoke hearts",
+					Price = 3.40m,
+			},
+			new Topping()
+			{
+					Name = "Fresh tomatoes",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Basil",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Steak (medium-rare)",
+					Price = 8.50m,
+			},
+			new Topping()
+			{
+					Name = "Blazing hot peppers",
+					Price = 4.20m,
+			},
+			new Topping()
+			{
+					Name = "Buffalo chicken",
+					Price = 5.00m,
+			},
+			new Topping()
+			{
+					Name = "Blue cheese",
+					Price = 2.50m,
+			},
+		};
 
-            var specials = new PizzaSpecial[]
-            {
-                new PizzaSpecial()
-                {
-                    Name = "Basic Cheese Pizza",
-                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/cheese.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 2,
-                    Name = "The Baconatorizor",
-                    Description = "It has EVERY kind of bacon",
-                    BasePrice = 11.99m,
-                    ImageUrl = "img/pizzas/bacon.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 3,
-                    Name = "Classic pepperoni",
-                    Description = "It's the pizza you grew up with, but Blazing hot!",
-                    BasePrice = 10.50m,
-                    ImageUrl = "img/pizzas/pepperoni.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 4,
-                    Name = "Buffalo chicken",
-                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-                    BasePrice = 12.75m,
-                    ImageUrl = "img/pizzas/meaty.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 5,
-                    Name = "Mushroom Lovers",
-                    Description = "It has mushrooms. Isn't that obvious?",
-                    BasePrice = 11.00m,
-                    ImageUrl = "img/pizzas/mushroom.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 6,
-                    Name = "The Brit",
-                    Description = "When in London...",
-                    BasePrice = 10.25m,
-                    ImageUrl = "img/pizzas/brit.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 7,
-                    Name = "Veggie Delight",
-                    Description = "It's like salad, but on a pizza",
-                    BasePrice = 11.50m,
-                    ImageUrl = "img/pizzas/salad.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 8,
-                    Name = "Margherita",
-                    Description = "Traditional Italian pizza with tomatoes and basil",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/margherita.jpg",
-                },
-            };
+		var specials = new PizzaSpecial[]
+		{
+			new PizzaSpecial()
+			{
+					Name = "Basic Cheese Pizza",
+					Description = "It's cheesy and delicious. Why wouldn't you want one?",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/cheese.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 2,
+					Name = "The Baconatorizor",
+					Description = "It has EVERY kind of bacon",
+					BasePrice = 11.99m,
+					ImageUrl = "img/pizzas/bacon.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 3,
+					Name = "Classic pepperoni",
+					Description = "It's the pizza you grew up with, but Blazing hot!",
+					BasePrice = 10.50m,
+					ImageUrl = "img/pizzas/pepperoni.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 4,
+					Name = "Buffalo chicken",
+					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+					BasePrice = 12.75m,
+					ImageUrl = "img/pizzas/meaty.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 5,
+					Name = "Mushroom Lovers",
+					Description = "It has mushrooms. Isn't that obvious?",
+					BasePrice = 11.00m,
+					ImageUrl = "img/pizzas/mushroom.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 6,
+					Name = "The Brit",
+					Description = "When in London...",
+					BasePrice = 10.25m,
+					ImageUrl = "img/pizzas/brit.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 7,
+					Name = "Veggie Delight",
+					Description = "It's like salad, but on a pizza",
+					BasePrice = 11.50m,
+					ImageUrl = "img/pizzas/salad.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 8,
+					Name = "Margherita",
+					Description = "Traditional Italian pizza with tomatoes and basil",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/margherita.jpg",
+			},
+		};
 
-            db.Toppings.AddRange(toppings);
-            db.Specials.AddRange(specials);
-            db.SaveChanges();
-        }
-    }
-}
+		db.Toppings.AddRange(toppings);
+		db.Specials.AddRange(specials);
+		db.SaveChanges();
+	}
+}
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/SpecialsController.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/SpecialsController.cs
deleted file mode 100644
index a176844c..00000000
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Server/SpecialsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("specials")]
-    [ApiController]
-    public class SpecialsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public SpecialsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()
-        {
-            return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();
-        }
-    }
-}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Startup.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Startup.cs
deleted file mode 100644
index ed3fca06..00000000
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Startup.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace BlazingPizza.Server
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllersWithViews();
-            services.AddRazorPages();
-
-            services.AddDbContext<PizzaStoreContext>(options => 
-                options.UseSqlite("Data Source=pizza.db"));
-
-            services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-                .AddEntityFrameworkStores<PizzaStoreContext>();
-
-            services.AddIdentityServer()
-                .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
-
-            services.AddAuthentication()
-                .AddIdentityServerJwt();
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                app.UseWebAssemblyDebugging();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Error");
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
-
-            app.UseHttpsRedirection();
-            app.UseBlazorFrameworkFiles();
-            app.UseStaticFiles();
-
-            app.UseRouting();
-
-            app.UseAuthentication();
-            app.UseIdentityServer();
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-                endpoints.MapRazorPages();
-                endpoints.MapFallbackToFile("index.html");
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/ToppingsController.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/ToppingsController.cs
deleted file mode 100644
index 6a677639..00000000
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Server/ToppingsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("toppings")]
-    [ApiController]
-    public class ToppingsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public ToppingsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<Topping>>> GetToppings()
-        {
-            return await _db.Toppings.OrderBy(t => t.Name).ToListAsync();
-        }
-    }
-}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/pizza.db-shm b/save-points/06-authentication-and-authorization/BlazingPizza.Server/pizza.db-shm
new file mode 100644
index 0000000000000000000000000000000000000000..d52f63d35bfa01e9d93f7f13ebc85edc02a39305
GIT binary patch
literal 32768
zcmeI*xk{u#6vgp!Us~;U8EyA{9d{jlfr-S-(9EYW@tI7`O^wCaWbhFLLC?`q%;pM0
zPZj?IhYy<S{)%7T_tx(>lGCC#rBplAb4R_oxO<#`+`7GbIH|1nAN@Z6b9{RFbaq|;
z;(7hlYy7*<pYr$PkB8o!npNMURc%w-)ef~&?NYndirS<0s(orzt*QO$fI6rSsXx?V
zbwsVJqw1JCu1=_v>XbUI&Zx8MoI0;AsEg{7x~#6KtLmEiQ(afBwyAEZ+p5ic_xJm}
z-__qE2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfB*srlq2AO-jj%c=N^!VfTvF65zm|;5dly9
zAQ1u2TgfADGivg<Yh!QeSvMpi(2{l|$Nqyeo-;%u0-o|jA_AVVl}9{bi$nxG-;6{A
zJY6o2c(xpg2zas|i3oVEVjl5SMG_J4OiL0G@I+BkmVl?Zl8At3>5{SpJja+s1UyBW
zlqKK^-XtQ>oqk1*aV8^ynT+n**sE63L1Qn#+rM4FTN_A3z&kTYSpwcyLLvg*7DLJs
z@TMLT5%8WQQkH;sRFQ~4HSI-?aV8@HZ)YPBfm+&+9OFzz0^UnVA_CqDNy-xNMotnD
r@IF*hmVkHBl8Ase0h6)>R+INglYa|%2R127!28EZM8MnMNkrfU7x*+)

literal 0
HcmV?d00001

diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/pizza.db-wal b/save-points/06-authentication-and-authorization/BlazingPizza.Server/pizza.db-wal
new file mode 100644
index 0000000000000000000000000000000000000000..ea6103d0290efd8b8d8a6a324c31bf3485cb3e72
GIT binary patch
literal 226632
zcmeI54UijYdFLg2JY$bNGrQ}xwO+5WJYKIoYs=QhNHb!y7=5&6H2VG?4F^g~YDq1%
z)KYg#8cniCyf&L~)K%avNhJ^pvg|>nNFA4}qsSFWLGe*s71SjcLXIR9<hTnQgbU#a
zADe^Z-fpQ!Em^X?RJf|0`>Q;oe!rggd4A9HzWw$i&F<QpXP?)ZzWSI>_mED0{oXec
z$FDuS<^9Xoe(SSe;=b^kq)M-?|7SgM#`ogC`*9)`WF^K};)Oab8Es_rp+maY8;zvz
zA@XC9#|&N<$@`32An%GiO?lGgA>H-Jb4N(ap{4K3?N2TJpQZ25e{|vLV>9!2=H7nv
zFJ=QX-0X?N!l4iAPb}_E67m18?)Fm;%^A*|(Z6t6qVpUR5sHi;_J2R@iBqm5WlXx<
zLCUz?uUs}>S(rDHSHJ8pE*t&fB(*`sjp0br7)}L)Mo%Q1NXA{H-nbkM<kW%DxIg5I
zXN>_Wdu<>iB{G66B1vuc$Epn;fuSX)m}KjW+B%S~_V6+s+hK&Bt5_5mQ5;c(C^6nG
z$QNjd<r}#md6U{jB9>SeR1}`xmv5A(bk^GFQ*F!*l*vs{&KHSO{*AC~z46NO-5pkl
zK0Yc=g*{ZlxI7R<XfG4XRu<-0ZoPJC&T#IW{`n2XQAxhpWE*8seSc`wS!(srT_b>|
zcxpIG<13>pm5lhqM1F`0CskHqdgvJq?x?^P#yuu0-(6IczwJ_#Pc)eVOLL<7zBH=5
zTK&qDACCG-m3Px3GsyteW-lWa1hy%Mks6d5)BSb2%%lWP(?l%4eeT4Z;p$cWTUv_c
zQL?&Nkwo@}KsO|Dthg}BVXSqCBf#|3S*CdMuAv$xsyWGCbKF&GQ=*-(G6iYk(oB%m
zMhHx7^KdNF&<wk4&E5;3vgV28dn|ftx5*01I#%u1IKaa<#CCmj)6g_~X^B=x4fG=Z
zd3Ise5WA|^v5g|LE4DatW605MiC4<GF^oCOSjFP=?&EWYn>Y1$PAcvV^AcNP`#TL`
zxNogEwc*65%cu4mI)7T12U+0L#)`{EO@K^Z@l*He(U@05C~CDkiWL>O#t*Kxq^%}C
zcz*NPoZ-|d{T)$(NTOSmf96Ng$W=oM!|<E30{Y!GR;h}m<s~Su;PLyG+F@|-QB@y{
zVS+(z(Hg~-d4ZKGb+v75lwaJoo1Gp;7{mvWF>QJ|PNM=Zk@d$+xVx%aP7deG^RtF$
zPE8AEnMuwf|33cwb8~Zsix>58>F>y1rb9Mv4_{<N&E?Ti4`^D3j*!Db9yezA_#t3q
z>;$h2+s6c{_P%<yq%qe|c9i|-tigYAnxlp^h`%(2V|TbCire0LURf$Gu^DD0*#)BJ
za(2{hnwFv4?z?_QMon;-Jn57}Kv+IlbL<{dyhkUhPP5v3rRwM5;AuUSda~J<Sb^;J
z(-%^d7R4?v6gO#6yWyx4C742+EZJT{qU%jH=rl{3%s@H_OrtQhOSHl_m~gwEXM_m?
zG_4PyZL-Vz=z_!xR6{<9-@`6)l&$e?iE2zbIPW*!M~JIXAop<}@c~ox@a=|lH%GEF
z+h^|;rJ4}QSu};YTW>t9MCon4CQ9Qx#|)xWxty64rAo^yj?%%X2~m3A2%Xa59?qAs
z%-kP~qLYe6Daen6N98BG=%HEpNSIaN49*-P(`u7YW5$YyM<9(gUTKg+_%$+e<@u}n
zIm6kr`a7mR@cuK=;34ABhz!l6#o!_AK@JZ4&m$VflaC2npkq5>kZmv)b)igXv#M>{
zRY+E-T0J%-&XhGL@v+7zPYx5D_QpiOKWZSqPA-yP@^k)vz994)J74?3yZ>IdAXoNN
z3Gx+QAOHd&00JNY0w4eaAOHd&00JNY0tb`8Vc9J8djyZh{`!~x==(ohLSEotIvZAj
z00@8p2!H?xfB*=900@8p2!OyC0p)K1)V#nGkN^4nmtXX~6M2C#N+^N=2!H?xfB*=9
z00@8p2!H?xfWW~dApcFr{`Uo*{h8#~VxRRI=jBTL9f3>%FAx9$5C8!X009sH0T2KI
z5C8!XILHKMW#iQE3;e<N9{VM4Yx6_+zQ93tIcx&~5C8!X009sH0T2KI5C8!X0D*l1
zbMlp%7qI@>7mA<c-g*q*7ue^63lIPS5C8!X009sH0T2KI5C8!XILHK)|1X4^7kF{E
z{I&QqKm2)oU*I6S9JYY~2!H?xfB*=900@8p2!H?xfWSV1WAc@n7x+(q_PXak^7W6;
z<NE^pd~g8*AOHd&00JNY0w4eaAOHd&00IY@fRX}G^8z!UY`v8H?x$S%zQ93tIcx&~
z5C8!X009sH0T2KI5C8!X0D*l1$K@+EFL2|TZ+u+(@<RoDUtpgPE<gYTKmY_l00ck)
z1V8`;KmY_l;2;w?AseUW1&Z%AxR2cW%h%!i0teaUunh!200ck)1V8`;KmY_l00ck)
z1ojCiDF8JuaJC)tzK;5vBghNv^T7oOfB*=900@8p2!H?xfB*=900<mp0*kV7YF^;<
z5#jZ3%75<%_&b7w>~h!!0w4eaAOHd&00JNY0w4eaAOHgU1eWA0H81e~<gdK=U!Sae
z72g-w=YtCn009sH0T2KI5C8!X009sH0T4LI1Rj!&Q}Y6gzkKP=A^TfjMqc0`yBxNG
z00@8p2!H?xfB*=900@8p2!OyofrsTQH7~I6C$F1*?x}ZNLtbE?4=z9e1V8`;KmY_l
z00ck)1V8`;K;R$~ctkc%%?rHzIePQGpNL;YUf>|R9JYY~2!H?xfB*=900@8p2!H?x
zfWSV1lk%0C7x=uX`rY%t__dXV#a-RvVL`X}$BVzPKrg!HKf3Vrv6=Zhb8kQT7qfwx
z56*Chg+m|KpCH{1{A+RdP|0xSjQ)ko5}oImh)`q%vH$yFPn>ckDPz**4pPSDe&w?9
z%EG*ny!vH-aoOk(C#el8ZVX3~#&9YaG<qW8L^AFo^~U9BAg2zD#{D5zJZlV4*=qwC
zDUlIm5lL#hKUQt<2n;PT#Uxv2)YgG?wTGAC*bXD~T*acmh~kJMM2YckLB2psEZ@il
z$(z(J60yX(prY{fzI>xRrL)#XpK4=npiFLpa=u8M@^6G?>y1~I@9wZd^zl(~D(s;W
z#^r$^LVKB5wz4q4a_hBAbB1&0^v`c7j!N>)Cfg{B>ia{Z&Qhy~?iv9!#Z$vk8ebV*
zsbs_-Ch|j6IH|G<(?ic_a7P8UFzzu~`R<~k{B4(_e4@z|Seg^n_oY$g)#_KK{BYDy
zs=S*PnMnqyHhUSdAh1n2jMSjinC`FBWhNzXnkHiTvkS9^*j2rbZ4{YZvBj|xlcU=b
zuat99ve;OW1p0<RHzYA<8LL>leeT4Z;p$cWTUrXZvF5Sj!YIbE)*;OR(^Hk45(sw<
z)gV=ABzw(qPpeIdcD~9Kq=_p#K^7|kII+#cu}niV?5-t$FaFAwK_uT}&!Bdjte|WI
zs{I=OdH9Cdu8;0Hnr1I8(dwvyUc|l6yN}NqZr;@2IjQ(3%u8&E?e8=M!oIrV)P@tI
zKAYNa=)GxO9%O+}8!IjwH6EV4;-~J_qcN|>K-6k?6e}t*4M<m8(pJk5H;>I3PMy-<
z5fz9eJVp6ueiV&dHKZ_%pD7{S@2;^*RV*#9Ie7(--?!8bgL{vv`dAPW3~GzkD6Y&4
ztW>G1ZDXVS;<nxF^f1C8K8TEI)60Pt6?lm(AZEhdRn>BGJYJrkH9T`_+IAx|$ywyz
z$De<0Zq9J=qW&%Y9ofrt$j0sAi;SqbJUZ$DP0P>`a#+aY#ta`n1dNQG;FV$fm>|{O
zSI?d@=K9HwvLBr__%BX#)Q|@8m!@#+4tGRx+gr~oOT{HN!;B=mK-65$j=D|LGIZO0
z*U!kP2@aDdopJ~W^Fp2G*gd9rk4{vbX0`W9)z8Dh(|RcNWVbG{0@<#oFQh0fid|kP
zZqlN5!%-(nFoiZ*vb}^v*PCk4X_hpZfpid<Mqz4~XoYVu;dVXG2onToS|32$WS95R
z1&J4^hI|mehh5|-TjSdj)tGc}-fz5*5Lcl<Zp1#~1E%QV+YRY%j$~)H&)zFaH6fC-
zXbN+;-gsDv(%X7Xl*W0E8APdaIWs9rm6lf=rGrruqV&EII;F!soG)XUxjz;~Cl!lQ
zI6@vKkID~}(L=NHnJ%lq8Jr14rqw2)#*7sYk3br0ywV_t@M~n`%JWzCbB42L^><8t
z;QeQ!!9&EM5gD3Ci@`(KgB%?8pGP!|Cm$2EK*x5%AlqOp>Oz^&W>wp?tB|ZvwR&tw
zoGEKg;$w|bo*X8)2{$I<KH`E$Wk0BSf#;t7=sQXme)oL~hYGr5x=-kqJPYqUdSmu?
zW`1wBcIc&<p6(MTt}guD@edq#&VP8`a_ryhepVj+%3nl${=!B5tz*jJU)jd|@?(K!
z={z~`l|SsIwvEffKFh{Pm^>B^_j|HPmdE$XmD{f|%o$83{abj=!jm`QBwu41ntMdQ
z{P<X8>`U)A57(hA;;uV}x{(I?GTR_0mJUmD2UC1?kElq~TzmiYF!a3k0h=TdhL)?k
zX(RE<@<79D#^q6UNQE-@%0OGKSn}LHE>=?^=2WXkAKeGFW6$gR=;Sl1^2{zf%u59+
zl0osf5+0YABB4iu$CWTmyY1hljb>Nvn|=0n{FL%Q_`(~;JgjUnLjg+hv1$HQS|8B8
za^Gpb*U}tu(qMvVJ{ripuTvB;1E2J-2P2K6K2hb3=1>%$D8r`v<bGk%pLNLfrxF#<
zp1xO-U^sbS8BI_q6=!anPb#bah5ke6u)netG^@T}K0Pfe`pv_z7+pz&B;EKvJ6QMR
zp<>F?S9b<4D>ga0r`-vLt6g2c6DOG(WvarXVK%BZ*#J}xWF7Ata($UU?S0_pqqBww
z*#`#NXk6Z}G2GTY(%<QAWBY)IquIK~=l$}jX+G~a4}JbXhk^agP93dvz{GT+x|Q}5
zy<;(?NYSQ~G;yJ{J-{tuWH0Zl_0#s@ZQa9nyFgx%{ptJ5a9Dn1k_(2-KZy&pqwnhi
zx%0GreEFZ$1w*xds#~{mk~{oAZ(h~kI;Whd{M#Cr%Swp3zR|-SQK`K+@WkMdHFend
znM)Zg-%9#Ymsf7-&(9fLCjG4och5gqx&6Q&D$uW9zJ~@Q1IJYu3@19M$B<k4*G$!6
zunxv`=vQC3hYlkH$93p8${bW3xN~!c%j95tR>2_Ck#~8`*;XNE988!B`(r7J<iC_7
z?nrO#RLU56mf<P4f0DbUe`2D=@_>Qj@}<8xz5>rrvG}fm<7x~o?h9Tfj}V8yV7PQi
z|3XCBexvN(9zFQ<M0<U1Fyr7OG;Pyxy${As+IiI@wleS@9mejEqw{EYhAYdeC~{vM
zPCVtVsFjmb3S$3FR%P@ArivXs7Wc=<P9!5%?miJuK7EZ$t0;N<sfXt9DP{k2SM{UA
z;U}8-l#+a=I`P;s<*+&FL%x1q;FSDSujU0lc;%hn7FV84<L?Mwd9DK^KmY_l00ck)
z1V8`;KmY_l00cnbRY>5pth1UIc=G+GbF-Ew+Q<vM3OxyxK>!3m00ck)1V8`;KmY_l
z00cnbl@l<?L)5&$TdStjyZ_-+ADfpemH&gGe1R7TfB*=900@8p2!H?xfB*=900@A<
z0VVL5Y?qoBIP{&*e6srRA3cxn3mi~y!z>U00T2KI5C8!X009sH0T2KI5EvzJMlPy(
zfu{}cde{0NG9SnH1x6vE1Ogxc0w4eaAOHd&00JNY0w4ea2b93$vR!Ik;9bA|kH;kL
z#2mgaa6r8cvp@g@KmY_l00ck)1V8`;KmY_lV3fdFxv1s^wtnrmT;`wo%x~cP0;7;n
z0s#;J0T2KI5C8!X009sH0T2Lz14`ft*)BCN@U8fN=704Wn-|{~IH2B!Ss(xcAOHd&
z00JNY0w4eaAOHd&FiPN@TvYP{e|O=j`pYL?_YCp^qmWPn0T2KI5C8!X009sH0T2KI
z5CDM#O5ioJU20z7JFj=PPf>6F1N<Gq0rfV_0s#;J0T2KI5C8!X009sH0T2LzQ3B`X
zqM8@DlYeR9V{iKxUq@bG6cS1x00JNY0w4eaAOHd&00JNY0w8ce2^eL&)VzTC^1uG@
zzxooJMPA^5dK+ee00@8p2!H?xfB*=900@8p2!OySfeUg`%?o_^vtRyS+n>8+LtbDM
z5=tNd0w4eaAOHd&00JNY0w4eaAaFnlEX#JOd4Vr}$Yg)YeD)Ob0teLFFbf1g00ck)
z1V8`;KmY_l00ck)1V#y5l#6O!;2UQ@w2=94tLKpy7=?rq2!H?xfB*=900@8p2!H?x
zfB*;_Py$cNcBy#*$D9A^dk>dC@Ezm@4yd<b76^a<2!H?xfB*=900@8p2!H?xj1ssc
z7uCGLr`<oQcQ2Pdh`hikB$Pk^1V8`;KmY_l00ck)1V8`;K;VE9cuKZQ%?oV)DD|G0
z^Sd8dAa$n?&+C>xw(zYJ7mt7QcxnEJ^U|@uJ=Qw5boAXvAD?^ATzdA;XE%@h{*l8o
z8;8Gn_yy7#FAz9z1oljGhMSl4x6ZMRBD3q?&PCb1JvzxZn{1<;8@&6A+FFYzPPvkl
z(I56w+s5UoW0sAPuyI*Ca@lxgd0*u6O8(lM!FEP}>&VF5VlL5S3M|bHW);no=hO7l
z%p}Tl><d_4dBfFN!;Lfg=f<Xp2t`IvC%7?ff<dow@oM$TE$7p7hQd|-t=7JHMi5z1
zVu~9A-H?ci?R=FfNd96j!H6QuH^^18*JPrj{jT4w!Dxr6f(E*c_Es3EGcR8=F7Hn+
z7v%YuS8h30<_t8^y?%e)Jsit4WFsc1Zh8f(kH~p2&D9|q#gAQ?Gi(sWP16*ocAKm~
zON90q=4<!WbvSgYdYUdPx0Wu?83IHX`!roVd_!#4nPQTyk30S9eYMdJo~qACr<J{@
z<_sRPrY@-pDZwh{ybQ;77@_AX76lTC{$juW>AQ58*1tc0zg3Q}y96$;Y+RZ(Ts);`
z)TskZPt2u6Mt)zpYa+F^FIX<gVoCSqmEMzNQ@W_xl)OxbEifLw$cVWie@*R`yTof6
zHADK7Y1-sDhZ4!M&|U1$eO0wW)0t3I^%!1>mj`pF!v0uFyDe(^Xhu#{Vc2zfrMWz3
zxJ<0SsAxcd2w}R;_~rfCB{sv1Bv*--CeAw2yFZg=jBIR}7wR;}?lDER@AAseUYIjn
zATu6QW~Ayg%Z*R><S5`_pZiRrbX;C}&Pb?|b+Uh(8EO^hIpS6Mx4$@6dvSD9a;F*V
zFc>zjgCbHkwl9@<ReyfY;4<lNT~I6>5ftRhY(t4tazhx(?^iG1LxYil<0=e>_amAJ
zmUVc|R2@7V&DQVMp<jLB9y*K+9M_@WI9OGR4&1qZXq{Cs$aKa+OCe_*OgI|QBfYg#
zDPu-MOO`5I{KQ0y<pBf5<x7?Nu=@NIi-$cXIDXiu_59k|SwrBGUZ)r=wm4Q|a&%kb
zmGbCe$D%!|yymv=@j1h#OZpcg5}oH5ZJYM`+(6Z&%N?ZdI_)gX8_7#^<{^isB(*`s
zjp0br7)}L)*9Kh_nIuf6b?`*OiDcYGhLcGGBZ@B@qj7)870((2RF(vsDoVc9_s?;1
z_zfn~%JGfL=?fM6Z?Y=BNSyL-gvZ3L7~_<Wic?_^l^7VT?A-Ds@`=w&1u1em^tcip
zmzR2gX$MM*!_(&Y)EYBJCRazw4xc>z!u-nZ=$SdgnKSwqes1VUQDG!LF~NDVEd!s(
z495Ls)B;o;LB?oZ;7TPU{xFdpqQXhl!OER;l0>z`@X&hKr2AdSwtcrs_dqP>2DkJ5
z*++e<R*(9$KSqW+Y=0$=-9MS{U&wZk&OEesbnZd@JtB&@^yXu;hJ<O_q8{$yNxsIA
zt=%$SbCx{DU6vo^)V#n<=g7_cC;y`#-xoM=54bQ01V8`;KmY_l00ck)1V8`;KmY_L
z5x62(s(FEb^Od(Rz4U|I3FHMPp+X%9fB*=900@8p2!H?xfB*=900<m70xPmbYF;4x
zx9?i|4}WupL0;g%`56X*00@8p2!H?xfB*=900@8p2!OyO0#D18YF@zk&(k*--~8?O
zATKZp73x3$1V8`;KmY_l00ck)1V8`;K;Xa;xGGzu<^?|er$7Im!;Qy&3weP9=VurM
z0w4eaAOHd&00JNY0w4eaAOHfB2wamZ)x5wrKXB*96Wd>T8}b5^P@xV4KmY_l00ck)
z1V8`;KmY_l00a&k0h4TzniqKgFZ}r1@A#eH{xR|b2hPth2n0X?1V8`;KmY_l00ck)
z1V8`;CK0$USE_k|UpsW^D?j%pw*h&9NvKc<0w4eaAOHd&00JNY0w4eaAOHdfj=&As
zA~i4Y%WE(GWA77JddLeLI6uQ65C8!X009sH0T2KI5C8!X009t~M8GUps(FD=ztoL<
z@#~8o<OL?7LLCTz00@8p2!H?xfB*=900@8p2pl*97GjY_%?o_fbp8+j_-Vr_<OL3#
zpJ5OPfB*=900@8p2!H?xfB*=900>MXa9FNX^8)XV{mXAfqJRIf1yXlt>3`^!{x|uB
z7YKj=2!H?xfB*=900@8p2!H?xfWWJkz==bL&*_tVv&lBf;^`B5Qc5(L0!wq^QDW4R
zY?zuCc=o^C`OH6@mp&rr1&%J*bxXg#6kPn;qOf>&;j0V3N-FRI0T2KI5C8!X009sH
z0T2KI5YXw~baYmC;S_%}L<{8#Bd`+fyzX=+1-i&eEZ?9xqhF#qmTnlE?A{)2?6OkD
zDDib#;u+CMH;TqQEwUV2FW*o)h&Sr{lCD>q<-pvmZsk<Ko@UBrmN9x6jxARti{-lA
zFI^Um99v_IBF)joYsP$AGV%>0-JeM#QE8Wjt<BEr&KYjlk`>12Cc0Y8*RA$Ug=rYs
zhB3%DihSex_3N6EdD2N9m^w16yLu|~OsFkZ1fH*x&K*V&i5h0VWUSDlu|8-KuN(bh
z<FaIwDl}0i-(mT-cvB-%?I?>CX6AHP4Yy9(-R)9|=6GYF!WL>w!(zR@W=}NPLQk!^
zW~}fMF|=J^`p`J0P1+bnWUd*@ZCaok62lY;S!0(L>c$@5HnyAEX&GAT$#WJD&+2ZR
z;-B?!v?#I#W0Pq%8G&!G1V*2!MCkOLB}*v_OqYmK9M@;;=IA~0SS@RGK{La?AbFOp
zLu3|%%dU{73nUOEUSRilfgp1_2h6B670()LEC~X>MB;#S)5ufGvaFJRR%bcYU2~H_
zDHuJ9(Z;A8O>(FyVW5!cDP)QyLJBhU>&8r_XYBHAt|<FMwxvrbkq}|D{^&!L=ON4a
zA@Z~TcLeO=fBU|VT>Z^Ik@Etl7yd!F^w&$DU;6!}mzLhP)LeSQQgG?DOIMaoF220@
z`NfYezIX8#7n_UuMc?Ani;s}bc!2;2fB*=900@8p2!H?xfB*=*$_PAidPaBgq?>Cq
zgXeAQb^Ga4GrFrM#~#}4*UgVVI-|3ZzWdL|gQsh8^}6-(lX6=^V(6OjN}VaP?Yc>z
z1!iUay8Xl>Gdjab`T3S3iH%ba&*)Z8`UFNCW=cr4;h`Cw>7+}L*g}OTS&s@s3zBHN
zzItYfXmchZwS_W6@*f4d!_tDqY#}*>(~CsZsUV*hB}R~wBNE?qtX{W2xiF)1ok=i4
zhvW>DoC%qlWHgLTj+RJQtKCc<tsgrvqq}i3%`{k%^r@2!LZ0S0kpMV(d`5Taq_<tD
z$vFv;E;F|4)`#Y2bmvb-_wxzY%?}-uYt*EPNU|jhM`v_rPDUCeH6#~L&dGAz49BUY
zNadN?8J(qXzbQ}Gh=wA`3@`+u-Ec%^kYs4(QNJLx>rF-y3Hj4AvY{TjLGn%{*QDeQ
zti*&<hi7z`PszC+meAa<K7B~;?y8f7RYBYRq+ZsC+LZ))=xq|P%702g{k}l#gP-}U
zPkrjp=j6PA{>YDX<R4xj00JNY0{@>7_!Yf=K6K1;)^POL`|B3F!)9}>+stmC&9c5~
zUpG^0)>R)xIh-!?+iW#kttPY0WOf>@=GWRRuU%cc?l9Y}wpFXhmK!9O9#2^94o}Iu
zwH|5u*E;QTs9D*lmE7TtSjfYKv(;+e(@sg%z-l4AR*dl37`<)|ZPE3DZ&UEt1M8)7
zD89aG?Id_{$LV%%<hZtbtx+<SH-y&umcy6JZ^e_2OeP-A#yYipBPz0$N;OoZ!^yNO
zy+_5U9aESR0-2H{=h=?B)?$h6CT)(^cQc8wtr!SO8Rv#APz?*hI=8uAPC95|yS(m;
z)2&w6mWT*VTRX&Wy5qi7)3#o8xIDZy<E^^=(L$z_+==h>Vz#)ykl%E7-EJ<P=t=H|
zw;VNfn)%Y|YSp^lNv5dHXt9)&%Igl7f30F?9f4xFv`1$W@k*)KV?)_ccD0eCQ=PS5
z!rHCxR6=P_#pDyCRwlCJ&NdSpIcwS<-dM}kwpKmvNY?MH7M<Zz*P6~+ccRUj<lagY
z3K_a8#&&(?J&!w)5JlSJNJw5$@J1a?Up*-J#ge}p@&+^2X0+Ceme{m!!yT%$8-?|t
z*<R@ugO);Xebo{3?=-^OetT@kWi_SR#b%mj@;2I;*!Fn>8(CYjYtPgZ!AwhVBqEhu
z#+34<s_u9&KzB;bHUC~cLR;f?SI3g~@r_MipqsB`lHo#)O4XCKj7M;nd&SNgyBX)a
z-K|W-?b&SlSnqn<>0XU(u6i;tz7S4r?+Q+~>hk7%j-=EGt!6#Jwk^d8J!`ew&h6xF
z*&x5?+X@M->XzTSwr#KPxLA)fV(B(&dC_hcy5*cL*0V;EY;m=`owjDpxh*$ONvj@v
zr@OOT=*EgYsnDwNy`q_I=Xa#gdN7~f^*gBUE}i0YrkE?fM@LHSmOm6>oZV!(P*}@K
zt?k}w#Gh}j*)1ifwQk!IsIGfAo?0#OOxn@Ph!xtDu?E6b&-%8_Un|5Kg>6$$q{8dI
z-Rf4YTS(ID)ve85u(KKRZLY5SvZiu-Bc0Ei?adfn=~~OBR<D!hqf|Y{72FiJW~Iws
zcPx^qv+L#XX4kZx+1_4lHjBKi*4_$mUOu1Tnj8V^-|(2k*j8>cw3clLc8VTvwjAGc
zREvSNRiC}O$97%eb!nrtm!#dbMj==7Ih*UQ?R-14V-2*bVRvzzORw#$_11*dWI5(o
z^M-}&ddpj`t=HC^>CjfmTyAw@?QS3!_Q#}5x)E`+)nKRONvC%M!B{rUTB8mt?VxI%
z_HMNvGX*WFW^LEIvsQ{1w^IUFvuu>JQ7@O;_L$4fL^sz8x|`KnVncK|_Oi6S5^`AL
zVcy|0hm)1=rd{MaLdMdft=&>PD|tgEI@NZR;u}mPvKO*&!9XNP)0NE)+HLW2`Cv7i
zsjORfsGX`WmGrw(I~8|v*U|2!)@*)@n_Jr}G+W_a8?{^S<%1$)&UW?+F?XRF2#Ie0
z-mb@zt9M+kbkyq4mNtB;il<6;yv%O5$8vkNkiFDuyLnsC>(7}TYcAhLbu&XbVwqGu
zmuq(Y)k53P`W$)2ZQ`~!H$z>UKkRHc(xD6;UiW9+&6bIcM%$%OVmF*Jb34@t<u;{C
zHhadt%6S5{u-{TmBz@+9!x`}=TjfSaqB2s;pU+je9MkI*3d{~=t|aNKueW8bMESHk
zu}jr+&J9a`*SnoJZ5Dd5YPk_EvF`0cF_CkWcLmYr*!4#`1unx1tkahB6x;DytjWh(
zHAl4CSe59OEi7eAyPeg|olS4DBm~QCv(Rg1)-x7!c4sX~RnwHkVhfflRHW)jG|ZK?
zXgAJg=yE<*<eKa8me^(5kzzIEHm{{CEh=JiR4dLcvpH3;WF7e+(@K<VR3g6>v=^Hu
zUndt$JCjAS=ec5ZU^TGbrSnlIpV<hyvs|yV<8G|6U2&t3mttA7w~$SC%bt8C6yGtY
zwrr(@b<0;vo1%%D&l@wlBdtiNN$tdvT&WaDH}ZC}BL@<jjX*wbO<04REnbfM0z0*4
zz_HtH=QFn8rqg9B^jsOLBBX2KT*KOHZqSt-zo}soO3poVb+6r^==4^`-LRTFQj6hI
z!AvA;cZq8epUbnAFDDCSSFBsCCZZL4ySVOb2c>wK7VGT|CLOaCQ>L`Fy>2pPx3*fn
zmL=k{g#(?9T(DQ>f=<io9-Sz=yv=&7&a?K-NQ7?q&33P)waMoS8)9pFr^vaZHMeJP
z$7zX{6RuWh%kH2m8IQEnFh|0!QX-qmZe-%Uw42K3Z1vqB#jU2BUTd&oaX5u7YopoQ
z4pj1G=U&>Dw$$t0j?25gzL)gI;sFN}+VbS2J#Ke5kaBFh+ulkw8(lA0wu@Xg==SV5
zcl`-_M=BM9fmD=yzMu2iHnzlc&{^wrI8%4aVXMU~jc#t!5sd}u64@e{PO`)0y$x|s
z+LSuQY;Y}^-rT8HQ&OkRw4GF>&epc}%3`3DOgWmCnytFsZ8d8pinkYbB94u8an)7v
zc8f7fcs(CWW<!Nur@SVbeJyvA_3t*<Em=#-Q{Su84Np0nH5YsykA2T$-{pOR)D&8&
zV3MuSiKs+n{gQ=q2I>w|T6ECFcE+CFw6?wORg2pu<eXtH*4#2@By+EmWHYf&R}9CZ
zu0&_EP;m)mSE#fp+RcF`6ZY6QlAFm)DrJioi~h7%T#p5|-6@C1AMn|7*(lHX8{55}
z)Uj{To)SgTbgWd!de%i}V7pdo?(U?vD64fh8%%85OTC7v8?dswk|;Rs;;xN+VT9YO
zJ9cu}$Oe^+*_iESc#jr^OskW~Q%pR~#^O}SY>G7Pb@!g%oNJeA-W@7Xt+>LO&3vZV
z^L8EXZY)}Bml7S9lr5}UJ(W&+yIIe-d9k;XBF3>amD%0fUayz8>t;sik%eDlYdL<4
z_jWkCVzTqGuD@8{Dkr6?Yo{4cu5CH9EsMpoM+-tR6iAVy?s56JtL6nB`R~8`z8By4
z=x@u(0{zmLbmSjiAOHd&00JNY0w4eaAOHd&00JNY0<S^>7Y~Py-S6WbV%7@z+5bC&
zm%sSj=l=A@%NP53f$!;-zV|9L94dnV2!H?xfB*=900@8p2!H?xfB*<gCoq5b?6JX@
GJpV5k>nXJW

literal 0
HcmV?d00001

diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Address.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Address.cs
index d76bc52a..79be9c5b 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Address.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Address.cs
@@ -1,27 +1,24 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class Address
 {
-    public class Address
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        [Required, MaxLength(100)]
-        public string Name { get; set; }
+	[Required, MaxLength(100)]
+	public string Name { get; set; }
 
-        [Required, MaxLength(100)]
-        public string Line1 { get; set; }
+	[Required, MaxLength(100)]
+	public string Line1 { get; set; }
 
-        [MaxLength(100)]
-        public string Line2 { get; set; }
+	[MaxLength(100)]
+	public string Line2 { get; set; }
 
-        [Required, MaxLength(50)]
-        public string City { get; set; }
+	[Required, MaxLength(50)]
+	public string City { get; set; }
 
-        [Required, MaxLength(20)]
-        public string Region { get; set; }
+	[Required, MaxLength(20)]
+	public string Region { get; set; }
 
-        [Required, MaxLength(20)]
-        public string PostalCode { get; set; }
-    }
+	[Required, MaxLength(20)]
+	public string PostalCode { get; set; }
 }
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index f7b7dd02..fb17e53b 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -3,8 +3,13 @@
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
+	<ItemGroup>
+		<Using Include="System.ComponentModel.DataAnnotations" />
+	</ItemGroup>
+	
   <ItemGroup>
     <ProjectReference Include="..\BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj" />
   </ItemGroup>
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/LatLong.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/LatLong.cs
index 9b8c3811..14a94c26 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/LatLong.cs
@@ -1,27 +1,26 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class LatLong
 {
-    public class LatLong
-    {
-        public LatLong()
-        {
-        }
+	public LatLong()
+	{
+	}
 
-        public LatLong(double latitude, double longitude) : this()
-        {
-            Latitude = latitude;
-            Longitude = longitude;
-        }
+	public LatLong(double latitude, double longitude) : this()
+	{
+		Latitude = latitude;
+		Longitude = longitude;
+	}
 
-        public double Latitude { get; set; }
+	public double Latitude { get; set; }
 
-        public double Longitude { get; set; }
+	public double Longitude { get; set; }
 
-        public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-        {
-            // The Earth is flat, right? So no need for spherical interpolation.
-            return new LatLong(
-                start.Latitude + (end.Latitude - start.Latitude) * proportion,
-                start.Longitude + (end.Longitude - start.Longitude) * proportion);
-        }
-    }
-}
+	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+	{
+		// The Earth is flat, right? So no need for spherical interpolation.
+		return new LatLong(
+				start.Latitude + (end.Latitude - start.Latitude) * proportion,
+				start.Longitude + (end.Longitude - start.Longitude) * proportion);
+	}
+}
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/NotificationSubscription.cs
index 04259c2f..9109ff57 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/NotificationSubscription.cs
@@ -1,17 +1,14 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class NotificationSubscription
 {
-    public class NotificationSubscription
-    {
-        public int NotificationSubscriptionId { get; set; }
+	public int NotificationSubscriptionId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public string Url { get; set; }
+	public string Url { get; set; }
 
-        public string P256dh { get; set; }
+	public string P256dh { get; set; }
 
-        public string Auth { get; set; }
-    }
+	public string Auth { get; set; }
 }
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Order.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Order.cs
index fb003bd6..aca04ca1 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Order.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Order.cs
@@ -1,25 +1,32 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Order
 {
-    public class Order
-    {
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public DateTime CreatedTime { get; set; }
+	public DateTime CreatedTime { get; set; }
 
-        public Address DeliveryAddress { get; set; } = new Address();
+	public Address DeliveryAddress { get; set; } = new Address();
 
-        public LatLong DeliveryLocation { get; set; }
+	public LatLong DeliveryLocation { get; set; }
 
-        public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-        public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-        public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
-    }
+	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(Order))]
+[JsonSerializable(typeof(OrderWithStatus))]
+[JsonSerializable(typeof(List<OrderWithStatus>))]
+[JsonSerializable(typeof(Pizza))]
+[JsonSerializable(typeof(List<PizzaSpecial>))]
+[JsonSerializable(typeof(List<Topping>))]
+[JsonSerializable(typeof(Topping))]
+public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/OrderWithStatus.cs
index 021de78c..f5f153b6 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/OrderWithStatus.cs
@@ -1,79 +1,78 @@
-using BlazingPizza.ComponentsLibrary.Map;
-using System;
-using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using BlazingPizza.ComponentsLibrary.Map;
 
-namespace BlazingPizza
+
+namespace BlazingPizza;
+
+public class OrderWithStatus
 {
-    public class OrderWithStatus
-    {
-        public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-        public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-        public Order Order { get; set; }
+	public Order Order { get; set; }
 
-        public string StatusText { get; set; }
+	public string StatusText { get; set; }
 
-        public bool IsDelivered => StatusText == "Delivered";
+	public bool IsDelivered => StatusText == "Delivered";
 
-        public List<Marker> MapMarkers { get; set; }
+	public List<Marker> MapMarkers { get; set; }
 
-        public static OrderWithStatus FromOrder(Order order)
-        {
-            // To simulate a real backend process, we fake status updates based on the amount
-            // of time since the order was placed
-            string statusText;
-            List<Marker> mapMarkers;
-            var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+	public static OrderWithStatus FromOrder(Order order)
+	{
+		// To simulate a real backend process, we fake status updates based on the amount
+		// of time since the order was placed
+		string statusText;
+		List<Marker> mapMarkers;
+		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-            if (DateTime.Now < dispatchTime)
-            {
-                statusText = "Preparing";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-                };
-            }
-            else if (DateTime.Now < dispatchTime + DeliveryDuration)
-            {
-                statusText = "Out for delivery";
+		if (DateTime.Now < dispatchTime)
+		{
+			statusText = "Preparing";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+								};
+		}
+		else if (DateTime.Now < dispatchTime + DeliveryDuration)
+		{
+			statusText = "Out for delivery";
 
-                var startPosition = ComputeStartPosition(order);
-                var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-                var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation),
-                    ToMapMarker("Driver", driverPosition, showPopup: true),
-                };
-            }
-            else
-            {
-                statusText = "Delivered";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-                };
-            }
+			var startPosition = ComputeStartPosition(order);
+			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation),
+										ToMapMarker("Driver", driverPosition, showPopup: true),
+								};
+		}
+		else
+		{
+			statusText = "Delivered";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+								};
+		}
 
-            return new OrderWithStatus
-            {
-                Order = order,
-                StatusText = statusText,
-                MapMarkers = mapMarkers,
-            };
-        }
+		return new OrderWithStatus
+		{
+			Order = order,
+			StatusText = statusText,
+			MapMarkers = mapMarkers,
+		};
+	}
 
-        private static LatLong ComputeStartPosition(Order order)
-        {
-            // Random but deterministic based on order ID
-            var rng = new Random(order.OrderId);
-            var distance = 0.01 + rng.NextDouble() * 0.02;
-            var angle = rng.NextDouble() * Math.PI * 2;
-            var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-            return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-        }
+	private static LatLong ComputeStartPosition(Order order)
+	{
+		// Random but deterministic based on order ID
+		var rng = new Random(order.OrderId);
+		var distance = 0.01 + rng.NextDouble() * 0.02;
+		var angle = rng.NextDouble() * Math.PI * 2;
+		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+	}
 
-        static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
-    }
-}
+	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+}
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Pizza.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Pizza.cs
index ec1108a9..459298f4 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Pizza.cs
@@ -1,42 +1,44 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+///    /// Represents a customized pizza as part of an order
+/// </summary>
+public class Pizza
 {
-    /// <summary>
-    /// Represents a customized pizza as part of an order
-    /// </summary>
-    public class Pizza
-    {
-        public const int DefaultSize = 12;
-        public const int MinimumSize = 9;
-        public const int MaximumSize = 17;
+	public const int DefaultSize = 12;
+	public const int MinimumSize = 9;
+	public const int MaximumSize = 17;
 
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public PizzaSpecial Special { get; set; }
+	public PizzaSpecial Special { get; set; }
 
-        public int SpecialId { get; set; }
+	public int SpecialId { get; set; }
 
-        public int Size { get; set; }
+	public int Size { get; set; }
 
-        public List<PizzaTopping> Toppings { get; set; }
+	public List<PizzaTopping> Toppings { get; set; }
 
-        public decimal GetBasePrice()
-        {
-            return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-        }
+	public decimal GetBasePrice()
+	{
+		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+	}
 
-        public decimal GetTotalPrice()
-        {
-            return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-        }
+	public decimal GetTotalPrice()
+	{
+		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+	}
 
-        public string GetFormattedTotalPrice()
-        {
-            return GetTotalPrice().ToString("0.00");
-        }
-    }
+	public string GetFormattedTotalPrice()
+	{
+		return GetTotalPrice().ToString("0.00");
+	}
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
+[JsonSerializable(typeof(Pizza))]
+public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaSpecial.cs
index 2f2b3383..9653300c 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaSpecial.cs
@@ -1,20 +1,19 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+/// Represents a pre-configured template for a pizza a user can order
+/// </summary>
+public class PizzaSpecial
 {
-    /// <summary>
-    /// Represents a pre-configured template for a pizza a user can order
-    /// </summary>
-    public class PizzaSpecial
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal BasePrice { get; set; }
+	public decimal BasePrice { get; set; }
 
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public string ImageUrl { get; set; }
+	public string ImageUrl { get; set; }
 
-        public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
-    }
-}
+	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+}
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaTopping.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaTopping.cs
index f5a6c1ac..0a711647 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaTopping.cs
@@ -1,11 +1,11 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class PizzaTopping
 {
-    public class PizzaTopping
-    {
-        public Topping Topping { get; set; }
+	public Topping Topping { get; set; }
+
+	public int ToppingId { get; set; }
 
-        public int ToppingId { get; set; }
-        
-        public int PizzaId { get; set; }
-    }
-}
+	public int PizzaId { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Topping.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Topping.cs
index 61bdeb92..376c311a 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Topping.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Topping.cs
@@ -1,13 +1,13 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Topping
 {
-    public class Topping
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal Price { get; set; }
+	public decimal Price { get; set; }
 
-        public string GetFormattedPrice() => Price.ToString("0.00");
-    }
-}
+	public string GetFormattedPrice() => Price.ToString("0.00");
+	
+}
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/UserInfo.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/UserInfo.cs
index 4996ef80..362f8f8e 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/UserInfo.cs
@@ -1,9 +1,9 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class UserInfo
 {
-    public class UserInfo
-    {
-        public bool IsAuthenticated { get; set; }
+	public bool IsAuthenticated { get; set; }
 
-        public string Name { get; set; }
-    }
-}
+	public string Name { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj
index 663677a1..44802d79 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -2,16 +2,19 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer"  Version="$(BlazorVersion)" PrivateAssets="all"  />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="$(SystemNetHttpJsonVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\BlazingComponents\BlazingComponents.csproj" />
     <ProjectReference Include="..\BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj" />
     <ProjectReference Include="..\BlazingPizza.Shared\BlazingPizza.Shared.csproj" />
   </ItemGroup>
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/JSRuntimeExtensions.cs b/save-points/07-javascript-interop/BlazingPizza.Client/JSRuntimeExtensions.cs
index 89da520c..cc242348 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/JSRuntimeExtensions.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/JSRuntimeExtensions.cs
@@ -1,13 +1,11 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.Client
+namespace BlazingPizza.Client;
+
+public static class JSRuntimeExtensions
 {
-    public static class JSRuntimeExtensions
-    {
-        public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
-        {
-            return jsRuntime.InvokeAsync<bool>("confirm", message);
-        }
-    }
+	public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
+	{
+		return jsRuntime.InvokeAsync<bool>("confirm", message);
+	}
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/OrderState.cs b/save-points/07-javascript-interop/BlazingPizza.Client/OrderState.cs
index 5265ae39..4f47979d 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/OrderState.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/OrderState.cs
@@ -1,55 +1,52 @@
-using System.Collections.Generic;
+namespace BlazingPizza.Client;
 
-namespace BlazingPizza.Client
+public class OrderState
 {
-    public class OrderState
-    {
-        public bool ShowingConfigureDialog { get; private set; }
-
-        public Pizza ConfiguringPizza { get; private set; }
-
-        public Order Order { get; private set; } = new Order();
-
-        public void ShowConfigurePizzaDialog(PizzaSpecial special)
-        {
-            ConfiguringPizza = new Pizza()
-            {
-                Special = special,
-                SpecialId = special.Id,
-                Size = Pizza.DefaultSize,
-                Toppings = new List<PizzaTopping>(),
-            };
-
-            ShowingConfigureDialog = true;
-        }
-
-        public void CancelConfigurePizzaDialog()
-        {
-            ConfiguringPizza = null;
-            ShowingConfigureDialog = false;
-        }
-
-        public void ConfirmConfigurePizzaDialog()
-        {
-            Order.Pizzas.Add(ConfiguringPizza);
-            ConfiguringPizza = null;
-
-            ShowingConfigureDialog = false;
-        }
-
-        public void RemoveConfiguredPizza(Pizza pizza)
-        {
-            Order.Pizzas.Remove(pizza);
-        }
-
-        public void ResetOrder()
-        {
-            Order = new Order();
-        }
-
-        public void ReplaceOrder(Order order)
-        {
-            Order = order;
-        }
-    }
+	public bool ShowingConfigureDialog { get; private set; }
+
+	public Pizza ConfiguringPizza { get; private set; }
+
+	public Order Order { get; private set; } = new Order();
+
+	public void ShowConfigurePizzaDialog(PizzaSpecial special)
+	{
+		ConfiguringPizza = new Pizza()
+		{
+			Special = special,
+			SpecialId = special.Id,
+			Size = Pizza.DefaultSize,
+			Toppings = new List<PizzaTopping>(),
+		};
+
+		ShowingConfigureDialog = true;
+	}
+
+	public void CancelConfigurePizzaDialog()
+	{
+		ConfiguringPizza = null;
+		ShowingConfigureDialog = false;
+	}
+
+	public void ConfirmConfigurePizzaDialog()
+	{
+		Order.Pizzas.Add(ConfiguringPizza);
+		ConfiguringPizza = null;
+
+		ShowingConfigureDialog = false;
+	}
+
+	public void RemoveConfiguredPizza(Pizza pizza)
+	{
+		Order.Pizzas.Remove(pizza);
+	}
+
+	public void ResetOrder()
+	{
+		Order = new Order();
+	}
+
+	public void ReplaceOrder(Order order)
+	{
+		Order = order;
+	}
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/OrdersClient.cs b/save-points/07-javascript-interop/BlazingPizza.Client/OrdersClient.cs
index 0f800e6f..e63bd045 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/OrdersClient.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/OrdersClient.cs
@@ -1,35 +1,36 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Threading.Tasks;
-
-namespace BlazingPizza.Client
+using System.Net.Http.Json;
+using System.Text.Json;
+
+namespace BlazingPizza.Client;
+
+public class OrdersClient
 {
-    public class OrdersClient
-    {
-        private readonly HttpClient httpClient;
+	private readonly HttpClient httpClient;
+
+	public OrdersClient(HttpClient httpClient)
+	{
+		this.httpClient = httpClient;
+	}
 
-        public OrdersClient(HttpClient httpClient)
-        {
-            this.httpClient = httpClient;
-        }
+	public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
+			await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
 
-        public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
-            await httpClient.GetFromJsonAsync<IEnumerable<OrderWithStatus>>("orders");
 
+	public async Task<OrderWithStatus> GetOrder(int orderId) =>
+			await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
 
-        public async Task<OrderWithStatus> GetOrder(int orderId) =>
-            await httpClient.GetFromJsonAsync<OrderWithStatus>($"orders/{orderId}");
 
+	public async Task<int> PlaceOrder(Order order)
+	{
+		var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
+		response.EnsureSuccessStatusCode();
+		var orderId = await response.Content.ReadFromJsonAsync<int>();
+		return orderId;
+	}
 
-        public async Task<int> PlaceOrder(Order order)
-        {
-            var response = await httpClient.PostAsJsonAsync("orders", order);
-            response.EnsureSuccessStatusCode();
-            var orderId = await response.Content.ReadFromJsonAsync<int>();
-            return orderId;
-        }
-    }
-}
\ No newline at end of file
+	public async Task SubscribeToNotifications(NotificationSubscription subscription)
+	{
+		var response = await httpClient.PutAsJsonAsync("notifications/subscribe", subscription);
+		response.EnsureSuccessStatusCode();
+	}
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/PizzaAuthenticationState.cs b/save-points/07-javascript-interop/BlazingPizza.Client/PizzaAuthenticationState.cs
index 3f295928..f5bfef65 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/PizzaAuthenticationState.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/PizzaAuthenticationState.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 
-namespace BlazingPizza.Client
+namespace BlazingPizza.Client;
+
+public class PizzaAuthenticationState : RemoteAuthenticationState
 {
-    public class PizzaAuthenticationState : RemoteAuthenticationState
-    {
-        public Order Order { get; set; }
-    }
+	public Order Order { get; set; }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs b/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs
index afeee128..41eedccb 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs
@@ -1,31 +1,20 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
+using BlazingPizza.Client;
 
-namespace BlazingPizza.Client
-{
-    public class Program
-    {
-        public static async Task Main(string[] args)
-        {
-            var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("#app");
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<App>("#app");
 
-            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
-            builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
-                .AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
-            builder.Services.AddScoped<OrderState>();
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
+		.AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
+builder.Services.AddScoped<OrderState>();
 
-            // Add auth services
-            builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
-            {
-                options.AuthenticationPaths.LogOutSucceededPath = "";
-            });
+// Add auth services
+builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
+{
+	options.AuthenticationPaths.LogOutSucceededPath = "";
+});
 
-            await builder.Build().RunAsync();
-        }
-    }
-}
+await builder.Build().RunAsync();
diff --git a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 61ebf623..cb996b1b 100644
--- a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index f36b098e..bb84f13c 100644
--- a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -1,17 +1,15 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.ComponentsLibrary
+namespace BlazingPizza.ComponentsLibrary;
+
+public static class LocalStorage
 {
-    public static class LocalStorage
-    {
-        public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-        public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-        public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
-    }
-}
+	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+}
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index 63006067..a8e78f2a 100644
--- a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -1,13 +1,12 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Marker
 {
-    public class Marker
-    {
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public double X { get; set; }
+	public double X { get; set; }
 
-        public double Y { get; set; }
+	public double Y { get; set; }
 
-        public bool ShowPopup { get; set; }
-    }
+	public bool ShowPopup { get; set; }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 03841826..349046d4 100644
--- a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -1,9 +1,8 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Point
 {
-    public class Point
-    {
-        public double X { get; set; }
+	public double X { get; set; }
 
-        public double Y { get; set; }
-    }
-}
+	public double Y { get; set; }
+}
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/07-javascript-interop/BlazingPizza.Server/BlazingPizza.Server.csproj
index b9c74fc4..abd2317b 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,6 +14,7 @@
     <PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EntityFrameworkVersion)" />
+    <PackageReference Include="WebPush" Version="1.0.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/AddressEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/AddressEntityType.cs
new file mode 100644
index 00000000..82db81b6
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/AddressEntityType.cs
@@ -0,0 +1,92 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class AddressEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Address",
+                typeof(Address),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Address).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var city = runtimeEntityType.AddProperty(
+                "City",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("City", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<City>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var line1 = runtimeEntityType.AddProperty(
+                "Line1",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var line2 = runtimeEntityType.AddProperty(
+                "Line2",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var postalCode = runtimeEntityType.AddProperty(
+                "PostalCode",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("PostalCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<PostalCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var region = runtimeEntityType.AddProperty(
+                "Region",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Region", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Region>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Address");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
new file mode 100644
index 00000000..1dd4563b
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
@@ -0,0 +1,114 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class DeviceFlowCodesEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes",
+                typeof(DeviceFlowCodes),
+                baseEntityType);
+
+            var userCode = runtimeEntityType.AddProperty(
+                "UserCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("UserCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<UserCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var deviceCode = runtimeEntityType.AddProperty(
+                "DeviceCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("DeviceCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<DeviceCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userCode });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deviceCode },
+                unique: true);
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DeviceCodes");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
new file mode 100644
index 00000000..8946b261
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>",
+                typeof(IdentityRoleClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoleClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityRoleEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
new file mode 100644
index 00000000..2f1fec2b
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
@@ -0,0 +1,78 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRole",
+                typeof(IdentityRole),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedName = runtimeEntityType.AddProperty(
+                "NormalizedName",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("NormalizedName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<NormalizedName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedName },
+                unique: true);
+            index.AddAnnotation("Relational:Name", "RoleNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
new file mode 100644
index 00000000..55418a1e
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserClaim<string>",
+                typeof(IdentityUserClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
new file mode 100644
index 00000000..3ca029bd
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserLoginstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserLogin<string>",
+                typeof(IdentityUserLogin<string>),
+                baseEntityType);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerKey = runtimeEntityType.AddProperty(
+                "ProviderKey",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderKey", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderKey>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerDisplayName = runtimeEntityType.AddProperty(
+                "ProviderDisplayName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderDisplayName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderDisplayName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { loginProvider, providerKey });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserLogins");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
new file mode 100644
index 00000000..70078d7a
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
@@ -0,0 +1,82 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserRolestringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserRole<string>",
+                typeof(IdentityUserRole<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, roleId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
new file mode 100644
index 00000000..93ba6d31
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
@@ -0,0 +1,84 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserTokenstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserToken<string>",
+                typeof(IdentityUserToken<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var value = runtimeEntityType.AddProperty(
+                "Value",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Value", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Value>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, loginProvider, name });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserTokens");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/KeyEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/KeyEntityType.cs
new file mode 100644
index 00000000..f6c6b4c7
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/KeyEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class KeyEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.Key",
+                typeof(Key),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var algorithm = runtimeEntityType.AddProperty(
+                "Algorithm",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Algorithm", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Algorithm>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var created = runtimeEntityType.AddProperty(
+                "Created",
+                typeof(DateTime),
+                propertyInfo: typeof(Key).GetProperty("Created", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Created>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var dataProtected = runtimeEntityType.AddProperty(
+                "DataProtected",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("DataProtected", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<DataProtected>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var isX509Certificate = runtimeEntityType.AddProperty(
+                "IsX509Certificate",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("IsX509Certificate", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<IsX509Certificate>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var use = runtimeEntityType.AddProperty(
+                "Use",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Use", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Use>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var version = runtimeEntityType.AddProperty(
+                "Version",
+                typeof(int),
+                propertyInfo: typeof(Key).GetProperty("Version", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Version>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { use });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Keys");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/LatLongEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/LatLongEntityType.cs
new file mode 100644
index 00000000..3fd254bd
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/LatLongEntityType.cs
@@ -0,0 +1,80 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class LatLongEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.LatLong",
+                typeof(LatLong),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var latitude = runtimeEntityType.AddProperty(
+                "Latitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Latitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Latitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var longitude = runtimeEntityType.AddProperty(
+                "Longitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Longitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Longitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                ownership: true);
+
+            var deliveryLocation = principalEntityType.AddNavigation("DeliveryLocation",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(LatLong),
+                propertyInfo: typeof(Order).GetProperty("DeliveryLocation", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryLocation>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
new file mode 100644
index 00000000..db236e4c
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
@@ -0,0 +1,77 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class NotificationSubscriptionEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.NotificationSubscription",
+                typeof(NotificationSubscription),
+                baseEntityType);
+
+            var notificationSubscriptionId = runtimeEntityType.AddProperty(
+                "NotificationSubscriptionId",
+                typeof(int),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("NotificationSubscriptionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<NotificationSubscriptionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var auth = runtimeEntityType.AddProperty(
+                "Auth",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Auth", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Auth>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var p256dh = runtimeEntityType.AddProperty(
+                "P256dh",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("P256dh", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<P256dh>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var url = runtimeEntityType.AddProperty(
+                "Url",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Url", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Url>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { notificationSubscriptionId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "NotificationSubscriptions");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/OrderEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/OrderEntityType.cs
new file mode 100644
index 00000000..9d9ec6fd
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/OrderEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class OrderEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Order",
+                typeof(Order),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Order).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var createdTime = runtimeEntityType.AddProperty(
+                "CreatedTime",
+                typeof(DateTime),
+                propertyInfo: typeof(Order).GetProperty("CreatedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<CreatedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var deliveryAddressId = runtimeEntityType.AddProperty(
+                "DeliveryAddressId",
+                typeof(int?),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(Order).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deliveryAddressId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("DeliveryAddressId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var deliveryAddress = declaringEntityType.AddNavigation("DeliveryAddress",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Address),
+                propertyInfo: typeof(Order).GetProperty("DeliveryAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/PersistedGrantEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
new file mode 100644
index 00000000..842d53a5
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
@@ -0,0 +1,127 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PersistedGrantEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.PersistedGrant",
+                typeof(PersistedGrant),
+                baseEntityType);
+
+            var key = runtimeEntityType.AddProperty(
+                "Key",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Key", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Key>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var consumedTime = runtimeEntityType.AddProperty(
+                "ConsumedTime",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ConsumedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ConsumedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(PersistedGrant).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var type = runtimeEntityType.AddProperty(
+                "Type",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Type", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Type>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var key0 = runtimeEntityType.AddKey(
+                new[] { key });
+            runtimeEntityType.SetPrimaryKey(key0);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { consumedTime });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            var index1 = runtimeEntityType.AddIndex(
+                new[] { subjectId, clientId, type });
+
+            var index2 = runtimeEntityType.AddIndex(
+                new[] { subjectId, sessionId, type });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PersistedGrants");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaEntityType.cs
new file mode 100644
index 00000000..3a124e63
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaEntityType.cs
@@ -0,0 +1,111 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Pizza",
+                typeof(Pizza),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var size = runtimeEntityType.AddProperty(
+                "Size",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Size", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Size>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var specialId = runtimeEntityType.AddProperty(
+                "SpecialId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("SpecialId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<SpecialId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { orderId });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { specialId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var pizzas = principalEntityType.AddNavigation("Pizzas",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<Pizza>),
+                propertyInfo: typeof(Order).GetProperty("Pizzas", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<Pizzas>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("SpecialId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var special = declaringEntityType.AddNavigation("Special",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(PizzaSpecial),
+                propertyInfo: typeof(Pizza).GetProperty("Special", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Special>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Pizzas");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
new file mode 100644
index 00000000..e86b0f50
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
@@ -0,0 +1,76 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaSpecialEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaSpecial",
+                typeof(PizzaSpecial),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var basePrice = runtimeEntityType.AddProperty(
+                "BasePrice",
+                typeof(decimal),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("BasePrice", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<BasePrice>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var imageUrl = runtimeEntityType.AddProperty(
+                "ImageUrl",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("ImageUrl", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<ImageUrl>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Specials");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaStoreContextModel.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
new file mode 100644
index 00000000..8b516a68
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
@@ -0,0 +1,28 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    [DbContext(typeof(PizzaStoreContext))]
+    public partial class PizzaStoreContextModel : RuntimeModel
+    {
+        static PizzaStoreContextModel()
+        {
+            var model = new PizzaStoreContextModel();
+            model.Initialize();
+            model.Customize();
+            _instance = model;
+        }
+
+        private static PizzaStoreContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
new file mode 100644
index 00000000..d46f50f4
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
@@ -0,0 +1,69 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    public partial class PizzaStoreContextModel
+    {
+        partial void Initialize()
+        {
+            var address = AddressEntityType.Create(this);
+            var latLong = LatLongEntityType.Create(this);
+            var notificationSubscription = NotificationSubscriptionEntityType.Create(this);
+            var order = OrderEntityType.Create(this);
+            var pizza = PizzaEntityType.Create(this);
+            var pizzaSpecial = PizzaSpecialEntityType.Create(this);
+            var pizzaTopping = PizzaToppingEntityType.Create(this);
+            var pizzaStoreUser = PizzaStoreUserEntityType.Create(this);
+            var topping = ToppingEntityType.Create(this);
+            var deviceFlowCodes = DeviceFlowCodesEntityType.Create(this);
+            var key = KeyEntityType.Create(this);
+            var persistedGrant = PersistedGrantEntityType.Create(this);
+            var identityRole = IdentityRoleEntityType.Create(this);
+            var identityRoleClaimstring = IdentityRoleClaimstringEntityType.Create(this);
+            var identityUserClaimstring = IdentityUserClaimstringEntityType.Create(this);
+            var identityUserLoginstring = IdentityUserLoginstringEntityType.Create(this);
+            var identityUserRolestring = IdentityUserRolestringEntityType.Create(this);
+            var identityUserTokenstring = IdentityUserTokenstringEntityType.Create(this);
+
+            LatLongEntityType.CreateForeignKey1(latLong, order);
+            OrderEntityType.CreateForeignKey1(order, address);
+            PizzaEntityType.CreateForeignKey1(pizza, order);
+            PizzaEntityType.CreateForeignKey2(pizza, pizzaSpecial);
+            PizzaToppingEntityType.CreateForeignKey1(pizzaTopping, pizza);
+            PizzaToppingEntityType.CreateForeignKey2(pizzaTopping, topping);
+            IdentityRoleClaimstringEntityType.CreateForeignKey1(identityRoleClaimstring, identityRole);
+            IdentityUserClaimstringEntityType.CreateForeignKey1(identityUserClaimstring, pizzaStoreUser);
+            IdentityUserLoginstringEntityType.CreateForeignKey1(identityUserLoginstring, pizzaStoreUser);
+            IdentityUserRolestringEntityType.CreateForeignKey1(identityUserRolestring, identityRole);
+            IdentityUserRolestringEntityType.CreateForeignKey2(identityUserRolestring, pizzaStoreUser);
+            IdentityUserTokenstringEntityType.CreateForeignKey1(identityUserTokenstring, pizzaStoreUser);
+
+            AddressEntityType.CreateAnnotations(address);
+            LatLongEntityType.CreateAnnotations(latLong);
+            NotificationSubscriptionEntityType.CreateAnnotations(notificationSubscription);
+            OrderEntityType.CreateAnnotations(order);
+            PizzaEntityType.CreateAnnotations(pizza);
+            PizzaSpecialEntityType.CreateAnnotations(pizzaSpecial);
+            PizzaToppingEntityType.CreateAnnotations(pizzaTopping);
+            PizzaStoreUserEntityType.CreateAnnotations(pizzaStoreUser);
+            ToppingEntityType.CreateAnnotations(topping);
+            DeviceFlowCodesEntityType.CreateAnnotations(deviceFlowCodes);
+            KeyEntityType.CreateAnnotations(key);
+            PersistedGrantEntityType.CreateAnnotations(persistedGrant);
+            IdentityRoleEntityType.CreateAnnotations(identityRole);
+            IdentityRoleClaimstringEntityType.CreateAnnotations(identityRoleClaimstring);
+            IdentityUserClaimstringEntityType.CreateAnnotations(identityUserClaimstring);
+            IdentityUserLoginstringEntityType.CreateAnnotations(identityUserLoginstring);
+            IdentityUserRolestringEntityType.CreateAnnotations(identityUserRolestring);
+            IdentityUserTokenstringEntityType.CreateAnnotations(identityUserTokenstring);
+
+            AddAnnotation("ProductVersion", "6.0.0");
+        }
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
new file mode 100644
index 00000000..18b2d96d
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
@@ -0,0 +1,156 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaStoreUserEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Server.PizzaStoreUser",
+                typeof(PizzaStoreUser),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var accessFailedCount = runtimeEntityType.AddProperty(
+                "AccessFailedCount",
+                typeof(int),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("AccessFailedCount", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<AccessFailedCount>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var email = runtimeEntityType.AddProperty(
+                "Email",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Email", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Email>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var emailConfirmed = runtimeEntityType.AddProperty(
+                "EmailConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("EmailConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<EmailConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnabled = runtimeEntityType.AddProperty(
+                "LockoutEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnd = runtimeEntityType.AddProperty(
+                "LockoutEnd",
+                typeof(DateTimeOffset?),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnd", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnd>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var normalizedEmail = runtimeEntityType.AddProperty(
+                "NormalizedEmail",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedEmail", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedEmail>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedUserName = runtimeEntityType.AddProperty(
+                "NormalizedUserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedUserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedUserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var passwordHash = runtimeEntityType.AddProperty(
+                "PasswordHash",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PasswordHash", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PasswordHash>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumber = runtimeEntityType.AddProperty(
+                "PhoneNumber",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumber", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumber>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumberConfirmed = runtimeEntityType.AddProperty(
+                "PhoneNumberConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumberConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumberConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var securityStamp = runtimeEntityType.AddProperty(
+                "SecurityStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("SecurityStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<SecurityStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var twoFactorEnabled = runtimeEntityType.AddProperty(
+                "TwoFactorEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("TwoFactorEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<TwoFactorEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var userName = runtimeEntityType.AddProperty(
+                "UserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("UserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<UserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedEmail });
+            index.AddAnnotation("Relational:Name", "EmailIndex");
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { normalizedUserName },
+                unique: true);
+            index0.AddAnnotation("Relational:Name", "UserNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUsers");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaToppingEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
new file mode 100644
index 00000000..b97d2a24
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaTopping",
+                typeof(PizzaTopping),
+                baseEntityType);
+
+            var pizzaId = runtimeEntityType.AddProperty(
+                "PizzaId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("PizzaId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<PizzaId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var toppingId = runtimeEntityType.AddProperty(
+                "ToppingId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("ToppingId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<ToppingId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { pizzaId, toppingId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { toppingId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PizzaId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var toppings = principalEntityType.AddNavigation("Toppings",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<PizzaTopping>),
+                propertyInfo: typeof(Pizza).GetProperty("Toppings", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Toppings>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("ToppingId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var topping = declaringEntityType.AddNavigation("Topping",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Topping),
+                propertyInfo: typeof(PizzaTopping).GetProperty("Topping", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<Topping>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PizzaTopping");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Models/ToppingEntityType.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Models/ToppingEntityType.cs
new file mode 100644
index 00000000..9295f9bf
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Models/ToppingEntityType.cs
@@ -0,0 +1,62 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class ToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Topping",
+                typeof(Topping),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Topping).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Topping).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var price = runtimeEntityType.AddProperty(
+                "Price",
+                typeof(decimal),
+                propertyInfo: typeof(Topping).GetProperty("Price", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Price>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Toppings");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/NotificationsController.cs b/save-points/07-javascript-interop/BlazingPizza.Server/NotificationsController.cs
deleted file mode 100644
index bb3b96ff..00000000
--- a/save-points/07-javascript-interop/BlazingPizza.Server/NotificationsController.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("notifications")]
-    [ApiController]
-    [Authorize]
-    public class NotificationsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public NotificationsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpPut("subscribe")]
-        public async Task<NotificationSubscription> Subscribe(NotificationSubscription subscription)
-        {
-            // We're storing at most one subscription per user, so delete old ones.
-            // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-            var userId = GetUserId();
-            var oldSubscriptions = _db.NotificationSubscriptions.Where(e => e.UserId == userId);
-            _db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
-
-            // Store new subscription
-            subscription.UserId = userId;
-            _db.NotificationSubscriptions.Attach(subscription);
-
-            await _db.SaveChangesAsync();
-            return subscription;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-    }
-}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/07-javascript-interop/BlazingPizza.Server/OidcConfigurationController.cs
index c074debf..dc75ecb3 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/OidcConfigurationController.cs
@@ -1,26 +1,21 @@
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class OidcConfigurationController : Controller
 {
-    public class OidcConfigurationController : Controller
-    {
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-        {
-            ClientRequestParametersProvider = clientRequestParametersProvider;
-        }
+	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+	{
+		ClientRequestParametersProvider = clientRequestParametersProvider;
+	}
 
-        public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-        [HttpGet("_configuration/{clientId}")]
-        public IActionResult GetClientRequestParameters([FromRoute]string clientId)
-        {
-            var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-            return Ok(parameters);
-        }
-    }
+	[HttpGet("_configuration/{clientId}")]
+	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+	{
+		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+		return Ok(parameters);
+	}
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/OrdersController.cs b/save-points/07-javascript-interop/BlazingPizza.Server/OrdersController.cs
index 72b59890..1859decd 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/OrdersController.cs
@@ -1,115 +1,130 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
+using System.Text.Json;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using WebPush;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+[Route("orders")]
+[ApiController]
+[Authorize]
+public class OrdersController : Controller
 {
-    [Route("orders")]
-    [ApiController]
-    [Authorize]
-    public class OrdersController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public OrdersController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-        {
-            var orders = await _db.Orders
-                .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .OrderByDescending(o => o.CreatedTime)
-                .ToListAsync();
-
-            return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-        }
-
-        [HttpGet("{orderId}")]
-        public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-        {
-            var order = await _db.Orders
-                .Where(o => o.OrderId == orderId)
-                .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .SingleOrDefaultAsync();
-
-            if (order == null)
-            {
-                return NotFound();
-            }
-
-            return OrderWithStatus.FromOrder(order);
-        }
-
-        [HttpPost]
-        public async Task<ActionResult<int>> PlaceOrder(Order order)
-        {
-            order.CreatedTime = DateTime.Now;
-            order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-            order.UserId = GetUserId();
-
-            // Enforce existence of Pizza.SpecialId and Topping.ToppingId
-            // in the database - prevent the submitter from making up
-            // new specials and toppings
-            foreach (var pizza in order.Pizzas)
-            {
-                pizza.SpecialId = pizza.Special.Id;
-                pizza.Special = null;
-
-                foreach (var topping in pizza.Toppings)
-                {
-                    topping.ToppingId = topping.Topping.Id;
-                    topping.Topping = null;
-                }
-            }
-
-            _db.Orders.Attach(order);
-            await _db.SaveChangesAsync();
-
-            // In the background, send push notifications if possible
-            var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-            if (subscription != null)
-            {
-                _ = TrackAndSendNotificationsAsync(order, subscription);
-            }
-
-            return order.OrderId;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-
-        private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-        {
-            // In a realistic case, some other backend process would track
-            // order delivery progress and send us notifications when it
-            // changes. Since we don't have any such process here, fake it.
-            await Task.Delay(OrderWithStatus.PreparationDuration);
-            await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-            await Task.Delay(OrderWithStatus.DeliveryDuration);
-            await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-        }
-
-        private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-        {
-            // This will be implemented later
-            return Task.CompletedTask;
-        }
-    }
+	private readonly PizzaStoreContext _db;
+
+	public OrdersController(PizzaStoreContext db)
+	{
+		_db = db;
+	}
+
+	[HttpGet]
+	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+	{
+		var orders = await _db.Orders
+				.Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.OrderByDescending(o => o.CreatedTime)
+				.ToListAsync();
+
+		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+	}
+
+	[HttpGet("{orderId}")]
+	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+	{
+		var order = await _db.Orders
+				.Where(o => o.OrderId == orderId)
+				.Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.SingleOrDefaultAsync();
+
+		if (order == null)
+		{
+			return NotFound();
+		}
+
+		return OrderWithStatus.FromOrder(order);
+	}
+
+	[HttpPost]
+	public async Task<ActionResult<int>> PlaceOrder(Order order)
+	{
+		order.CreatedTime = DateTime.Now;
+		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+		order.UserId = GetUserId();
+
+		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
+		// in the database - prevent the submitter from making up
+		// new specials and toppings
+		foreach (var pizza in order.Pizzas)
+		{
+			pizza.SpecialId = pizza.Special.Id;
+			pizza.Special = null;
+
+			foreach (var topping in pizza.Toppings)
+			{
+				topping.ToppingId = topping.Topping.Id;
+				topping.Topping = null;
+			}
+		}
+
+		_db.Orders.Attach(order);
+		await _db.SaveChangesAsync();
+
+		// In the background, send push notifications if possible
+		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+		if (subscription != null)
+		{
+			_ = TrackAndSendNotificationsAsync(order, subscription);
+		}
+
+		return order.OrderId;
+	}
+
+	private string GetUserId()
+	{
+		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+	{
+		// In a realistic case, some other backend process would track
+		// order delivery progress and send us notifications when it
+		// changes. Since we don't have any such process here, fake it.
+		await Task.Delay(OrderWithStatus.PreparationDuration);
+		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+		await Task.Delay(OrderWithStatus.DeliveryDuration);
+		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+	}
+
+	private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+	{
+		// For a real application, generate your own
+		var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
+		var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
+
+		var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
+		var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
+		var webPushClient = new WebPushClient();
+		try
+		{
+			var payload = JsonSerializer.Serialize(new
+			{
+				message,
+				url = $"myorders/{order.OrderId}",
+			});
+			await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
+		}
+		catch (Exception ex)
+		{
+			Console.Error.WriteLine("Error sending push notification: " + ex.Message);
+		}
+	}
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/07-javascript-interop/BlazingPizza.Server/PizzaApiExtensions.cs
new file mode 100644
index 00000000..bf6b7bde
--- /dev/null
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -0,0 +1,60 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
+
+namespace BlazingPizza.Server;
+
+public static class PizzaApiExtensions
+{
+
+	public static WebApplication MapPizzaApi(this WebApplication app)
+	{
+
+		// Subscribe to notifications
+		app.MapPut("/notifications/subscribe", [Authorize] async (
+			HttpContext context,
+			PizzaStoreContext db,
+			NotificationSubscription subscription) =>
+		{
+
+			// We're storing at most one subscription per user, so delete old ones.
+			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+			var userId = GetUserId(context);
+			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+
+			// Store new subscription
+			subscription.UserId = userId;
+			db.NotificationSubscriptions.Attach(subscription);
+
+			await db.SaveChangesAsync();
+			return Results.Ok(subscription);
+
+		});
+
+		// Specials
+		app.MapGet("/specials", async (PizzaStoreContext db) =>
+		{
+
+			var specials = await db.Specials.ToListAsync();
+			return Results.Ok(specials);
+
+		});
+
+		// Toppings
+		app.MapGet("/toppings", async (PizzaStoreContext db) =>
+		{
+			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+			return Results.Ok(toppings);
+		});
+
+		return app;
+
+	}
+
+	private static string GetUserId(HttpContext context)
+	{
+		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+}
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreContext.cs
index 9485bd12..9a2e17ee 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreContext.cs
@@ -3,37 +3,36 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-    public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
-    {
-        public PizzaStoreContext(
-            DbContextOptions options,
-            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-        {
-        }
+	public PizzaStoreContext(
+			DbContextOptions options,
+			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+	{
+	}
 
-        public DbSet<Order> Orders { get; set; }
+	public DbSet<Order> Orders { get; set; }
 
-        public DbSet<Pizza> Pizzas { get; set; }
+	public DbSet<Pizza> Pizzas { get; set; }
 
-        public DbSet<PizzaSpecial> Specials { get; set; }
+	public DbSet<PizzaSpecial> Specials { get; set; }
 
-        public DbSet<Topping> Toppings { get; set; }
+	public DbSet<Topping> Toppings { get; set; }
 
-        public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
+	protected override void OnModelCreating(ModelBuilder modelBuilder)
+	{
+		base.OnModelCreating(modelBuilder);
 
-            // Configuring a many-to-many special -> topping relationship that is friendly for serialization
-            modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-            modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-            modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
+		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-            // Inline the Lat-Long pairs in Order rather than having a FK to another table
-            modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-        }
-    }
-}
\ No newline at end of file
+		// Inline the Lat-Long pairs in Order rather than having a FK to another table
+		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+	}
+}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreUser.cs b/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreUser.cs
index 171ce83d..7ab40235 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreUser.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreUser.cs
@@ -1,8 +1,5 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace BlazingPizza.Server
-{
-    public class PizzaStoreUser : IdentityUser
-    {
-    }
-}
\ No newline at end of file
+namespace BlazingPizza.Server;
+
+public class PizzaStoreUser : IdentityUser { }
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/PizzasController.cs b/save-points/07-javascript-interop/BlazingPizza.Server/PizzasController.cs
deleted file mode 100644
index c082552c..00000000
--- a/save-points/07-javascript-interop/BlazingPizza.Server/PizzasController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("pizzas")]
-    [ApiController]
-    public class PizzasController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public PizzasController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-    }
-}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Program.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Program.cs
index 40a47641..4484d8f7 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/Program.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Program.cs
@@ -1,33 +1,67 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.EntityFrameworkCore;
+using BlazingPizza.Server;
 
-namespace BlazingPizza.Server
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddControllersWithViews()
+	.AddJsonOptions(options =>  {
+		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+	});
+builder.Services.AddRazorPages();
+
+builder.Services.AddDbContext<PizzaStoreContext>(options =>
+		options.UseSqlite("Data Source=pizza.db")
+			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+
+builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
+		.AddEntityFrameworkStores<PizzaStoreContext>();
+
+builder.Services.AddIdentityServer()
+		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+
+builder.Services.AddAuthentication()
+		.AddIdentityServerJwt();
+
+var app = builder.Build();
+
+// Initialize the database
+var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
+using (var scope = scopeFactory.CreateScope())
+{
+	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+	if (db.Database.EnsureCreated())
+	{
+		SeedData.Initialize(db);
+	}
+}
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseWebAssemblyDebugging();
+}
+else
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var host = CreateHostBuilder(args).Build();
-
-            // Initialize the database
-            var scopeFactory = host.Services.GetRequiredService<IServiceScopeFactory>();
-            using (var scope = scopeFactory.CreateScope())
-            {
-                var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-                if (db.Database.EnsureCreated())
-                {
-                    SeedData.Initialize(db);
-                }
-            }
-
-            host.Run();
-        }
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+    app.UseExceptionHandler("/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
 }
+
+app.UseHttpsRedirection();
+app.UseBlazorFrameworkFiles();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseIdentityServer();
+app.UseAuthorization();
+
+app.MapPizzaApi();
+
+app.MapRazorPages();
+app.MapControllers();
+app.MapFallbackToFile("index.html");
+
+app.Run();
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/SeedData.cs b/save-points/07-javascript-interop/BlazingPizza.Server/SeedData.cs
index 7c86a5b2..a1e47973 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/SeedData.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/SeedData.cs
@@ -1,193 +1,192 @@
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public static class SeedData
 {
-    public static class SeedData
-    {
-        public static void Initialize(PizzaStoreContext db)
-        {
-            var toppings = new Topping[]
-            {
-                new Topping()
-                {
-                    Name = "Extra cheese",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "American bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "British bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Canadian bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Tea and crumpets",
-                    Price = 5.00m
-                },
-                new Topping()
-                {
-                    Name = "Fresh-baked scones",
-                    Price = 4.50m,
-                },
-                new Topping()
-                {
-                    Name = "Bell peppers",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Onions",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Mushrooms",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Pepperoni",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Duck sausage",
-                    Price = 3.20m,
-                },
-                new Topping()
-                {
-                    Name = "Venison meatballs",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "Served on a silver platter",
-                    Price = 250.99m,
-                },
-                new Topping()
-                {
-                    Name = "Lobster on top",
-                    Price = 64.50m,
-                },
-                new Topping()
-                {
-                    Name = "Sturgeon caviar",
-                    Price = 101.75m,
-                },
-                new Topping()
-                {
-                    Name = "Artichoke hearts",
-                    Price = 3.40m,
-                },
-                new Topping()
-                {
-                    Name = "Fresh tomatoes",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Basil",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Steak (medium-rare)",
-                    Price = 8.50m,
-                },
-                new Topping()
-                {
-                    Name = "Blazing hot peppers",
-                    Price = 4.20m,
-                },
-                new Topping()
-                {
-                    Name = "Buffalo chicken",
-                    Price = 5.00m,
-                },
-                new Topping()
-                {
-                    Name = "Blue cheese",
-                    Price = 2.50m,
-                },
-            };
+	public static void Initialize(PizzaStoreContext db)
+	{
+		var toppings = new Topping[]
+		{
+			new Topping()
+			{
+					Name = "Extra cheese",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "American bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "British bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Canadian bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Tea and crumpets",
+					Price = 5.00m
+			},
+			new Topping()
+			{
+					Name = "Fresh-baked scones",
+					Price = 4.50m,
+			},
+			new Topping()
+			{
+					Name = "Bell peppers",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Onions",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Mushrooms",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Pepperoni",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Duck sausage",
+					Price = 3.20m,
+			},
+			new Topping()
+			{
+					Name = "Venison meatballs",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "Served on a silver platter",
+					Price = 250.99m,
+			},
+			new Topping()
+			{
+					Name = "Lobster on top",
+					Price = 64.50m,
+			},
+			new Topping()
+			{
+					Name = "Sturgeon caviar",
+					Price = 101.75m,
+			},
+			new Topping()
+			{
+					Name = "Artichoke hearts",
+					Price = 3.40m,
+			},
+			new Topping()
+			{
+					Name = "Fresh tomatoes",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Basil",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Steak (medium-rare)",
+					Price = 8.50m,
+			},
+			new Topping()
+			{
+					Name = "Blazing hot peppers",
+					Price = 4.20m,
+			},
+			new Topping()
+			{
+					Name = "Buffalo chicken",
+					Price = 5.00m,
+			},
+			new Topping()
+			{
+					Name = "Blue cheese",
+					Price = 2.50m,
+			},
+		};
 
-            var specials = new PizzaSpecial[]
-            {
-                new PizzaSpecial()
-                {
-                    Name = "Basic Cheese Pizza",
-                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/cheese.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 2,
-                    Name = "The Baconatorizor",
-                    Description = "It has EVERY kind of bacon",
-                    BasePrice = 11.99m,
-                    ImageUrl = "img/pizzas/bacon.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 3,
-                    Name = "Classic pepperoni",
-                    Description = "It's the pizza you grew up with, but Blazing hot!",
-                    BasePrice = 10.50m,
-                    ImageUrl = "img/pizzas/pepperoni.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 4,
-                    Name = "Buffalo chicken",
-                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-                    BasePrice = 12.75m,
-                    ImageUrl = "img/pizzas/meaty.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 5,
-                    Name = "Mushroom Lovers",
-                    Description = "It has mushrooms. Isn't that obvious?",
-                    BasePrice = 11.00m,
-                    ImageUrl = "img/pizzas/mushroom.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 6,
-                    Name = "The Brit",
-                    Description = "When in London...",
-                    BasePrice = 10.25m,
-                    ImageUrl = "img/pizzas/brit.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 7,
-                    Name = "Veggie Delight",
-                    Description = "It's like salad, but on a pizza",
-                    BasePrice = 11.50m,
-                    ImageUrl = "img/pizzas/salad.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 8,
-                    Name = "Margherita",
-                    Description = "Traditional Italian pizza with tomatoes and basil",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/margherita.jpg",
-                },
-            };
+		var specials = new PizzaSpecial[]
+		{
+			new PizzaSpecial()
+			{
+					Name = "Basic Cheese Pizza",
+					Description = "It's cheesy and delicious. Why wouldn't you want one?",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/cheese.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 2,
+					Name = "The Baconatorizor",
+					Description = "It has EVERY kind of bacon",
+					BasePrice = 11.99m,
+					ImageUrl = "img/pizzas/bacon.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 3,
+					Name = "Classic pepperoni",
+					Description = "It's the pizza you grew up with, but Blazing hot!",
+					BasePrice = 10.50m,
+					ImageUrl = "img/pizzas/pepperoni.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 4,
+					Name = "Buffalo chicken",
+					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+					BasePrice = 12.75m,
+					ImageUrl = "img/pizzas/meaty.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 5,
+					Name = "Mushroom Lovers",
+					Description = "It has mushrooms. Isn't that obvious?",
+					BasePrice = 11.00m,
+					ImageUrl = "img/pizzas/mushroom.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 6,
+					Name = "The Brit",
+					Description = "When in London...",
+					BasePrice = 10.25m,
+					ImageUrl = "img/pizzas/brit.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 7,
+					Name = "Veggie Delight",
+					Description = "It's like salad, but on a pizza",
+					BasePrice = 11.50m,
+					ImageUrl = "img/pizzas/salad.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 8,
+					Name = "Margherita",
+					Description = "Traditional Italian pizza with tomatoes and basil",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/margherita.jpg",
+			},
+		};
 
-            db.Toppings.AddRange(toppings);
-            db.Specials.AddRange(specials);
-            db.SaveChanges();
-        }
-    }
-}
+		db.Toppings.AddRange(toppings);
+		db.Specials.AddRange(specials);
+		db.SaveChanges();
+	}
+}
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/SpecialsController.cs b/save-points/07-javascript-interop/BlazingPizza.Server/SpecialsController.cs
deleted file mode 100644
index a176844c..00000000
--- a/save-points/07-javascript-interop/BlazingPizza.Server/SpecialsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("specials")]
-    [ApiController]
-    public class SpecialsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public SpecialsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()
-        {
-            return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();
-        }
-    }
-}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Startup.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Startup.cs
deleted file mode 100644
index ed3fca06..00000000
--- a/save-points/07-javascript-interop/BlazingPizza.Server/Startup.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace BlazingPizza.Server
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllersWithViews();
-            services.AddRazorPages();
-
-            services.AddDbContext<PizzaStoreContext>(options => 
-                options.UseSqlite("Data Source=pizza.db"));
-
-            services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-                .AddEntityFrameworkStores<PizzaStoreContext>();
-
-            services.AddIdentityServer()
-                .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
-
-            services.AddAuthentication()
-                .AddIdentityServerJwt();
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                app.UseWebAssemblyDebugging();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Error");
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
-
-            app.UseHttpsRedirection();
-            app.UseBlazorFrameworkFiles();
-            app.UseStaticFiles();
-
-            app.UseRouting();
-
-            app.UseAuthentication();
-            app.UseIdentityServer();
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-                endpoints.MapRazorPages();
-                endpoints.MapFallbackToFile("index.html");
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/ToppingsController.cs b/save-points/07-javascript-interop/BlazingPizza.Server/ToppingsController.cs
deleted file mode 100644
index 6a677639..00000000
--- a/save-points/07-javascript-interop/BlazingPizza.Server/ToppingsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("toppings")]
-    [ApiController]
-    public class ToppingsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public ToppingsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<Topping>>> GetToppings()
-        {
-            return await _db.Toppings.OrderBy(t => t.Name).ToListAsync();
-        }
-    }
-}
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/Address.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/Address.cs
index d76bc52a..79be9c5b 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/Address.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/Address.cs
@@ -1,27 +1,24 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class Address
 {
-    public class Address
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        [Required, MaxLength(100)]
-        public string Name { get; set; }
+	[Required, MaxLength(100)]
+	public string Name { get; set; }
 
-        [Required, MaxLength(100)]
-        public string Line1 { get; set; }
+	[Required, MaxLength(100)]
+	public string Line1 { get; set; }
 
-        [MaxLength(100)]
-        public string Line2 { get; set; }
+	[MaxLength(100)]
+	public string Line2 { get; set; }
 
-        [Required, MaxLength(50)]
-        public string City { get; set; }
+	[Required, MaxLength(50)]
+	public string City { get; set; }
 
-        [Required, MaxLength(20)]
-        public string Region { get; set; }
+	[Required, MaxLength(20)]
+	public string Region { get; set; }
 
-        [Required, MaxLength(20)]
-        public string PostalCode { get; set; }
-    }
+	[Required, MaxLength(20)]
+	public string PostalCode { get; set; }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/07-javascript-interop/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index f7b7dd02..fb17e53b 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -3,8 +3,13 @@
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
+	<ItemGroup>
+		<Using Include="System.ComponentModel.DataAnnotations" />
+	</ItemGroup>
+	
   <ItemGroup>
     <ProjectReference Include="..\BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj" />
   </ItemGroup>
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/LatLong.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/LatLong.cs
index 9b8c3811..14a94c26 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/LatLong.cs
@@ -1,27 +1,26 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class LatLong
 {
-    public class LatLong
-    {
-        public LatLong()
-        {
-        }
+	public LatLong()
+	{
+	}
 
-        public LatLong(double latitude, double longitude) : this()
-        {
-            Latitude = latitude;
-            Longitude = longitude;
-        }
+	public LatLong(double latitude, double longitude) : this()
+	{
+		Latitude = latitude;
+		Longitude = longitude;
+	}
 
-        public double Latitude { get; set; }
+	public double Latitude { get; set; }
 
-        public double Longitude { get; set; }
+	public double Longitude { get; set; }
 
-        public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-        {
-            // The Earth is flat, right? So no need for spherical interpolation.
-            return new LatLong(
-                start.Latitude + (end.Latitude - start.Latitude) * proportion,
-                start.Longitude + (end.Longitude - start.Longitude) * proportion);
-        }
-    }
-}
+	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+	{
+		// The Earth is flat, right? So no need for spherical interpolation.
+		return new LatLong(
+				start.Latitude + (end.Latitude - start.Latitude) * proportion,
+				start.Longitude + (end.Longitude - start.Longitude) * proportion);
+	}
+}
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/NotificationSubscription.cs
index 04259c2f..9109ff57 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/NotificationSubscription.cs
@@ -1,17 +1,14 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class NotificationSubscription
 {
-    public class NotificationSubscription
-    {
-        public int NotificationSubscriptionId { get; set; }
+	public int NotificationSubscriptionId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public string Url { get; set; }
+	public string Url { get; set; }
 
-        public string P256dh { get; set; }
+	public string P256dh { get; set; }
 
-        public string Auth { get; set; }
-    }
+	public string Auth { get; set; }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/Order.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/Order.cs
index fb003bd6..aca04ca1 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/Order.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/Order.cs
@@ -1,25 +1,32 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Order
 {
-    public class Order
-    {
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public DateTime CreatedTime { get; set; }
+	public DateTime CreatedTime { get; set; }
 
-        public Address DeliveryAddress { get; set; } = new Address();
+	public Address DeliveryAddress { get; set; } = new Address();
 
-        public LatLong DeliveryLocation { get; set; }
+	public LatLong DeliveryLocation { get; set; }
 
-        public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-        public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-        public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
-    }
+	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(Order))]
+[JsonSerializable(typeof(OrderWithStatus))]
+[JsonSerializable(typeof(List<OrderWithStatus>))]
+[JsonSerializable(typeof(Pizza))]
+[JsonSerializable(typeof(List<PizzaSpecial>))]
+[JsonSerializable(typeof(List<Topping>))]
+[JsonSerializable(typeof(Topping))]
+public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/OrderWithStatus.cs
index 021de78c..f5f153b6 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/OrderWithStatus.cs
@@ -1,79 +1,78 @@
-using BlazingPizza.ComponentsLibrary.Map;
-using System;
-using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using BlazingPizza.ComponentsLibrary.Map;
 
-namespace BlazingPizza
+
+namespace BlazingPizza;
+
+public class OrderWithStatus
 {
-    public class OrderWithStatus
-    {
-        public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-        public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-        public Order Order { get; set; }
+	public Order Order { get; set; }
 
-        public string StatusText { get; set; }
+	public string StatusText { get; set; }
 
-        public bool IsDelivered => StatusText == "Delivered";
+	public bool IsDelivered => StatusText == "Delivered";
 
-        public List<Marker> MapMarkers { get; set; }
+	public List<Marker> MapMarkers { get; set; }
 
-        public static OrderWithStatus FromOrder(Order order)
-        {
-            // To simulate a real backend process, we fake status updates based on the amount
-            // of time since the order was placed
-            string statusText;
-            List<Marker> mapMarkers;
-            var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+	public static OrderWithStatus FromOrder(Order order)
+	{
+		// To simulate a real backend process, we fake status updates based on the amount
+		// of time since the order was placed
+		string statusText;
+		List<Marker> mapMarkers;
+		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-            if (DateTime.Now < dispatchTime)
-            {
-                statusText = "Preparing";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-                };
-            }
-            else if (DateTime.Now < dispatchTime + DeliveryDuration)
-            {
-                statusText = "Out for delivery";
+		if (DateTime.Now < dispatchTime)
+		{
+			statusText = "Preparing";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+								};
+		}
+		else if (DateTime.Now < dispatchTime + DeliveryDuration)
+		{
+			statusText = "Out for delivery";
 
-                var startPosition = ComputeStartPosition(order);
-                var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-                var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation),
-                    ToMapMarker("Driver", driverPosition, showPopup: true),
-                };
-            }
-            else
-            {
-                statusText = "Delivered";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-                };
-            }
+			var startPosition = ComputeStartPosition(order);
+			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation),
+										ToMapMarker("Driver", driverPosition, showPopup: true),
+								};
+		}
+		else
+		{
+			statusText = "Delivered";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+								};
+		}
 
-            return new OrderWithStatus
-            {
-                Order = order,
-                StatusText = statusText,
-                MapMarkers = mapMarkers,
-            };
-        }
+		return new OrderWithStatus
+		{
+			Order = order,
+			StatusText = statusText,
+			MapMarkers = mapMarkers,
+		};
+	}
 
-        private static LatLong ComputeStartPosition(Order order)
-        {
-            // Random but deterministic based on order ID
-            var rng = new Random(order.OrderId);
-            var distance = 0.01 + rng.NextDouble() * 0.02;
-            var angle = rng.NextDouble() * Math.PI * 2;
-            var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-            return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-        }
+	private static LatLong ComputeStartPosition(Order order)
+	{
+		// Random but deterministic based on order ID
+		var rng = new Random(order.OrderId);
+		var distance = 0.01 + rng.NextDouble() * 0.02;
+		var angle = rng.NextDouble() * Math.PI * 2;
+		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+	}
 
-        static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
-    }
-}
+	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+}
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/Pizza.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/Pizza.cs
index ec1108a9..459298f4 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/Pizza.cs
@@ -1,42 +1,44 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+///    /// Represents a customized pizza as part of an order
+/// </summary>
+public class Pizza
 {
-    /// <summary>
-    /// Represents a customized pizza as part of an order
-    /// </summary>
-    public class Pizza
-    {
-        public const int DefaultSize = 12;
-        public const int MinimumSize = 9;
-        public const int MaximumSize = 17;
+	public const int DefaultSize = 12;
+	public const int MinimumSize = 9;
+	public const int MaximumSize = 17;
 
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public PizzaSpecial Special { get; set; }
+	public PizzaSpecial Special { get; set; }
 
-        public int SpecialId { get; set; }
+	public int SpecialId { get; set; }
 
-        public int Size { get; set; }
+	public int Size { get; set; }
 
-        public List<PizzaTopping> Toppings { get; set; }
+	public List<PizzaTopping> Toppings { get; set; }
 
-        public decimal GetBasePrice()
-        {
-            return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-        }
+	public decimal GetBasePrice()
+	{
+		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+	}
 
-        public decimal GetTotalPrice()
-        {
-            return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-        }
+	public decimal GetTotalPrice()
+	{
+		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+	}
 
-        public string GetFormattedTotalPrice()
-        {
-            return GetTotalPrice().ToString("0.00");
-        }
-    }
+	public string GetFormattedTotalPrice()
+	{
+		return GetTotalPrice().ToString("0.00");
+	}
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
+[JsonSerializable(typeof(Pizza))]
+public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaSpecial.cs
index 2f2b3383..9653300c 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaSpecial.cs
@@ -1,20 +1,19 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+/// Represents a pre-configured template for a pizza a user can order
+/// </summary>
+public class PizzaSpecial
 {
-    /// <summary>
-    /// Represents a pre-configured template for a pizza a user can order
-    /// </summary>
-    public class PizzaSpecial
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal BasePrice { get; set; }
+	public decimal BasePrice { get; set; }
 
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public string ImageUrl { get; set; }
+	public string ImageUrl { get; set; }
 
-        public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
-    }
-}
+	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+}
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaTopping.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaTopping.cs
index f5a6c1ac..0a711647 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaTopping.cs
@@ -1,11 +1,11 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class PizzaTopping
 {
-    public class PizzaTopping
-    {
-        public Topping Topping { get; set; }
+	public Topping Topping { get; set; }
+
+	public int ToppingId { get; set; }
 
-        public int ToppingId { get; set; }
-        
-        public int PizzaId { get; set; }
-    }
-}
+	public int PizzaId { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/Topping.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/Topping.cs
index 61bdeb92..376c311a 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/Topping.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/Topping.cs
@@ -1,13 +1,13 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Topping
 {
-    public class Topping
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal Price { get; set; }
+	public decimal Price { get; set; }
 
-        public string GetFormattedPrice() => Price.ToString("0.00");
-    }
-}
+	public string GetFormattedPrice() => Price.ToString("0.00");
+	
+}
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/UserInfo.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/UserInfo.cs
index 4996ef80..362f8f8e 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/UserInfo.cs
@@ -1,9 +1,9 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class UserInfo
 {
-    public class UserInfo
-    {
-        public bool IsAuthenticated { get; set; }
+	public bool IsAuthenticated { get; set; }
 
-        public string Name { get; set; }
-    }
-}
+	public string Name { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/08-templated-components/BlazingPizza.Client/BlazingPizza.Client.csproj
index 7fecc21b..44802d79 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/08-templated-components/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -2,12 +2,14 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer"  Version="$(BlazorVersion)" PrivateAssets="all"  />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="$(SystemNetHttpJsonVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
   </ItemGroup>
 
diff --git a/save-points/08-templated-components/BlazingPizza.Client/JSRuntimeExtensions.cs b/save-points/08-templated-components/BlazingPizza.Client/JSRuntimeExtensions.cs
index 89da520c..cc242348 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/JSRuntimeExtensions.cs
+++ b/save-points/08-templated-components/BlazingPizza.Client/JSRuntimeExtensions.cs
@@ -1,13 +1,11 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.Client
+namespace BlazingPizza.Client;
+
+public static class JSRuntimeExtensions
 {
-    public static class JSRuntimeExtensions
-    {
-        public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
-        {
-            return jsRuntime.InvokeAsync<bool>("confirm", message);
-        }
-    }
+	public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
+	{
+		return jsRuntime.InvokeAsync<bool>("confirm", message);
+	}
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Client/OrderState.cs b/save-points/08-templated-components/BlazingPizza.Client/OrderState.cs
index 5265ae39..4f47979d 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/OrderState.cs
+++ b/save-points/08-templated-components/BlazingPizza.Client/OrderState.cs
@@ -1,55 +1,52 @@
-using System.Collections.Generic;
+namespace BlazingPizza.Client;
 
-namespace BlazingPizza.Client
+public class OrderState
 {
-    public class OrderState
-    {
-        public bool ShowingConfigureDialog { get; private set; }
-
-        public Pizza ConfiguringPizza { get; private set; }
-
-        public Order Order { get; private set; } = new Order();
-
-        public void ShowConfigurePizzaDialog(PizzaSpecial special)
-        {
-            ConfiguringPizza = new Pizza()
-            {
-                Special = special,
-                SpecialId = special.Id,
-                Size = Pizza.DefaultSize,
-                Toppings = new List<PizzaTopping>(),
-            };
-
-            ShowingConfigureDialog = true;
-        }
-
-        public void CancelConfigurePizzaDialog()
-        {
-            ConfiguringPizza = null;
-            ShowingConfigureDialog = false;
-        }
-
-        public void ConfirmConfigurePizzaDialog()
-        {
-            Order.Pizzas.Add(ConfiguringPizza);
-            ConfiguringPizza = null;
-
-            ShowingConfigureDialog = false;
-        }
-
-        public void RemoveConfiguredPizza(Pizza pizza)
-        {
-            Order.Pizzas.Remove(pizza);
-        }
-
-        public void ResetOrder()
-        {
-            Order = new Order();
-        }
-
-        public void ReplaceOrder(Order order)
-        {
-            Order = order;
-        }
-    }
+	public bool ShowingConfigureDialog { get; private set; }
+
+	public Pizza ConfiguringPizza { get; private set; }
+
+	public Order Order { get; private set; } = new Order();
+
+	public void ShowConfigurePizzaDialog(PizzaSpecial special)
+	{
+		ConfiguringPizza = new Pizza()
+		{
+			Special = special,
+			SpecialId = special.Id,
+			Size = Pizza.DefaultSize,
+			Toppings = new List<PizzaTopping>(),
+		};
+
+		ShowingConfigureDialog = true;
+	}
+
+	public void CancelConfigurePizzaDialog()
+	{
+		ConfiguringPizza = null;
+		ShowingConfigureDialog = false;
+	}
+
+	public void ConfirmConfigurePizzaDialog()
+	{
+		Order.Pizzas.Add(ConfiguringPizza);
+		ConfiguringPizza = null;
+
+		ShowingConfigureDialog = false;
+	}
+
+	public void RemoveConfiguredPizza(Pizza pizza)
+	{
+		Order.Pizzas.Remove(pizza);
+	}
+
+	public void ResetOrder()
+	{
+		Order = new Order();
+	}
+
+	public void ReplaceOrder(Order order)
+	{
+		Order = order;
+	}
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Client/OrdersClient.cs b/save-points/08-templated-components/BlazingPizza.Client/OrdersClient.cs
index 0f800e6f..e63bd045 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/OrdersClient.cs
+++ b/save-points/08-templated-components/BlazingPizza.Client/OrdersClient.cs
@@ -1,35 +1,36 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Threading.Tasks;
-
-namespace BlazingPizza.Client
+using System.Net.Http.Json;
+using System.Text.Json;
+
+namespace BlazingPizza.Client;
+
+public class OrdersClient
 {
-    public class OrdersClient
-    {
-        private readonly HttpClient httpClient;
+	private readonly HttpClient httpClient;
+
+	public OrdersClient(HttpClient httpClient)
+	{
+		this.httpClient = httpClient;
+	}
 
-        public OrdersClient(HttpClient httpClient)
-        {
-            this.httpClient = httpClient;
-        }
+	public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
+			await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
 
-        public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
-            await httpClient.GetFromJsonAsync<IEnumerable<OrderWithStatus>>("orders");
 
+	public async Task<OrderWithStatus> GetOrder(int orderId) =>
+			await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
 
-        public async Task<OrderWithStatus> GetOrder(int orderId) =>
-            await httpClient.GetFromJsonAsync<OrderWithStatus>($"orders/{orderId}");
 
+	public async Task<int> PlaceOrder(Order order)
+	{
+		var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
+		response.EnsureSuccessStatusCode();
+		var orderId = await response.Content.ReadFromJsonAsync<int>();
+		return orderId;
+	}
 
-        public async Task<int> PlaceOrder(Order order)
-        {
-            var response = await httpClient.PostAsJsonAsync("orders", order);
-            response.EnsureSuccessStatusCode();
-            var orderId = await response.Content.ReadFromJsonAsync<int>();
-            return orderId;
-        }
-    }
-}
\ No newline at end of file
+	public async Task SubscribeToNotifications(NotificationSubscription subscription)
+	{
+		var response = await httpClient.PutAsJsonAsync("notifications/subscribe", subscription);
+		response.EnsureSuccessStatusCode();
+	}
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Client/PizzaAuthenticationState.cs b/save-points/08-templated-components/BlazingPizza.Client/PizzaAuthenticationState.cs
index 3f295928..f5bfef65 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/PizzaAuthenticationState.cs
+++ b/save-points/08-templated-components/BlazingPizza.Client/PizzaAuthenticationState.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 
-namespace BlazingPizza.Client
+namespace BlazingPizza.Client;
+
+public class PizzaAuthenticationState : RemoteAuthenticationState
 {
-    public class PizzaAuthenticationState : RemoteAuthenticationState
-    {
-        public Order Order { get; set; }
-    }
+	public Order Order { get; set; }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Client/Program.cs b/save-points/08-templated-components/BlazingPizza.Client/Program.cs
index afeee128..41eedccb 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/Program.cs
+++ b/save-points/08-templated-components/BlazingPizza.Client/Program.cs
@@ -1,31 +1,20 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
+using BlazingPizza.Client;
 
-namespace BlazingPizza.Client
-{
-    public class Program
-    {
-        public static async Task Main(string[] args)
-        {
-            var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("#app");
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<App>("#app");
 
-            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
-            builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
-                .AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
-            builder.Services.AddScoped<OrderState>();
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
+		.AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
+builder.Services.AddScoped<OrderState>();
 
-            // Add auth services
-            builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
-            {
-                options.AuthenticationPaths.LogOutSucceededPath = "";
-            });
+// Add auth services
+builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
+{
+	options.AuthenticationPaths.LogOutSucceededPath = "";
+});
 
-            await builder.Build().RunAsync();
-        }
-    }
-}
+await builder.Build().RunAsync();
diff --git a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 61ebf623..cb996b1b 100644
--- a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index f36b098e..bb84f13c 100644
--- a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -1,17 +1,15 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.ComponentsLibrary
+namespace BlazingPizza.ComponentsLibrary;
+
+public static class LocalStorage
 {
-    public static class LocalStorage
-    {
-        public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-        public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-        public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
-    }
-}
+	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+}
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index 63006067..a8e78f2a 100644
--- a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -1,13 +1,12 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Marker
 {
-    public class Marker
-    {
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public double X { get; set; }
+	public double X { get; set; }
 
-        public double Y { get; set; }
+	public double Y { get; set; }
 
-        public bool ShowPopup { get; set; }
-    }
+	public bool ShowPopup { get; set; }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 03841826..349046d4 100644
--- a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -1,9 +1,8 @@
-namespace BlazingPizza.ComponentsLibrary.Map
+namespace BlazingPizza.ComponentsLibrary.Map;
+
+public class Point
 {
-    public class Point
-    {
-        public double X { get; set; }
+	public double X { get; set; }
 
-        public double Y { get; set; }
-    }
-}
+	public double Y { get; set; }
+}
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/08-templated-components/BlazingPizza.Server/BlazingPizza.Server.csproj
index b9c74fc4..abd2317b 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/08-templated-components/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,6 +14,7 @@
     <PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EntityFrameworkVersion)" />
+    <PackageReference Include="WebPush" Version="1.0.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/AddressEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/AddressEntityType.cs
new file mode 100644
index 00000000..82db81b6
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/AddressEntityType.cs
@@ -0,0 +1,92 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class AddressEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Address",
+                typeof(Address),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Address).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var city = runtimeEntityType.AddProperty(
+                "City",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("City", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<City>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var line1 = runtimeEntityType.AddProperty(
+                "Line1",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var line2 = runtimeEntityType.AddProperty(
+                "Line2",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var postalCode = runtimeEntityType.AddProperty(
+                "PostalCode",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("PostalCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<PostalCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var region = runtimeEntityType.AddProperty(
+                "Region",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Region", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Region>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Address");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
new file mode 100644
index 00000000..1dd4563b
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
@@ -0,0 +1,114 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class DeviceFlowCodesEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes",
+                typeof(DeviceFlowCodes),
+                baseEntityType);
+
+            var userCode = runtimeEntityType.AddProperty(
+                "UserCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("UserCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<UserCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var deviceCode = runtimeEntityType.AddProperty(
+                "DeviceCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("DeviceCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<DeviceCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userCode });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deviceCode },
+                unique: true);
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DeviceCodes");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
new file mode 100644
index 00000000..8946b261
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>",
+                typeof(IdentityRoleClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoleClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityRoleEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
new file mode 100644
index 00000000..2f1fec2b
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
@@ -0,0 +1,78 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRole",
+                typeof(IdentityRole),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedName = runtimeEntityType.AddProperty(
+                "NormalizedName",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("NormalizedName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<NormalizedName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedName },
+                unique: true);
+            index.AddAnnotation("Relational:Name", "RoleNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
new file mode 100644
index 00000000..55418a1e
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserClaim<string>",
+                typeof(IdentityUserClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
new file mode 100644
index 00000000..3ca029bd
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserLoginstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserLogin<string>",
+                typeof(IdentityUserLogin<string>),
+                baseEntityType);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerKey = runtimeEntityType.AddProperty(
+                "ProviderKey",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderKey", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderKey>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerDisplayName = runtimeEntityType.AddProperty(
+                "ProviderDisplayName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderDisplayName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderDisplayName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { loginProvider, providerKey });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserLogins");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
new file mode 100644
index 00000000..70078d7a
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
@@ -0,0 +1,82 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserRolestringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserRole<string>",
+                typeof(IdentityUserRole<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, roleId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
new file mode 100644
index 00000000..93ba6d31
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
@@ -0,0 +1,84 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserTokenstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserToken<string>",
+                typeof(IdentityUserToken<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var value = runtimeEntityType.AddProperty(
+                "Value",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Value", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Value>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, loginProvider, name });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserTokens");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/KeyEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/KeyEntityType.cs
new file mode 100644
index 00000000..f6c6b4c7
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/KeyEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class KeyEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.Key",
+                typeof(Key),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var algorithm = runtimeEntityType.AddProperty(
+                "Algorithm",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Algorithm", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Algorithm>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var created = runtimeEntityType.AddProperty(
+                "Created",
+                typeof(DateTime),
+                propertyInfo: typeof(Key).GetProperty("Created", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Created>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var dataProtected = runtimeEntityType.AddProperty(
+                "DataProtected",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("DataProtected", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<DataProtected>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var isX509Certificate = runtimeEntityType.AddProperty(
+                "IsX509Certificate",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("IsX509Certificate", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<IsX509Certificate>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var use = runtimeEntityType.AddProperty(
+                "Use",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Use", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Use>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var version = runtimeEntityType.AddProperty(
+                "Version",
+                typeof(int),
+                propertyInfo: typeof(Key).GetProperty("Version", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Version>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { use });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Keys");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/LatLongEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/LatLongEntityType.cs
new file mode 100644
index 00000000..3fd254bd
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/LatLongEntityType.cs
@@ -0,0 +1,80 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class LatLongEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.LatLong",
+                typeof(LatLong),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var latitude = runtimeEntityType.AddProperty(
+                "Latitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Latitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Latitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var longitude = runtimeEntityType.AddProperty(
+                "Longitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Longitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Longitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                ownership: true);
+
+            var deliveryLocation = principalEntityType.AddNavigation("DeliveryLocation",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(LatLong),
+                propertyInfo: typeof(Order).GetProperty("DeliveryLocation", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryLocation>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
new file mode 100644
index 00000000..db236e4c
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
@@ -0,0 +1,77 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class NotificationSubscriptionEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.NotificationSubscription",
+                typeof(NotificationSubscription),
+                baseEntityType);
+
+            var notificationSubscriptionId = runtimeEntityType.AddProperty(
+                "NotificationSubscriptionId",
+                typeof(int),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("NotificationSubscriptionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<NotificationSubscriptionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var auth = runtimeEntityType.AddProperty(
+                "Auth",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Auth", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Auth>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var p256dh = runtimeEntityType.AddProperty(
+                "P256dh",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("P256dh", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<P256dh>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var url = runtimeEntityType.AddProperty(
+                "Url",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Url", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Url>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { notificationSubscriptionId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "NotificationSubscriptions");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/OrderEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/OrderEntityType.cs
new file mode 100644
index 00000000..9d9ec6fd
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/OrderEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class OrderEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Order",
+                typeof(Order),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Order).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var createdTime = runtimeEntityType.AddProperty(
+                "CreatedTime",
+                typeof(DateTime),
+                propertyInfo: typeof(Order).GetProperty("CreatedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<CreatedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var deliveryAddressId = runtimeEntityType.AddProperty(
+                "DeliveryAddressId",
+                typeof(int?),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(Order).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deliveryAddressId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("DeliveryAddressId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var deliveryAddress = declaringEntityType.AddNavigation("DeliveryAddress",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Address),
+                propertyInfo: typeof(Order).GetProperty("DeliveryAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/PersistedGrantEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
new file mode 100644
index 00000000..842d53a5
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
@@ -0,0 +1,127 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PersistedGrantEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.PersistedGrant",
+                typeof(PersistedGrant),
+                baseEntityType);
+
+            var key = runtimeEntityType.AddProperty(
+                "Key",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Key", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Key>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var consumedTime = runtimeEntityType.AddProperty(
+                "ConsumedTime",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ConsumedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ConsumedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(PersistedGrant).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var type = runtimeEntityType.AddProperty(
+                "Type",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Type", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Type>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var key0 = runtimeEntityType.AddKey(
+                new[] { key });
+            runtimeEntityType.SetPrimaryKey(key0);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { consumedTime });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            var index1 = runtimeEntityType.AddIndex(
+                new[] { subjectId, clientId, type });
+
+            var index2 = runtimeEntityType.AddIndex(
+                new[] { subjectId, sessionId, type });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PersistedGrants");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaEntityType.cs
new file mode 100644
index 00000000..3a124e63
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaEntityType.cs
@@ -0,0 +1,111 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Pizza",
+                typeof(Pizza),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var size = runtimeEntityType.AddProperty(
+                "Size",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Size", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Size>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var specialId = runtimeEntityType.AddProperty(
+                "SpecialId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("SpecialId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<SpecialId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { orderId });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { specialId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var pizzas = principalEntityType.AddNavigation("Pizzas",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<Pizza>),
+                propertyInfo: typeof(Order).GetProperty("Pizzas", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<Pizzas>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("SpecialId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var special = declaringEntityType.AddNavigation("Special",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(PizzaSpecial),
+                propertyInfo: typeof(Pizza).GetProperty("Special", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Special>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Pizzas");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
new file mode 100644
index 00000000..e86b0f50
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
@@ -0,0 +1,76 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaSpecialEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaSpecial",
+                typeof(PizzaSpecial),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var basePrice = runtimeEntityType.AddProperty(
+                "BasePrice",
+                typeof(decimal),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("BasePrice", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<BasePrice>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var imageUrl = runtimeEntityType.AddProperty(
+                "ImageUrl",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("ImageUrl", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<ImageUrl>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Specials");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaStoreContextModel.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
new file mode 100644
index 00000000..8b516a68
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
@@ -0,0 +1,28 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    [DbContext(typeof(PizzaStoreContext))]
+    public partial class PizzaStoreContextModel : RuntimeModel
+    {
+        static PizzaStoreContextModel()
+        {
+            var model = new PizzaStoreContextModel();
+            model.Initialize();
+            model.Customize();
+            _instance = model;
+        }
+
+        private static PizzaStoreContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
new file mode 100644
index 00000000..d46f50f4
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
@@ -0,0 +1,69 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    public partial class PizzaStoreContextModel
+    {
+        partial void Initialize()
+        {
+            var address = AddressEntityType.Create(this);
+            var latLong = LatLongEntityType.Create(this);
+            var notificationSubscription = NotificationSubscriptionEntityType.Create(this);
+            var order = OrderEntityType.Create(this);
+            var pizza = PizzaEntityType.Create(this);
+            var pizzaSpecial = PizzaSpecialEntityType.Create(this);
+            var pizzaTopping = PizzaToppingEntityType.Create(this);
+            var pizzaStoreUser = PizzaStoreUserEntityType.Create(this);
+            var topping = ToppingEntityType.Create(this);
+            var deviceFlowCodes = DeviceFlowCodesEntityType.Create(this);
+            var key = KeyEntityType.Create(this);
+            var persistedGrant = PersistedGrantEntityType.Create(this);
+            var identityRole = IdentityRoleEntityType.Create(this);
+            var identityRoleClaimstring = IdentityRoleClaimstringEntityType.Create(this);
+            var identityUserClaimstring = IdentityUserClaimstringEntityType.Create(this);
+            var identityUserLoginstring = IdentityUserLoginstringEntityType.Create(this);
+            var identityUserRolestring = IdentityUserRolestringEntityType.Create(this);
+            var identityUserTokenstring = IdentityUserTokenstringEntityType.Create(this);
+
+            LatLongEntityType.CreateForeignKey1(latLong, order);
+            OrderEntityType.CreateForeignKey1(order, address);
+            PizzaEntityType.CreateForeignKey1(pizza, order);
+            PizzaEntityType.CreateForeignKey2(pizza, pizzaSpecial);
+            PizzaToppingEntityType.CreateForeignKey1(pizzaTopping, pizza);
+            PizzaToppingEntityType.CreateForeignKey2(pizzaTopping, topping);
+            IdentityRoleClaimstringEntityType.CreateForeignKey1(identityRoleClaimstring, identityRole);
+            IdentityUserClaimstringEntityType.CreateForeignKey1(identityUserClaimstring, pizzaStoreUser);
+            IdentityUserLoginstringEntityType.CreateForeignKey1(identityUserLoginstring, pizzaStoreUser);
+            IdentityUserRolestringEntityType.CreateForeignKey1(identityUserRolestring, identityRole);
+            IdentityUserRolestringEntityType.CreateForeignKey2(identityUserRolestring, pizzaStoreUser);
+            IdentityUserTokenstringEntityType.CreateForeignKey1(identityUserTokenstring, pizzaStoreUser);
+
+            AddressEntityType.CreateAnnotations(address);
+            LatLongEntityType.CreateAnnotations(latLong);
+            NotificationSubscriptionEntityType.CreateAnnotations(notificationSubscription);
+            OrderEntityType.CreateAnnotations(order);
+            PizzaEntityType.CreateAnnotations(pizza);
+            PizzaSpecialEntityType.CreateAnnotations(pizzaSpecial);
+            PizzaToppingEntityType.CreateAnnotations(pizzaTopping);
+            PizzaStoreUserEntityType.CreateAnnotations(pizzaStoreUser);
+            ToppingEntityType.CreateAnnotations(topping);
+            DeviceFlowCodesEntityType.CreateAnnotations(deviceFlowCodes);
+            KeyEntityType.CreateAnnotations(key);
+            PersistedGrantEntityType.CreateAnnotations(persistedGrant);
+            IdentityRoleEntityType.CreateAnnotations(identityRole);
+            IdentityRoleClaimstringEntityType.CreateAnnotations(identityRoleClaimstring);
+            IdentityUserClaimstringEntityType.CreateAnnotations(identityUserClaimstring);
+            IdentityUserLoginstringEntityType.CreateAnnotations(identityUserLoginstring);
+            IdentityUserRolestringEntityType.CreateAnnotations(identityUserRolestring);
+            IdentityUserTokenstringEntityType.CreateAnnotations(identityUserTokenstring);
+
+            AddAnnotation("ProductVersion", "6.0.0");
+        }
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
new file mode 100644
index 00000000..18b2d96d
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
@@ -0,0 +1,156 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaStoreUserEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Server.PizzaStoreUser",
+                typeof(PizzaStoreUser),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var accessFailedCount = runtimeEntityType.AddProperty(
+                "AccessFailedCount",
+                typeof(int),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("AccessFailedCount", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<AccessFailedCount>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var email = runtimeEntityType.AddProperty(
+                "Email",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Email", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Email>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var emailConfirmed = runtimeEntityType.AddProperty(
+                "EmailConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("EmailConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<EmailConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnabled = runtimeEntityType.AddProperty(
+                "LockoutEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnd = runtimeEntityType.AddProperty(
+                "LockoutEnd",
+                typeof(DateTimeOffset?),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnd", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnd>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var normalizedEmail = runtimeEntityType.AddProperty(
+                "NormalizedEmail",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedEmail", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedEmail>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedUserName = runtimeEntityType.AddProperty(
+                "NormalizedUserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedUserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedUserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var passwordHash = runtimeEntityType.AddProperty(
+                "PasswordHash",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PasswordHash", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PasswordHash>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumber = runtimeEntityType.AddProperty(
+                "PhoneNumber",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumber", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumber>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumberConfirmed = runtimeEntityType.AddProperty(
+                "PhoneNumberConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumberConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumberConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var securityStamp = runtimeEntityType.AddProperty(
+                "SecurityStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("SecurityStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<SecurityStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var twoFactorEnabled = runtimeEntityType.AddProperty(
+                "TwoFactorEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("TwoFactorEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<TwoFactorEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var userName = runtimeEntityType.AddProperty(
+                "UserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("UserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<UserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedEmail });
+            index.AddAnnotation("Relational:Name", "EmailIndex");
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { normalizedUserName },
+                unique: true);
+            index0.AddAnnotation("Relational:Name", "UserNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUsers");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaToppingEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
new file mode 100644
index 00000000..b97d2a24
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaTopping",
+                typeof(PizzaTopping),
+                baseEntityType);
+
+            var pizzaId = runtimeEntityType.AddProperty(
+                "PizzaId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("PizzaId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<PizzaId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var toppingId = runtimeEntityType.AddProperty(
+                "ToppingId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("ToppingId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<ToppingId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { pizzaId, toppingId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { toppingId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PizzaId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var toppings = principalEntityType.AddNavigation("Toppings",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<PizzaTopping>),
+                propertyInfo: typeof(Pizza).GetProperty("Toppings", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Toppings>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("ToppingId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var topping = declaringEntityType.AddNavigation("Topping",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Topping),
+                propertyInfo: typeof(PizzaTopping).GetProperty("Topping", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<Topping>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PizzaTopping");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Models/ToppingEntityType.cs b/save-points/08-templated-components/BlazingPizza.Server/Models/ToppingEntityType.cs
new file mode 100644
index 00000000..9295f9bf
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/Models/ToppingEntityType.cs
@@ -0,0 +1,62 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class ToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Topping",
+                typeof(Topping),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Topping).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Topping).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var price = runtimeEntityType.AddProperty(
+                "Price",
+                typeof(decimal),
+                propertyInfo: typeof(Topping).GetProperty("Price", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Price>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Toppings");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/NotificationsController.cs b/save-points/08-templated-components/BlazingPizza.Server/NotificationsController.cs
deleted file mode 100644
index bb3b96ff..00000000
--- a/save-points/08-templated-components/BlazingPizza.Server/NotificationsController.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("notifications")]
-    [ApiController]
-    [Authorize]
-    public class NotificationsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public NotificationsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpPut("subscribe")]
-        public async Task<NotificationSubscription> Subscribe(NotificationSubscription subscription)
-        {
-            // We're storing at most one subscription per user, so delete old ones.
-            // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-            var userId = GetUserId();
-            var oldSubscriptions = _db.NotificationSubscriptions.Where(e => e.UserId == userId);
-            _db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
-
-            // Store new subscription
-            subscription.UserId = userId;
-            _db.NotificationSubscriptions.Attach(subscription);
-
-            await _db.SaveChangesAsync();
-            return subscription;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-    }
-}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/08-templated-components/BlazingPizza.Server/OidcConfigurationController.cs
index c074debf..dc75ecb3 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/OidcConfigurationController.cs
@@ -1,26 +1,21 @@
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class OidcConfigurationController : Controller
 {
-    public class OidcConfigurationController : Controller
-    {
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-        {
-            ClientRequestParametersProvider = clientRequestParametersProvider;
-        }
+	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+	{
+		ClientRequestParametersProvider = clientRequestParametersProvider;
+	}
 
-        public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-        [HttpGet("_configuration/{clientId}")]
-        public IActionResult GetClientRequestParameters([FromRoute]string clientId)
-        {
-            var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-            return Ok(parameters);
-        }
-    }
+	[HttpGet("_configuration/{clientId}")]
+	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+	{
+		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+		return Ok(parameters);
+	}
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Server/OrdersController.cs b/save-points/08-templated-components/BlazingPizza.Server/OrdersController.cs
index 72b59890..1859decd 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/OrdersController.cs
@@ -1,115 +1,130 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
+using System.Security.Claims;
+using System.Text.Json;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using WebPush;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+[Route("orders")]
+[ApiController]
+[Authorize]
+public class OrdersController : Controller
 {
-    [Route("orders")]
-    [ApiController]
-    [Authorize]
-    public class OrdersController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public OrdersController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-        {
-            var orders = await _db.Orders
-                .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .OrderByDescending(o => o.CreatedTime)
-                .ToListAsync();
-
-            return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-        }
-
-        [HttpGet("{orderId}")]
-        public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-        {
-            var order = await _db.Orders
-                .Where(o => o.OrderId == orderId)
-                .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .SingleOrDefaultAsync();
-
-            if (order == null)
-            {
-                return NotFound();
-            }
-
-            return OrderWithStatus.FromOrder(order);
-        }
-
-        [HttpPost]
-        public async Task<ActionResult<int>> PlaceOrder(Order order)
-        {
-            order.CreatedTime = DateTime.Now;
-            order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-            order.UserId = GetUserId();
-
-            // Enforce existence of Pizza.SpecialId and Topping.ToppingId
-            // in the database - prevent the submitter from making up
-            // new specials and toppings
-            foreach (var pizza in order.Pizzas)
-            {
-                pizza.SpecialId = pizza.Special.Id;
-                pizza.Special = null;
-
-                foreach (var topping in pizza.Toppings)
-                {
-                    topping.ToppingId = topping.Topping.Id;
-                    topping.Topping = null;
-                }
-            }
-
-            _db.Orders.Attach(order);
-            await _db.SaveChangesAsync();
-
-            // In the background, send push notifications if possible
-            var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-            if (subscription != null)
-            {
-                _ = TrackAndSendNotificationsAsync(order, subscription);
-            }
-
-            return order.OrderId;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-
-        private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-        {
-            // In a realistic case, some other backend process would track
-            // order delivery progress and send us notifications when it
-            // changes. Since we don't have any such process here, fake it.
-            await Task.Delay(OrderWithStatus.PreparationDuration);
-            await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-            await Task.Delay(OrderWithStatus.DeliveryDuration);
-            await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-        }
-
-        private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-        {
-            // This will be implemented later
-            return Task.CompletedTask;
-        }
-    }
+	private readonly PizzaStoreContext _db;
+
+	public OrdersController(PizzaStoreContext db)
+	{
+		_db = db;
+	}
+
+	[HttpGet]
+	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+	{
+		var orders = await _db.Orders
+				.Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.OrderByDescending(o => o.CreatedTime)
+				.ToListAsync();
+
+		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+	}
+
+	[HttpGet("{orderId}")]
+	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+	{
+		var order = await _db.Orders
+				.Where(o => o.OrderId == orderId)
+				.Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.SingleOrDefaultAsync();
+
+		if (order == null)
+		{
+			return NotFound();
+		}
+
+		return OrderWithStatus.FromOrder(order);
+	}
+
+	[HttpPost]
+	public async Task<ActionResult<int>> PlaceOrder(Order order)
+	{
+		order.CreatedTime = DateTime.Now;
+		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+		order.UserId = GetUserId();
+
+		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
+		// in the database - prevent the submitter from making up
+		// new specials and toppings
+		foreach (var pizza in order.Pizzas)
+		{
+			pizza.SpecialId = pizza.Special.Id;
+			pizza.Special = null;
+
+			foreach (var topping in pizza.Toppings)
+			{
+				topping.ToppingId = topping.Topping.Id;
+				topping.Topping = null;
+			}
+		}
+
+		_db.Orders.Attach(order);
+		await _db.SaveChangesAsync();
+
+		// In the background, send push notifications if possible
+		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+		if (subscription != null)
+		{
+			_ = TrackAndSendNotificationsAsync(order, subscription);
+		}
+
+		return order.OrderId;
+	}
+
+	private string GetUserId()
+	{
+		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+	{
+		// In a realistic case, some other backend process would track
+		// order delivery progress and send us notifications when it
+		// changes. Since we don't have any such process here, fake it.
+		await Task.Delay(OrderWithStatus.PreparationDuration);
+		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+		await Task.Delay(OrderWithStatus.DeliveryDuration);
+		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+	}
+
+	private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+	{
+		// For a real application, generate your own
+		var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
+		var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
+
+		var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
+		var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
+		var webPushClient = new WebPushClient();
+		try
+		{
+			var payload = JsonSerializer.Serialize(new
+			{
+				message,
+				url = $"myorders/{order.OrderId}",
+			});
+			await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
+		}
+		catch (Exception ex)
+		{
+			Console.Error.WriteLine("Error sending push notification: " + ex.Message);
+		}
+	}
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/08-templated-components/BlazingPizza.Server/PizzaApiExtensions.cs
new file mode 100644
index 00000000..bf6b7bde
--- /dev/null
+++ b/save-points/08-templated-components/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -0,0 +1,60 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
+
+namespace BlazingPizza.Server;
+
+public static class PizzaApiExtensions
+{
+
+	public static WebApplication MapPizzaApi(this WebApplication app)
+	{
+
+		// Subscribe to notifications
+		app.MapPut("/notifications/subscribe", [Authorize] async (
+			HttpContext context,
+			PizzaStoreContext db,
+			NotificationSubscription subscription) =>
+		{
+
+			// We're storing at most one subscription per user, so delete old ones.
+			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+			var userId = GetUserId(context);
+			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+
+			// Store new subscription
+			subscription.UserId = userId;
+			db.NotificationSubscriptions.Attach(subscription);
+
+			await db.SaveChangesAsync();
+			return Results.Ok(subscription);
+
+		});
+
+		// Specials
+		app.MapGet("/specials", async (PizzaStoreContext db) =>
+		{
+
+			var specials = await db.Specials.ToListAsync();
+			return Results.Ok(specials);
+
+		});
+
+		// Toppings
+		app.MapGet("/toppings", async (PizzaStoreContext db) =>
+		{
+			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+			return Results.Ok(toppings);
+		});
+
+		return app;
+
+	}
+
+	private static string GetUserId(HttpContext context)
+	{
+		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+}
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreContext.cs
index 9485bd12..9a2e17ee 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreContext.cs
@@ -3,37 +3,36 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-    public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
-    {
-        public PizzaStoreContext(
-            DbContextOptions options,
-            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-        {
-        }
+	public PizzaStoreContext(
+			DbContextOptions options,
+			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+	{
+	}
 
-        public DbSet<Order> Orders { get; set; }
+	public DbSet<Order> Orders { get; set; }
 
-        public DbSet<Pizza> Pizzas { get; set; }
+	public DbSet<Pizza> Pizzas { get; set; }
 
-        public DbSet<PizzaSpecial> Specials { get; set; }
+	public DbSet<PizzaSpecial> Specials { get; set; }
 
-        public DbSet<Topping> Toppings { get; set; }
+	public DbSet<Topping> Toppings { get; set; }
 
-        public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
+	protected override void OnModelCreating(ModelBuilder modelBuilder)
+	{
+		base.OnModelCreating(modelBuilder);
 
-            // Configuring a many-to-many special -> topping relationship that is friendly for serialization
-            modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-            modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-            modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
+		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-            // Inline the Lat-Long pairs in Order rather than having a FK to another table
-            modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-        }
-    }
-}
\ No newline at end of file
+		// Inline the Lat-Long pairs in Order rather than having a FK to another table
+		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+	}
+}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreUser.cs b/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreUser.cs
index 171ce83d..7ab40235 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreUser.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreUser.cs
@@ -1,8 +1,5 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace BlazingPizza.Server
-{
-    public class PizzaStoreUser : IdentityUser
-    {
-    }
-}
\ No newline at end of file
+namespace BlazingPizza.Server;
+
+public class PizzaStoreUser : IdentityUser { }
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Server/PizzasController.cs b/save-points/08-templated-components/BlazingPizza.Server/PizzasController.cs
deleted file mode 100644
index c082552c..00000000
--- a/save-points/08-templated-components/BlazingPizza.Server/PizzasController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("pizzas")]
-    [ApiController]
-    public class PizzasController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public PizzasController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-    }
-}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Program.cs b/save-points/08-templated-components/BlazingPizza.Server/Program.cs
index 40a47641..4484d8f7 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/Program.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/Program.cs
@@ -1,33 +1,67 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.EntityFrameworkCore;
+using BlazingPizza.Server;
 
-namespace BlazingPizza.Server
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddControllersWithViews()
+	.AddJsonOptions(options =>  {
+		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+	});
+builder.Services.AddRazorPages();
+
+builder.Services.AddDbContext<PizzaStoreContext>(options =>
+		options.UseSqlite("Data Source=pizza.db")
+			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+
+builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
+		.AddEntityFrameworkStores<PizzaStoreContext>();
+
+builder.Services.AddIdentityServer()
+		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+
+builder.Services.AddAuthentication()
+		.AddIdentityServerJwt();
+
+var app = builder.Build();
+
+// Initialize the database
+var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
+using (var scope = scopeFactory.CreateScope())
+{
+	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+	if (db.Database.EnsureCreated())
+	{
+		SeedData.Initialize(db);
+	}
+}
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseWebAssemblyDebugging();
+}
+else
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var host = CreateHostBuilder(args).Build();
-
-            // Initialize the database
-            var scopeFactory = host.Services.GetRequiredService<IServiceScopeFactory>();
-            using (var scope = scopeFactory.CreateScope())
-            {
-                var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-                if (db.Database.EnsureCreated())
-                {
-                    SeedData.Initialize(db);
-                }
-            }
-
-            host.Run();
-        }
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+    app.UseExceptionHandler("/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
 }
+
+app.UseHttpsRedirection();
+app.UseBlazorFrameworkFiles();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseIdentityServer();
+app.UseAuthorization();
+
+app.MapPizzaApi();
+
+app.MapRazorPages();
+app.MapControllers();
+app.MapFallbackToFile("index.html");
+
+app.Run();
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Server/SeedData.cs b/save-points/08-templated-components/BlazingPizza.Server/SeedData.cs
index 7c86a5b2..a1e47973 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/SeedData.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/SeedData.cs
@@ -1,193 +1,192 @@
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public static class SeedData
 {
-    public static class SeedData
-    {
-        public static void Initialize(PizzaStoreContext db)
-        {
-            var toppings = new Topping[]
-            {
-                new Topping()
-                {
-                    Name = "Extra cheese",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "American bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "British bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Canadian bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Tea and crumpets",
-                    Price = 5.00m
-                },
-                new Topping()
-                {
-                    Name = "Fresh-baked scones",
-                    Price = 4.50m,
-                },
-                new Topping()
-                {
-                    Name = "Bell peppers",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Onions",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Mushrooms",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Pepperoni",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Duck sausage",
-                    Price = 3.20m,
-                },
-                new Topping()
-                {
-                    Name = "Venison meatballs",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "Served on a silver platter",
-                    Price = 250.99m,
-                },
-                new Topping()
-                {
-                    Name = "Lobster on top",
-                    Price = 64.50m,
-                },
-                new Topping()
-                {
-                    Name = "Sturgeon caviar",
-                    Price = 101.75m,
-                },
-                new Topping()
-                {
-                    Name = "Artichoke hearts",
-                    Price = 3.40m,
-                },
-                new Topping()
-                {
-                    Name = "Fresh tomatoes",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Basil",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Steak (medium-rare)",
-                    Price = 8.50m,
-                },
-                new Topping()
-                {
-                    Name = "Blazing hot peppers",
-                    Price = 4.20m,
-                },
-                new Topping()
-                {
-                    Name = "Buffalo chicken",
-                    Price = 5.00m,
-                },
-                new Topping()
-                {
-                    Name = "Blue cheese",
-                    Price = 2.50m,
-                },
-            };
+	public static void Initialize(PizzaStoreContext db)
+	{
+		var toppings = new Topping[]
+		{
+			new Topping()
+			{
+					Name = "Extra cheese",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "American bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "British bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Canadian bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Tea and crumpets",
+					Price = 5.00m
+			},
+			new Topping()
+			{
+					Name = "Fresh-baked scones",
+					Price = 4.50m,
+			},
+			new Topping()
+			{
+					Name = "Bell peppers",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Onions",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Mushrooms",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Pepperoni",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Duck sausage",
+					Price = 3.20m,
+			},
+			new Topping()
+			{
+					Name = "Venison meatballs",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "Served on a silver platter",
+					Price = 250.99m,
+			},
+			new Topping()
+			{
+					Name = "Lobster on top",
+					Price = 64.50m,
+			},
+			new Topping()
+			{
+					Name = "Sturgeon caviar",
+					Price = 101.75m,
+			},
+			new Topping()
+			{
+					Name = "Artichoke hearts",
+					Price = 3.40m,
+			},
+			new Topping()
+			{
+					Name = "Fresh tomatoes",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Basil",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Steak (medium-rare)",
+					Price = 8.50m,
+			},
+			new Topping()
+			{
+					Name = "Blazing hot peppers",
+					Price = 4.20m,
+			},
+			new Topping()
+			{
+					Name = "Buffalo chicken",
+					Price = 5.00m,
+			},
+			new Topping()
+			{
+					Name = "Blue cheese",
+					Price = 2.50m,
+			},
+		};
 
-            var specials = new PizzaSpecial[]
-            {
-                new PizzaSpecial()
-                {
-                    Name = "Basic Cheese Pizza",
-                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/cheese.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 2,
-                    Name = "The Baconatorizor",
-                    Description = "It has EVERY kind of bacon",
-                    BasePrice = 11.99m,
-                    ImageUrl = "img/pizzas/bacon.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 3,
-                    Name = "Classic pepperoni",
-                    Description = "It's the pizza you grew up with, but Blazing hot!",
-                    BasePrice = 10.50m,
-                    ImageUrl = "img/pizzas/pepperoni.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 4,
-                    Name = "Buffalo chicken",
-                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-                    BasePrice = 12.75m,
-                    ImageUrl = "img/pizzas/meaty.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 5,
-                    Name = "Mushroom Lovers",
-                    Description = "It has mushrooms. Isn't that obvious?",
-                    BasePrice = 11.00m,
-                    ImageUrl = "img/pizzas/mushroom.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 6,
-                    Name = "The Brit",
-                    Description = "When in London...",
-                    BasePrice = 10.25m,
-                    ImageUrl = "img/pizzas/brit.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 7,
-                    Name = "Veggie Delight",
-                    Description = "It's like salad, but on a pizza",
-                    BasePrice = 11.50m,
-                    ImageUrl = "img/pizzas/salad.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 8,
-                    Name = "Margherita",
-                    Description = "Traditional Italian pizza with tomatoes and basil",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/margherita.jpg",
-                },
-            };
+		var specials = new PizzaSpecial[]
+		{
+			new PizzaSpecial()
+			{
+					Name = "Basic Cheese Pizza",
+					Description = "It's cheesy and delicious. Why wouldn't you want one?",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/cheese.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 2,
+					Name = "The Baconatorizor",
+					Description = "It has EVERY kind of bacon",
+					BasePrice = 11.99m,
+					ImageUrl = "img/pizzas/bacon.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 3,
+					Name = "Classic pepperoni",
+					Description = "It's the pizza you grew up with, but Blazing hot!",
+					BasePrice = 10.50m,
+					ImageUrl = "img/pizzas/pepperoni.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 4,
+					Name = "Buffalo chicken",
+					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+					BasePrice = 12.75m,
+					ImageUrl = "img/pizzas/meaty.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 5,
+					Name = "Mushroom Lovers",
+					Description = "It has mushrooms. Isn't that obvious?",
+					BasePrice = 11.00m,
+					ImageUrl = "img/pizzas/mushroom.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 6,
+					Name = "The Brit",
+					Description = "When in London...",
+					BasePrice = 10.25m,
+					ImageUrl = "img/pizzas/brit.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 7,
+					Name = "Veggie Delight",
+					Description = "It's like salad, but on a pizza",
+					BasePrice = 11.50m,
+					ImageUrl = "img/pizzas/salad.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 8,
+					Name = "Margherita",
+					Description = "Traditional Italian pizza with tomatoes and basil",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/margherita.jpg",
+			},
+		};
 
-            db.Toppings.AddRange(toppings);
-            db.Specials.AddRange(specials);
-            db.SaveChanges();
-        }
-    }
-}
+		db.Toppings.AddRange(toppings);
+		db.Specials.AddRange(specials);
+		db.SaveChanges();
+	}
+}
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Server/SpecialsController.cs b/save-points/08-templated-components/BlazingPizza.Server/SpecialsController.cs
deleted file mode 100644
index a176844c..00000000
--- a/save-points/08-templated-components/BlazingPizza.Server/SpecialsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("specials")]
-    [ApiController]
-    public class SpecialsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public SpecialsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()
-        {
-            return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();
-        }
-    }
-}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Startup.cs b/save-points/08-templated-components/BlazingPizza.Server/Startup.cs
deleted file mode 100644
index ed3fca06..00000000
--- a/save-points/08-templated-components/BlazingPizza.Server/Startup.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace BlazingPizza.Server
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllersWithViews();
-            services.AddRazorPages();
-
-            services.AddDbContext<PizzaStoreContext>(options => 
-                options.UseSqlite("Data Source=pizza.db"));
-
-            services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-                .AddEntityFrameworkStores<PizzaStoreContext>();
-
-            services.AddIdentityServer()
-                .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
-
-            services.AddAuthentication()
-                .AddIdentityServerJwt();
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                app.UseWebAssemblyDebugging();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Error");
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
-
-            app.UseHttpsRedirection();
-            app.UseBlazorFrameworkFiles();
-            app.UseStaticFiles();
-
-            app.UseRouting();
-
-            app.UseAuthentication();
-            app.UseIdentityServer();
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-                endpoints.MapRazorPages();
-                endpoints.MapFallbackToFile("index.html");
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Server/ToppingsController.cs b/save-points/08-templated-components/BlazingPizza.Server/ToppingsController.cs
deleted file mode 100644
index 6a677639..00000000
--- a/save-points/08-templated-components/BlazingPizza.Server/ToppingsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("toppings")]
-    [ApiController]
-    public class ToppingsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public ToppingsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<Topping>>> GetToppings()
-        {
-            return await _db.Toppings.OrderBy(t => t.Name).ToListAsync();
-        }
-    }
-}
diff --git a/save-points/08-templated-components/BlazingPizza.Server/pizza.db-shm b/save-points/08-templated-components/BlazingPizza.Server/pizza.db-shm
new file mode 100644
index 0000000000000000000000000000000000000000..7b8f383c3b8a7ccffba7f5c3993270d890352888
GIT binary patch
literal 32768
zcmeI*H%>!A6oug-XE51BlcULL4^*s*9Z=9w&{Duw*a0;ywK<0*IxZ5DnbCiwqbFHo
zztPwG-s;m%a@y3ElqzR>9;o%<<>$-V&Ba5bwsL=aae8$=|2TH{a$Wu9dHvK|{JV{B
z`S|$jp?9ZN)%R#uJJe3KOYK&B)Lyku?N<lXL3K#2sKe@rI;xJT<LZPusaDk~by}TK
zXVp1%UahGM>Y}=&E~_i*s=B7Gs~hU3x}|Qbb=7LS>Ylo<+RS(VywB%d{XK#J0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@
z2q1s}0tg_000IagfB*srAb>zQ0{-Vci3oV^0f`8B>O>y#%n1?^@Wc-i5%9c~Jn}xH
zCXc%|_m-Y@Lm~og=`eEaADr==ArcYrlqV7q@QkfI;t5+MBH;OEBqHGHa(TqF<w!)p
zll@3Uz;hMzh^H!&h=6BWl8AsOijuMfJk6Cv1UyTZlqKLf#v~%(Dbl1Y0Z;HI5rN)x
z5;?}1j06@kx@&W<+Lun7dja15=K|i^Kq3O(nL)}D@V*if5%9JcQkH->^^k~w_au?B
z1iYh)L<EM?QREnBG7|81HWCr2q~pjj&SWIuy@Vtp;H{9PECFxiBoP7cLnUPico!{+
h2zV1PDNA58d5<*tS-?B6Nm&BkKTaY7-u_M^0<Xy4Fg*YO

literal 0
HcmV?d00001

diff --git a/save-points/08-templated-components/BlazingPizza.Server/pizza.db-wal b/save-points/08-templated-components/BlazingPizza.Server/pizza.db-wal
new file mode 100644
index 0000000000000000000000000000000000000000..3e603ddef0a04c305121dd7b1db8ad9cb4045441
GIT binary patch
literal 226632
zcmeI*3ve6xeIIZ_;t>)hl6R+*V4bWJ1f5ReNs#a$K;j%%#$y5E{UizU#(@{W0$5^!
z1$Gx8!1K*TkCPK$>anLzn>v%)Gj`)~>Kl*UUel?a)Nzx#NvCcdw{BynZf(c0W5;Ri
z`aJe{-1ff<EU^FqNtc=H%&}k2iQN6~|M~g-_w^@eFTXHzYs&nMH%(1FJSBg9>i?X3
z@{=D)IDe`?^oQTR@xmFBq|>I)y#2+sW54l7|1zD7uo7b|@j{K3jCNA`(4ncf8I2_G
zA@a{Em+609AU~(o9r9DDPqRO6^U&0_`122uBZn4#EFXVr;b#j!p8fRP(?_Rg@95uq
z<f}8`X>R8DVd2m#y5sYmaaH`kOS}El!+OK%)4IEtBs$MAaiPcvV(<GS-W27|P{xeg
z6QPWzUZTl(d2ZH7zIyw?qRAMHWvBp^GREQ=V{9!FF?!>%bSC8{=|)o`oKp)XQo*P@
zwP_4fn^*gFcm;-*m|}*lF(zY%%90BDm8dz^L`IMs=^Z4ss|S1x$F>=v8{rGI#PaoA
zg#3_NMN$#zc0}pP<h*>ne80@@Vo_j3acG2t_O)a5t7FXd%jDF~Y3lIDQ&cbzlSgm7
zY}%h;k#yTnrKp&fN*hi6f<)UyI<Po5yLj`N1-;?yS>3IG5~vK{Xt4FNsQ!F-I9O`(
zAY4P^m=LK!DNU@5?zK!j7$fyZsaQrOjnRXU4OC1Cfh~-NQttfDywdsGZl&|-22)^Z
zPE>y`40m2ler=r}l)7){J+#P->!~_8A0rk7wjoceF*7e%qsz>iz>PUHqC!S~`|NSO
z;mQ@=i%n(Z337I^BAN05fv!v9$nM;*!^qJAN0{lVjZcW=zM>ivb(CI?W$M!4<Qh5i
zynJ13)rL<_O{A4mmjK=4-1X5CJ<?CL?RyJTodzo?XSG^f({P%cl%(B3zqQ9&`E914
z8I$H%rrQ`ZGv7KlV@O`nO|kVN(-E5-xiRGEmc%Rjxe>;kbtGZ_mgkt>aN~yV&Iu*F
zF<xRzZ0~}UZsqr8kvQ?d@!^n9%r^-Bq%03|f=?<dnv9wWGX9Krx1`FLa3pLFXK~zt
z@n^`s>p3|`Zmk~G8&00o-4PW;GP_0j-|R4roHS4vgnz;r(95nFl{)p@T$vYGsZvu1
zGdk~k_oN9&?=`2%bWaGpL?$3J=C-J|9~83=i_6Oh{i#AG<>(z$%}TJ;ZfGX*x_k|h
zuS}!G2<4^O8N*vnPMXfLNzN*NKX&VRz20!)g6_rM71_tM$%Wg?7a38rd1N>Onj?ci
z$N`nhsU4jVj-j$+qH@2BksOrQ>1s3R+Q=BxFzmk^jZB%>dPyRIavYg41TRbq)Sycw
zUYebwcesa?u>Hz8<y3KtjTj@zArLj2Gs9ui92tb|zUR+SsWAa_7YgJ;?5A0dDSG)<
zUD`h%RX=hkDYOKEsTaCwiLNzNX3d<YYNVn`>7;y#709h<aueh!u*$b2sxCjoK1jZC
zkCZX_g@9vsnc}4G406ckBX@gsxCvSmcX*+=N{i#Ji-`(fXJV~do)N|jSab9NhMi^z
zEGtc9&Ft`gx*+kwePPCoN1mlK_nM`eDU!2lcJw#jeps2Mw{@CXn&LU8KTDO(>2b4E
zIr5rkX}{E%S^5A|Z$cCYp&rQ~vrONgMd_2uqU^}8gh%8zyTqXx`H^r_!RbG9h)lCZ
zP7r2f_wW$X$id5X@(_NNlw7=ZMW;8MIitH{?t%ASUHUH(hlc9Vyjt{M!XD(oVefrJ
zV?6#b!Aqv2I<H4AlM%MgSnqMnrXJH=7_|5!)g^fHyugjQ_oydgiYY7i$=<sofq%?E
zzMYsS-{klFz4d}${w@9(%fIBBlM{PO3Gx=cAOHafKmY;|fB*y_009U<00Iy=m;#68
zVX2=ZD7D^|{CMT5|AcjcgBfg$3IY&-00bZa0SG_<0uX=z1RyXXp!^Mhx-Rgx_ZQyv
z1^cHyjdg($CG0`~0uX=z1Rwwb2tWV=5P$##4yJ(oHywMQ7s&rOT>dZr?s@a9oQS_8
zkQML+0SG_<0uX=z1Rwwb2tWV=5ID#JGxFfn&kH==`TgH~=X<~Q6MSCaAcq`dg8&2|
z009U<00Izz00bZa0SN2~=;bYSUEtgAdilS7{z&K_;qwA}KG=W&1Rwwb2tWV=5P$##
zAOHaf9Ap9I{})1C7kK7<-}%z79{FuEJ}+>PLyoaQ00Izz00bZa0SG_<0uX=z1oi}u
z%3JEXz?m!m#(wr!^JRQqV9y5|5P$##AOHafKmY;|fB*y_0D*%npezBX>jEEr=Q}?3
zgQu51fX@pY<d9=*5P$##AOHafKmY;|fB*y_0D(P$WAc`|F5rK``<LJO<gfi(d|qJB
z2OAK800bZa0SG_<0uX=z1Rwx`gDh}d9-O)^;Q7;)4}SAYKY9V57dXfv$JihM0SG_<
z0uX=z1Rwwb2tWV=djiT5fVwWguin16xsdu4)&=%_umJ%GKmY;|fB*y_009U<00Iy=
z$O7~7;M8@2`Ln<5IQ;Ur-hsa(ILIN#*dPD_2tWV=5P$##AOHafKmY=J0t@n%x-Rg(
zkNo53rjLjQd|qJB2OAK800bZa0SG_<0uX=z1Rwx`gDmi{JUDe-;Gcc^ZOP}}UHfCK
z3moK-V{8zB00bZa0SG_<0uX=z1Rwx`J%LB$Ep=VsgRxH-K6>{2BGv`=e6Rrl2tWV=
z5P$##AOHafKmY;|ILHEz%7ata1zuu4VcuDDd<5$P2RY;z8w4N#0SG_<0uX=z1Rwwb
z2tZ&@;Do%Tt_v7G{0INx_#dB3&dqnG<_`-~^M5k`OLO$Rd-l_FPamD0y`z8ck+05#
zr~k<`cUU;|itaeccHqC}JBLb!)2DTJFG+NsW8y-Q5yam2N4zP@ouP~ww<kgwO}#{u
z@$%fPk$m;`gGG}u7|T!rDrJntGsf6jBx3Z&W9dxFP122~L^!7wOr(NQcWToZrZ%tk
z>+lK;EiuImTVqVd43#An^ea(wtci>uH_|&uYF7{V7>;c-LN~$}Xo=<Pxd{0owTh%7
z((Q=SlgWAcdij2t-NmB7h~m%)2kmRe=vT*>>zB!?ozv9ekEf_$ASRFAc-gc+!y@Un
zpGr|NFO@c$`UQ!$iF9CbZg%nJGYfjd*|WM^0VPlwzR_UoWl{b4@Nlry<UzQG#xWsM
zgHoDU8Qp7{crZrlk5aLWN*bdFAseWe5&~No4W-=qoq476x7|wT(+#G;(wwONTo~@W
zn*7>2KPYwI&U<K)8P`*Fa6U#X2y8>1R%2#futt}eHGvy*XhemK{H=2{hU6996k9Jc
z9kI!=5|g7_60hv%669oKMREoN1iCJXIqOKm{Oz;H^@b}~bT2j)xRJvnyK}>gBS#0C
zVWzA0eZoZ8S5!l)B6&HMsY`=%bL7PJ@^!IQ8$P!+6Gb`miSIp5eIG5+BmGp{zITAA
zPJ<Pci-KBQ({P%c)1=)&zqQ9&`E9148I$H%rrQ`Zv2S^f=?yn-=<b|Q;uGT~w#4=>
zNa<F7Zx)FY4;&wk*~EN<=uOJ<ASd{wvZBeTiSYO{-rbTaV>}Z!hqE~D!1yy{-}RiF
zBezzM>J2AP>h6dNBAK3|{BL%cMot<i4B|Io3iq;WMy1XjH&^BbR;tw0!HiDa-aTo;
z(R)owGG7w{FOeC<jJYkU?FYrI!{YKXLVv1|Sv7hGRkIQ-wHun5xGrBb<SWx?F+zE1
zcE<3QlanqtvPsS=e?NBXdA;6n;ezhP-WA!$w8@3r%NH3@vw37V0-7U(K*#}=%c&im
z5RRd;W1@1utBD+x*XeRG=-S8_)G+M7o{UVH*LqDMfpQ#~F$6D63e=!WBwm`Gqj$K6
zl(7BEIptJwi;Wl~$srImn=`{<(;OLu?Y`&FP^mEia~BHaO6sRsjwyQiR$baZA5}kc
zD=4%CfvFd|X^E~iRA$YbrfQ_3N$I3~i51AbWO5VaDX_}7B&sey#6C#AagUTSUZ~L=
zyUP?Ob!U)6HXpg$tHVvuqPW8g#Z_7ycU??W_&O77)$)umX26=G4>0UBLtt5HB5P)c
z_tOQ57w!u)W<2sNow?U6)l89`RkNeN`S!!gEWNGM%+eIkG5uMpY)+4xrOJ`lJWKnf
z#>~<On0gbUI0*Gf2AO60{wzwLR2F6DA@VYLM1G-69Ga1z={6Od{xhM-G+X2ZVMcZj
z4<U^lyj&*_;a5q?#amZ&dc&DBx;y3`c<<Gv{}OR%s1D7mMgJx2K^`3T-bXaX;~x{e
zWIC$zdgL-0Ve5?b9>;9zG0lZRi$79bf+x=l+?achdLpKnvT~msda)$oBO!Q9j)S@`
z@E*fMAN$vzd4ZifRG2zC^|`49@7xEDT%Y;)^uL&?9{R|1cj|M;ugv}E*hi1KW?z}L
z9{tqRJLJ-@{fkteKYu}Y^QiLhuUun-@@s+S)OoTWt6<DWWsRmm9+NR1Bd>*n>peM1
zOoKVvyI?Kee!`$Pn9aHudCiF@pV}F|%G5RYh~EC=BQs;K_TJ&ac_>%0?~b7|NBA;Z
zCl5YtmaHA9AsmU-J;Jz7bFICnhe71EFW6)eVK8#FZ`zr7+0^ghRikORJ0wAAd$HeJ
zZMEdReY9Flf|yfBJ^bq4PaSz*-=mYCQI&UgIbc32LXi~|uRHB^`zSK?$mDUS&695X
z`+B3fs`iF`=633&@<Mp`*^vk<mzY5X%I=#c#aB7{fZ>(%PKv!&b0|pt1}4R*U*~;;
zqEyq5NpHJf(l{IwwZ7ps6eT7~vB@#H-?ZqpI&ghmX2n}i-D{Cx(0H#inn|G~oW5;2
zp`7)1doQ7b{K~1IIqQ4-rzXvc-r>Qt7(SE6ug|IHJ$b2^aO$f$e5}~u=&trkFgV-Q
z^LK0`6K9#);o)gE+--6JP<tTv@xD{8SLf?}9k}t>jNw791O47;Lf%U;+@5;0ccr(F
zTnD@y&DJzA@9m$Q6!YHULChcMVPNlKr<T?RVC-_Cl2N;aq6xinY{FgOf#=20wY=A@
z*E@!{rykiK0{M*WHQzf82m6nX3&G&<-zEgw(yw0#<W?T!2Cx@`LAPGlOSkeQclbLu
zuIO%_Ri3DVSxw00PKdc)-v?JjCG|o-68(p)iN!{rxs<~4t)y40Y4N7+oZjFz>u#Rk
z-+uqh?L93FI?zit-J=IX1xLHkFHZWPK8D=XJu$Hl{qtb75545`_vph=!O=eS4$2N{
zAGou6!zJ=ydq!c9b>yqO=Gj(}Gxi%?iv^Qw6j{Ae9&v|qYnxKa$gK>Xa(hp5H+63w
zJ7T#&zvJ>|usC`Ko|`b@eFaCmF&J^LViS3VIQ*Xt7cc7W#+A!&g5BMv`@cQWZlCS9
z*#8xp_R!#bS5n7achv{%e#Q65GIEC;Zby4%xNK5eBlpEYy%X+=+In)zj@bJlcV+kq
zOs#hKvA9=84k9VBxc`ZG{L|M^vq~p#KlQL4zonFaxvI{I{l7pQEC&y=Y3BvGJokPR
zi{Da?``uq}UErkrR<EuL<iGOD?=<c<AH&}fy!N#Ylz;#PAOHafKmY;|fB*y_009WR
z0R>LUeOA{6e(<d?o_yP>jbm6BcmqZfU4{SzAOHafKmY;|fB*y_009WRb^(K2L|qs7
z*4>wX{%2Qy@^@$DMCJd%P~N~71Rwwb2tWV=5P$##AOHafKmY;<RNzhWxYTulFMj!@
z-}pQAoeDlLa6qGtVL<=_5P$##AOHafKmY;|fB*!B1y0Mm>bk&Rq<j~C(ab-A&kGDA
zVGjZjfB*y_009U<00Izz00ba#Km{I`$EB_dJQn}#?_YUm{&(?tfdd+C3=0AffB*y_
z009U<00Izz00bZ~EO18NRo4ZWpM*d5;rf5n<MRT;NZ5k_1Rwwb2tWV=5P$##AOHaf
z98iHb%i~hl1>RGe*8kp}^C5g*;DAOO!-4<=AOHafKmY;|fB*y_009UL3!IgA)pdct
z|0CZk@0LF7!n(jP680bf0SG_<0uX=z1Rwwb2tWV=2UOq*d0gtcz`I{+d_ViczxjLk
zJAwlmZ43(n5P$##AOHafKmY;|fB*y_Ff4FR-c{EHLN9;T@n3KL?yFcA7)HV#1Rwwb
z2tWV=5P$##AOHafK;VE180B%P>jIy({ja%?zVqWRU|ryVMjOL|00bZa0SG_<0uX=z
z1Rwwb2n-9Hmv_~50srpfuYT{sOJBsgz%UZ_AOHafKmY;|fB*y_009U<00IY8z$A}L
zT^Hzl?T5AJeZFH@7dW8N#;_m&0SG_<0uX=z1Rwwb2tWV=!vYuNU3FdHe~P|W#eb;(
z_gEJgM#3HhAOHafKmY;|fB*y_009U<;D8D|DUVBC7x?q}Z_hb?>93cuE^t7jjbT9m
z0uX=z1Rwwb2tWV=5P$##h6OIlyXv~Y#vlEjqxJ0j{}Ss0!${bJ00bZa0SG_<0uX=z
z1Rwwb2pmv>r{r;|>jHoMvyXj0`QN|(%{h{G>hSE;!oQmPtK%1refL;t_9wH_(Z4y`
zJi2h?H;+87|Db+-<|{L+4}IpL!_$Go-#vVnWX2Z+4xGTQS#P*;QFrq!TQ4%5U^bUv
zcX#Ow-)OM)a<2a~Sk$Iky(!9_p^U+pkIEWN6U&&4@tD!1Eom}dHtkhuTFhV78|<fb
zHy;{mTg;^!Oo64jeygHoe0!RFnwCVljlBv?i_cz}F<d{bdw!&exKLySwSnuC8tCU5
ztzJ!Dyy<#cZzx>R-E8hv&j=zbN=z{z&~=G)v6bIu3R19`OEaR#@^!M6={A_eaK3B%
zdoY|~VnzMF4d+%2)Rs+Gji$ZE<sG?w)8b9%qTWE0zSr*GcQ3~>b$JkDx^8|AT_39F
z!FsM1(RBRiWxXLlI&PlSajMf`1zIB7Bg|Lt+t)$SiQUs=S-iP$NpA>~zBnfJ#mm>l
zR*flU*xG2&uiUpc+QJk2Gn8p@_bI)>OU|i_YKN4`D&~9)$F>=v>n;`rG82QvUi#Df
z`Y<Vful?Rpd4BDy(6ku1IAgeQQpc!GhncRJTN4@i=i<JG)T6zM<vqDtlHIh}eUe<1
zE@&=FKBmnU7%yLB#N5DNlX`hy^_qj4BE7~m$K*B#HIma}>O!yWE9xjTnTev>kHMCB
zso(ZmESOx=UKTZZG$qG&VUX3d*f8l0m&oWZC_Nw`LX564LHYXZ78@}}l9R-XV_O}{
z-D^oxMjmX87iu)e?lMI+uW9ie=k<p3q{X93i&TwfxzXmH90nfbxlbcXM$_W+Mxsj2
zlfB!_pjRoLBT<#V2a6-A7ls=pcbbt5{bHkiP^y#%+pCpCRd-HraGP~E&nqJwswl#j
z*}5`M$qivpe=pf|j~)ya9PL8CcyC6Nise2$F|iL`j%I87`_M~1e~&&46&&qD?_mF|
zQu@H1?M<yS3WKaOGPM*rW52=S2|bis+mupfcxuVD$|HXB*b&PG`W=@yRrNvgxd|g4
z<QNn9!9i{0m(R=?!WVT@%7Dct$4X3&Zb`hdKm4#`)jp~`aohj6-f;1v?rvP7^Bki+
zrrkc<?`p>FiBS8VcIIY{<g51#MCJf_WXezhDrJntGsf6jByzQ%Ven8iDT_BAOJ`DU
zQUR$hJk)WMF_8*J-KkAunA#*0PU#+LO}^Flp5x@{*KbN&kAJwHUZrC1hum9#JVgZq
zv5{&QjVa1crKp&fO81ART)E{&<R?BK6`{z}q1T=Ex_#6GG~4f_IC$C|ZCW#op~lsc
za=^zoKR3I0J8@cXIDJ}o_qjnJMa4*b^O)etW9dglHW-bVQ46RBf|SvQz`d4<2V<n}
zC>6`7Ay)33<7!khq{%gTe|vjJ)o0>~S+pHfBP-_mxAVQ$hhwTH5684uMn)YRe=ULC
zdothKkjFjTvgQ$eD5U-Ld(0>j(i?A@F{I6tPU^umJi}KRa%s1Yrko+KahK#*Idxs&
zpC9}6SHAFE?nQiF;K04$Vn7gp00bZa0SG_<0uX=z1Rwx`aRQg+M0H&t_=SHu_sM6k
z$FVLjjtXfIfB*y_009U<00Izz00bZafdeP7D33^87ufp5=USh=_1M?3E^y%Di~&Ia
z0uX=z1Rwwb2tWV=5P$###tA$vC#vfLD_?fiKJequJd1UKaa2fy00bZa0SG_<0uX=z
z1Rwwb2pl+pEAoicb%D>v&$OQMU41*&1rA)CF(3#)00Izz00bZa0SG_<0uX?}IDxBj
zqPi|%|AW@tpT7JdJ=O)rQ6UWi5P$##AOHafKmY;|fB*y_aNq>Y@`%)Rfm`qS<}087
zVdbY-7dUWn#(*FI0SG_<0uX=z1Rwwb2tWV=;{>kBiR!w*A2Kh0|0~-+O=DeP92L?a
z009U<00Izz00bZa0SG_<0tZgux;!FvUEmwS_Z(mS@hh)jUEsjQ83Td<1Rwwb2tWV=
z5P$##AOHafj1#cPiR!w*3%~sfbMv83+`ziPI4Yz;00Izz00bZa0SG_<0uX=z1P+{l
zm5j)$t_$dN?|aqyvv0i*>jDQZ&KM8`AOHafKmY;|fB*y_009U<V4T2VIZ<5~Fnq%D
zmEsRBKQ~9x4lVro)WQ$RH+(?=0uX=z1Rwwb2tWV=5P$##An=A2IDY8xSzU&2G}wAs
zJat@0_R<Zez|x#}gbZpy9+<i=@H@YB>mU5w_q89$>jFpS98(Lwz7U!Ji+N%G%-lET
zevKsH3jz>;00bZa0SG_<0uX=z1g55b@yN{7N&d!p*EN?bBhW=wV);7F8G{ndv2@+o
zV0U+E;|?oTj1pg?C7uzDbiHWI(;~~Uweoc(gLu703*`zUuo8W3yHSqr?S=KE{;*@w
zYQ5$NN|!_<$5t7mNON@YsxjY^jC|cl_gc}^rW}_mT4%~-mNEJmjxATD<(Zi&!*%;v
ztL2)_u~A{_Mz(H@@bw~Jzjp1KrhJ}sL@u7GFh&pAUVDi2V&g4WNG~iw$ylL9W344t
z1fH*n*Nj22en~P)6`J%W-)8xictcZ{no${7zYuA(%?P3}t)DX7JmI)vwOw0wq#JCZ
zYb;dQLY1jsHCA|ujI&i>dR`pUBF7j;WUd;^En1-K62lY;s&R)FYQ`?#GPWApW*J)Q
z%58dDr4r5YYQ@FFa=_ktofz~$B{Ifdl;k?f0<%LZQX<v^_Hgtrd5f0&b6!(_gK0Dv
zfv>Z28(xkUMYdqvOAH+%(r(9f0_Jk{#i(^EwP~!fB>H@bOn?F@JeUB={+_vfkW3bV
z-Q|Unj`VnE*(y&lWeO+^U4^Ac0$Y&9uNgNgUE>bl;)-%G<e}^kA~HP~Z7_O*3JaNl
z1*2CHH74X)N>1m8$-lk7Bgnt+>lgmybCxg5>jJ0d{`b_v_ZGgi@R@~=EWEVPSa^0J
zvhd8p<%JXTKb`;5{HNzXH2<#o#(aL>KmYXnqa-uFAOHafKmY;|fB*y_009U<;0-45
z=&9+c3nx5Wi|N09+palIot&P!a$@Ag+HuYD_+!&kc9M7Rg}MJiEG}KMJ$^zymX;X0
zYP?)yifpT97HEN4T)E~r{^<0S;e<zC5+TbRCm)%fT0G$w7;&&>LXr&+PfwXoxCMzV
zRCuxmQekL867AQPPA`z&oK8zEq0ErgkOJLiX~Al-k|l*x^Q5Yi5k4<Uj36(SNPNS&
zbj|VP-1L<Dbea*`WC=l8K_N|(6$xX5qa~8n=CF{L?Kd5tp1OWwovE`T$x|Z>3VE92
zL;`T)*!0xJ6TViVDlbupbeXYVvpqaJJ$3FxLR}XiOC=8<l~bbXN(o7sJ2E|W`b4}=
z7Kuc%dqOYQ<6$^Xl_H6!XQrpDz44p#bd~f_B&z`oL39`%k_|Ept-SmfgjTJ=NFtFx
zH7yU+OV`N?6j^mr787h_2qzCuPhC1GFX6C6b1(VSAvwFdMi!h3+UzHEa(}3fB+!Fs
zlL@Q*PYI}>7x;zun!lU=)Dz#5*9CMB{d|i2hc5^~00I#B|3%>aQ@Yux!Tnpcqesph
zwXN9PzGZ6JX7RaJ+{;T#7O!o^y5jV>mX@4L4qGa1b2x1lo6T&on=LM*&GL-H@r=!R
zZOLVI*;l+JUuY%X2rjo<<!GZ4sFpmjKr-rOV)<l!joN4x;t8LvR_?kgotP`e3j(_y
z+*yimRYERriz>4Atd&`>1X@dldcd6PMt8S;=CWfexng71edVfu)w3ehw_DvxVO<EU
ziEB~2zg}B)ICocEc|RXXtgo$_gH)Z5uV=a)$=wZG-I4HiB_w5dpEIzXc6B2em#@%H
z+BR36p=Ddk!Un>rk|SG56<59Hwt3m=*>PF&X&2Mo^6v=Ir5fLfc(QHx`euPjIl5GA
zCG4dNORaz{Wo8pzhlg!ML&;2WD`4BqC$sIXM4{5~aofpiVr99Vu(z6V#}Zq%a8#Ts
zC!3<JvE{Qzmm0-vCD7d5P1P#lR&guVvAU&5EEr?M9bYja6ddb}-=D13+df-B2sRrH
zhm<df(b^ibU8ZfEKN()mo2%uzx4M-xuPsy2SiO*}^98Py*bUZ~JArPI;w|aT6`$MN
zSliBu*@n+mUQODA8SlE_uy*Xr;nm8{X3^zLx09iC)|pPPr5riYAIqi%U%8mF(+Qs0
zX;-`Ac7ZQ7qLuXkB{nn3Qn|ov7FMD~cWS$4-pLoYBkR7-S~6qzS{mKxs@>fzHd8#^
zN+df%W7`q6TI0^(wv&&oNFm3TGgykJ+O=rb)r?97#^3D(A}fOE<ChC=Yo_7~C5rVn
z&qvxj)eP@WMXDB-4TZLZHE+>uZpFK-%U7<syQ^k4vs0+FJ>1G#zRY_04TpDaW4YPP
z@YRB}<EVGqT$%FL%JzJKuld`X^^H!RDt0!PTA^@-D|nnjhiY3q;lLW-vBdmMUzYQ4
ztVFxZrE<jAc1xAr$_DQdvuUnti^L=5)o^D$Wu}@d-e}TMsw7Jrg{?$9<qLQ!KAU$X
zC#C|CW{pp-$Csi3+g8RZ#du4AiZw#%Mz$W@$Vg60y%Mzf(}}FPTg(fVr9j=>$VH<b
zDZL?VB!yful?{n@^Qur0%Xznu3R<_=U?mdERir>$jF(*wUpSezH##+eaa0nUqH{ap
z-u8rC%gtP9Ih60ZDLP)*?5?NF)o_vP?$*RDDUuB=S1j&iuuajD5Z$yUY7v_?kfPGz
zPBOf;!!`>IkDJZ;GMQvGQnuHUIe*gL2nJS!be)cuGKusmovQeA8K<M-@w=BA@p9Tr
z)nin3Cs#I$oIBXgmDcmDvs`O7r1kVpxE)x@vOAVeV{O;lbg$XM*+$*GUXHoq)&P|X
ztOR0?HBY^ptqZ#z|9WeQ3JcCqyir<dG{lWnYr_`Xv~N{Jvv)1g@<!<7X2orBRf25Z
zxg86LW~-Q4s?t)x&$t*%xSd{I+AdbvLdnnC6M<dtCcENjIpXPUOU7q*Sa?gDFBYQ0
z?s8|dyc8;j%TZ^u#jVt>L2I!P2(9LFMK<dWZRILULASNc@%7crb}ML4O4(qu8Sb!l
zZmlTngdCNaKW_J@cO!9Twb+fjBJ4`szgh0qR=ADirq5G$Cp}w%N>_+&c@x%Hu_=(l
z+eyJ+iLOVsc}LtGOveK|S<Cv`uFuTvavRy!dcbezEK;JB-Pqy6K6A$0iQ9H!US}vD
zl3botxZvOLJ9n%3ZN9*6#5sP;&sNhS)nrS}Eiao|a&57xR;=BLH*<~jMxwFY4&|Dq
zT{c|K=4?eeNw=3`p+qHR59AuPLeN$UB$CxuF_X4#Fj4E$y0_jAIhvj53KMT<s;*>5
z+ANt@t?9(Fb2mXtsnuG$Kvz9dg!9Csop>_ZE*6<Wbh%vR!q)nh#apOa{i{wliTLWa
z+t!WSme>##*mf~HQP)PdEYt&B$6rgVrHYmUlWh3os~u05jyfG#Y9|m{OXkC3d?#vN
z*=n(?bxWM5GP{YQGuKE}H)DA}*QthhubEFcGR2L0C&jHgwxbrI72Tra*&U~aV;dc|
z7PE^i-QJ;+T#07GJ5hT%lg-k}3fmM{Y|*ZlcTt_-=B_1T*_7hBZepGC*g}cOR>ihr
z5Bei^k6CnVZCWf;utJrbCA!hhIy<3g!@1s(Y}R7JQniHI!A{cNu`PKwZL88oR&>{@
zD_hG^pJT~FuEnt(cO<Z~ZQk10*tBg1%i=22c2)wFb(@$G&3<9oX3Hc}>{4=tv)J32
zU5YD|b1sX2s~hXmwXIyK$WujUCc2zWx4rQw6VGM*?M|~BaBaoS3BFP9xF`n`-bqWo
zoINabGh5|CC%Z&fnqjv&BxJMoT##ybTS8&8wcD|Uy2<WVr{t-wZniv;G?@XLHSdP4
z$ojb5Zn0XZP~k4SzER40{MM~_EwB`BOKY_n%P+eUop>d^(M+@Lk`Ugl)M<OO>yh$F
zjuDnUR(G=Gv+a<3)^3}2m*c6zDpTBbIm>aIrxXa)7%sxD2bf~QWvL{JnQFvS5<4Zk
ztKDLnjAxCuIXkiDQpsA4EayGDN!Lc(=iHH2z3zfNkl)DEqJgllCY7C4hts>BZWiKg
zPi}X2Da?77OVMSA-)g1v=}g{TD=$Zz^m5h1+Ff<V;S8;E_EyoK4q7_(wmnxBiy^+0
zU)|VV_QtwFYga1!<FwQXx9m-+ZY>pRR&RoegaXlM))`wW_?)ROXBC&EWx8FZwm03I
zzLlbb+*NZsF4snLJ-WI|Te^Z!a4kEd-R+Pskta985L+s(N%ak`$x9_F%6CGAx@U7O
z<rdO`pmW6>*tV8;=uTlvqH2|ZnA{+9&|+b2fo02X$G7IA))Qe{gpG1^cx|PV2rmov
zWYn5p&srUu@oXWv)!d=-mVDj36$$J{+Yuid%Y>r&vRm59(L9&WvF-IjFj@0f-RXFn
zPPX!yf;HyM1_M-*4Rp=9<x;0mwp!K;KB4Mo<H6-<wbiMW1P2vhTPv$w#wW7nI{8Ed
zdDJ~7KklmQ0_MBybGcUFf5?jkx`jWRBLCqF0uX=z1Rwwb2tWV=5P$##AOL|kpumO0
z(fj_khYV|x{M-9Gg1@@($koJ$&fV>;3%okD@ah|I;OH_0AOHafKmY;|fB*y_009U<
R00NT*W)Gh^+W)-3{{=7jX*K`=

literal 0
HcmV?d00001

diff --git a/save-points/08-templated-components/BlazingPizza.Shared/Address.cs b/save-points/08-templated-components/BlazingPizza.Shared/Address.cs
index d76bc52a..79be9c5b 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/Address.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/Address.cs
@@ -1,27 +1,24 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class Address
 {
-    public class Address
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        [Required, MaxLength(100)]
-        public string Name { get; set; }
+	[Required, MaxLength(100)]
+	public string Name { get; set; }
 
-        [Required, MaxLength(100)]
-        public string Line1 { get; set; }
+	[Required, MaxLength(100)]
+	public string Line1 { get; set; }
 
-        [MaxLength(100)]
-        public string Line2 { get; set; }
+	[MaxLength(100)]
+	public string Line2 { get; set; }
 
-        [Required, MaxLength(50)]
-        public string City { get; set; }
+	[Required, MaxLength(50)]
+	public string City { get; set; }
 
-        [Required, MaxLength(20)]
-        public string Region { get; set; }
+	[Required, MaxLength(20)]
+	public string Region { get; set; }
 
-        [Required, MaxLength(20)]
-        public string PostalCode { get; set; }
-    }
+	[Required, MaxLength(20)]
+	public string PostalCode { get; set; }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/08-templated-components/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index f7b7dd02..fb17e53b 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/08-templated-components/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -3,8 +3,13 @@
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
+	<ItemGroup>
+		<Using Include="System.ComponentModel.DataAnnotations" />
+	</ItemGroup>
+	
   <ItemGroup>
     <ProjectReference Include="..\BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj" />
   </ItemGroup>
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/LatLong.cs b/save-points/08-templated-components/BlazingPizza.Shared/LatLong.cs
index 9b8c3811..14a94c26 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/LatLong.cs
@@ -1,27 +1,26 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class LatLong
 {
-    public class LatLong
-    {
-        public LatLong()
-        {
-        }
+	public LatLong()
+	{
+	}
 
-        public LatLong(double latitude, double longitude) : this()
-        {
-            Latitude = latitude;
-            Longitude = longitude;
-        }
+	public LatLong(double latitude, double longitude) : this()
+	{
+		Latitude = latitude;
+		Longitude = longitude;
+	}
 
-        public double Latitude { get; set; }
+	public double Latitude { get; set; }
 
-        public double Longitude { get; set; }
+	public double Longitude { get; set; }
 
-        public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-        {
-            // The Earth is flat, right? So no need for spherical interpolation.
-            return new LatLong(
-                start.Latitude + (end.Latitude - start.Latitude) * proportion,
-                start.Longitude + (end.Longitude - start.Longitude) * proportion);
-        }
-    }
-}
+	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+	{
+		// The Earth is flat, right? So no need for spherical interpolation.
+		return new LatLong(
+				start.Latitude + (end.Latitude - start.Latitude) * proportion,
+				start.Longitude + (end.Longitude - start.Longitude) * proportion);
+	}
+}
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/08-templated-components/BlazingPizza.Shared/NotificationSubscription.cs
index 04259c2f..9109ff57 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/NotificationSubscription.cs
@@ -1,17 +1,14 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class NotificationSubscription
 {
-    public class NotificationSubscription
-    {
-        public int NotificationSubscriptionId { get; set; }
+	public int NotificationSubscriptionId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public string Url { get; set; }
+	public string Url { get; set; }
 
-        public string P256dh { get; set; }
+	public string P256dh { get; set; }
 
-        public string Auth { get; set; }
-    }
+	public string Auth { get; set; }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/Order.cs b/save-points/08-templated-components/BlazingPizza.Shared/Order.cs
index fb003bd6..aca04ca1 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/Order.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/Order.cs
@@ -1,25 +1,32 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Order
 {
-    public class Order
-    {
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public DateTime CreatedTime { get; set; }
+	public DateTime CreatedTime { get; set; }
 
-        public Address DeliveryAddress { get; set; } = new Address();
+	public Address DeliveryAddress { get; set; } = new Address();
 
-        public LatLong DeliveryLocation { get; set; }
+	public LatLong DeliveryLocation { get; set; }
 
-        public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-        public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-        public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
-    }
+	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(Order))]
+[JsonSerializable(typeof(OrderWithStatus))]
+[JsonSerializable(typeof(List<OrderWithStatus>))]
+[JsonSerializable(typeof(Pizza))]
+[JsonSerializable(typeof(List<PizzaSpecial>))]
+[JsonSerializable(typeof(List<Topping>))]
+[JsonSerializable(typeof(Topping))]
+public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/08-templated-components/BlazingPizza.Shared/OrderWithStatus.cs
index 021de78c..f5f153b6 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/OrderWithStatus.cs
@@ -1,79 +1,78 @@
-using BlazingPizza.ComponentsLibrary.Map;
-using System;
-using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using BlazingPizza.ComponentsLibrary.Map;
 
-namespace BlazingPizza
+
+namespace BlazingPizza;
+
+public class OrderWithStatus
 {
-    public class OrderWithStatus
-    {
-        public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-        public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-        public Order Order { get; set; }
+	public Order Order { get; set; }
 
-        public string StatusText { get; set; }
+	public string StatusText { get; set; }
 
-        public bool IsDelivered => StatusText == "Delivered";
+	public bool IsDelivered => StatusText == "Delivered";
 
-        public List<Marker> MapMarkers { get; set; }
+	public List<Marker> MapMarkers { get; set; }
 
-        public static OrderWithStatus FromOrder(Order order)
-        {
-            // To simulate a real backend process, we fake status updates based on the amount
-            // of time since the order was placed
-            string statusText;
-            List<Marker> mapMarkers;
-            var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+	public static OrderWithStatus FromOrder(Order order)
+	{
+		// To simulate a real backend process, we fake status updates based on the amount
+		// of time since the order was placed
+		string statusText;
+		List<Marker> mapMarkers;
+		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-            if (DateTime.Now < dispatchTime)
-            {
-                statusText = "Preparing";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-                };
-            }
-            else if (DateTime.Now < dispatchTime + DeliveryDuration)
-            {
-                statusText = "Out for delivery";
+		if (DateTime.Now < dispatchTime)
+		{
+			statusText = "Preparing";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+								};
+		}
+		else if (DateTime.Now < dispatchTime + DeliveryDuration)
+		{
+			statusText = "Out for delivery";
 
-                var startPosition = ComputeStartPosition(order);
-                var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-                var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation),
-                    ToMapMarker("Driver", driverPosition, showPopup: true),
-                };
-            }
-            else
-            {
-                statusText = "Delivered";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-                };
-            }
+			var startPosition = ComputeStartPosition(order);
+			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation),
+										ToMapMarker("Driver", driverPosition, showPopup: true),
+								};
+		}
+		else
+		{
+			statusText = "Delivered";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+								};
+		}
 
-            return new OrderWithStatus
-            {
-                Order = order,
-                StatusText = statusText,
-                MapMarkers = mapMarkers,
-            };
-        }
+		return new OrderWithStatus
+		{
+			Order = order,
+			StatusText = statusText,
+			MapMarkers = mapMarkers,
+		};
+	}
 
-        private static LatLong ComputeStartPosition(Order order)
-        {
-            // Random but deterministic based on order ID
-            var rng = new Random(order.OrderId);
-            var distance = 0.01 + rng.NextDouble() * 0.02;
-            var angle = rng.NextDouble() * Math.PI * 2;
-            var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-            return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-        }
+	private static LatLong ComputeStartPosition(Order order)
+	{
+		// Random but deterministic based on order ID
+		var rng = new Random(order.OrderId);
+		var distance = 0.01 + rng.NextDouble() * 0.02;
+		var angle = rng.NextDouble() * Math.PI * 2;
+		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+	}
 
-        static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
-    }
-}
+	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+}
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/Pizza.cs b/save-points/08-templated-components/BlazingPizza.Shared/Pizza.cs
index ec1108a9..459298f4 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/Pizza.cs
@@ -1,42 +1,44 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+///    /// Represents a customized pizza as part of an order
+/// </summary>
+public class Pizza
 {
-    /// <summary>
-    /// Represents a customized pizza as part of an order
-    /// </summary>
-    public class Pizza
-    {
-        public const int DefaultSize = 12;
-        public const int MinimumSize = 9;
-        public const int MaximumSize = 17;
+	public const int DefaultSize = 12;
+	public const int MinimumSize = 9;
+	public const int MaximumSize = 17;
 
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public PizzaSpecial Special { get; set; }
+	public PizzaSpecial Special { get; set; }
 
-        public int SpecialId { get; set; }
+	public int SpecialId { get; set; }
 
-        public int Size { get; set; }
+	public int Size { get; set; }
 
-        public List<PizzaTopping> Toppings { get; set; }
+	public List<PizzaTopping> Toppings { get; set; }
 
-        public decimal GetBasePrice()
-        {
-            return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-        }
+	public decimal GetBasePrice()
+	{
+		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+	}
 
-        public decimal GetTotalPrice()
-        {
-            return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-        }
+	public decimal GetTotalPrice()
+	{
+		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+	}
 
-        public string GetFormattedTotalPrice()
-        {
-            return GetTotalPrice().ToString("0.00");
-        }
-    }
+	public string GetFormattedTotalPrice()
+	{
+		return GetTotalPrice().ToString("0.00");
+	}
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
+[JsonSerializable(typeof(Pizza))]
+public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/08-templated-components/BlazingPizza.Shared/PizzaSpecial.cs
index 2f2b3383..9653300c 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/PizzaSpecial.cs
@@ -1,20 +1,19 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+/// Represents a pre-configured template for a pizza a user can order
+/// </summary>
+public class PizzaSpecial
 {
-    /// <summary>
-    /// Represents a pre-configured template for a pizza a user can order
-    /// </summary>
-    public class PizzaSpecial
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal BasePrice { get; set; }
+	public decimal BasePrice { get; set; }
 
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public string ImageUrl { get; set; }
+	public string ImageUrl { get; set; }
 
-        public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
-    }
-}
+	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+}
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/PizzaTopping.cs b/save-points/08-templated-components/BlazingPizza.Shared/PizzaTopping.cs
index f5a6c1ac..0a711647 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/PizzaTopping.cs
@@ -1,11 +1,11 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class PizzaTopping
 {
-    public class PizzaTopping
-    {
-        public Topping Topping { get; set; }
+	public Topping Topping { get; set; }
+
+	public int ToppingId { get; set; }
 
-        public int ToppingId { get; set; }
-        
-        public int PizzaId { get; set; }
-    }
-}
+	public int PizzaId { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/Topping.cs b/save-points/08-templated-components/BlazingPizza.Shared/Topping.cs
index 61bdeb92..376c311a 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/Topping.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/Topping.cs
@@ -1,13 +1,13 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Topping
 {
-    public class Topping
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal Price { get; set; }
+	public decimal Price { get; set; }
 
-        public string GetFormattedPrice() => Price.ToString("0.00");
-    }
-}
+	public string GetFormattedPrice() => Price.ToString("0.00");
+	
+}
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/UserInfo.cs b/save-points/08-templated-components/BlazingPizza.Shared/UserInfo.cs
index 4996ef80..362f8f8e 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/UserInfo.cs
@@ -1,9 +1,9 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class UserInfo
 {
-    public class UserInfo
-    {
-        public bool IsAuthenticated { get; set; }
+	public bool IsAuthenticated { get; set; }
 
-        public string Name { get; set; }
-    }
-}
+	public string Name { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/09-progressive-web-app/BlazingPizza.Client/BlazingPizza.Client.csproj
index 7fecc21b..3573ae56 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/JSRuntimeExtensions.cs b/save-points/09-progressive-web-app/BlazingPizza.Client/JSRuntimeExtensions.cs
index 89da520c..cc242348 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/JSRuntimeExtensions.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/JSRuntimeExtensions.cs
@@ -1,13 +1,11 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.Client
+namespace BlazingPizza.Client;
+
+public static class JSRuntimeExtensions
 {
-    public static class JSRuntimeExtensions
-    {
-        public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
-        {
-            return jsRuntime.InvokeAsync<bool>("confirm", message);
-        }
-    }
+	public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
+	{
+		return jsRuntime.InvokeAsync<bool>("confirm", message);
+	}
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/OrderState.cs b/save-points/09-progressive-web-app/BlazingPizza.Client/OrderState.cs
index 5265ae39..4f47979d 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/OrderState.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/OrderState.cs
@@ -1,55 +1,52 @@
-using System.Collections.Generic;
+namespace BlazingPizza.Client;
 
-namespace BlazingPizza.Client
+public class OrderState
 {
-    public class OrderState
-    {
-        public bool ShowingConfigureDialog { get; private set; }
-
-        public Pizza ConfiguringPizza { get; private set; }
-
-        public Order Order { get; private set; } = new Order();
-
-        public void ShowConfigurePizzaDialog(PizzaSpecial special)
-        {
-            ConfiguringPizza = new Pizza()
-            {
-                Special = special,
-                SpecialId = special.Id,
-                Size = Pizza.DefaultSize,
-                Toppings = new List<PizzaTopping>(),
-            };
-
-            ShowingConfigureDialog = true;
-        }
-
-        public void CancelConfigurePizzaDialog()
-        {
-            ConfiguringPizza = null;
-            ShowingConfigureDialog = false;
-        }
-
-        public void ConfirmConfigurePizzaDialog()
-        {
-            Order.Pizzas.Add(ConfiguringPizza);
-            ConfiguringPizza = null;
-
-            ShowingConfigureDialog = false;
-        }
-
-        public void RemoveConfiguredPizza(Pizza pizza)
-        {
-            Order.Pizzas.Remove(pizza);
-        }
-
-        public void ResetOrder()
-        {
-            Order = new Order();
-        }
-
-        public void ReplaceOrder(Order order)
-        {
-            Order = order;
-        }
-    }
+	public bool ShowingConfigureDialog { get; private set; }
+
+	public Pizza ConfiguringPizza { get; private set; }
+
+	public Order Order { get; private set; } = new Order();
+
+	public void ShowConfigurePizzaDialog(PizzaSpecial special)
+	{
+		ConfiguringPizza = new Pizza()
+		{
+			Special = special,
+			SpecialId = special.Id,
+			Size = Pizza.DefaultSize,
+			Toppings = new List<PizzaTopping>(),
+		};
+
+		ShowingConfigureDialog = true;
+	}
+
+	public void CancelConfigurePizzaDialog()
+	{
+		ConfiguringPizza = null;
+		ShowingConfigureDialog = false;
+	}
+
+	public void ConfirmConfigurePizzaDialog()
+	{
+		Order.Pizzas.Add(ConfiguringPizza);
+		ConfiguringPizza = null;
+
+		ShowingConfigureDialog = false;
+	}
+
+	public void RemoveConfiguredPizza(Pizza pizza)
+	{
+		Order.Pizzas.Remove(pizza);
+	}
+
+	public void ResetOrder()
+	{
+		Order = new Order();
+	}
+
+	public void ReplaceOrder(Order order)
+	{
+		Order = order;
+	}
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/OrdersClient.cs b/save-points/09-progressive-web-app/BlazingPizza.Client/OrdersClient.cs
index 01c63572..59dcb35b 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/OrdersClient.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/OrdersClient.cs
@@ -1,41 +1,35 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Threading.Tasks;
-
-namespace BlazingPizza.Client
+using System.Net.Http.Json;
+
+namespace BlazingPizza.Client;
+
+public class OrdersClient
 {
-    public class OrdersClient
-    {
-        private readonly HttpClient httpClient;
+	private readonly HttpClient httpClient;
 
-        public OrdersClient(HttpClient httpClient)
-        {
-            this.httpClient = httpClient;
-        }
+	public OrdersClient(HttpClient httpClient)
+	{
+		this.httpClient = httpClient;
+	}
 
-        public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
-            await httpClient.GetFromJsonAsync<IEnumerable<OrderWithStatus>>("orders");
+	public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
+			await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
 
 
-        public async Task<OrderWithStatus> GetOrder(int orderId) =>
-            await httpClient.GetFromJsonAsync<OrderWithStatus>($"orders/{orderId}");
+	public async Task<OrderWithStatus> GetOrder(int orderId) =>
+			await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
 
 
-        public async Task<int> PlaceOrder(Order order)
-        {
-            var response = await httpClient.PostAsJsonAsync("orders", order);
-            response.EnsureSuccessStatusCode();
-            var orderId = await response.Content.ReadFromJsonAsync<int>();
-            return orderId;
-        }
+	public async Task<int> PlaceOrder(Order order)
+	{
+		var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
+		response.EnsureSuccessStatusCode();
+		var orderId = await response.Content.ReadFromJsonAsync<int>();
+		return orderId;
+	}
 
-        public async Task SubscribeToNotifications(NotificationSubscription subscription)
-        {
-            var response = await httpClient.PutAsJsonAsync("notifications/subscribe", subscription);
-            response.EnsureSuccessStatusCode();
-        }
-    }
+	public async Task SubscribeToNotifications(NotificationSubscription subscription)
+	{
+		var response = await httpClient.PutAsJsonAsync("notifications/subscribe", subscription);
+		response.EnsureSuccessStatusCode();
+	}
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/PizzaAuthenticationState.cs b/save-points/09-progressive-web-app/BlazingPizza.Client/PizzaAuthenticationState.cs
index 3f295928..f5bfef65 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/PizzaAuthenticationState.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/PizzaAuthenticationState.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 
-namespace BlazingPizza.Client
+namespace BlazingPizza.Client;
+
+public class PizzaAuthenticationState : RemoteAuthenticationState
 {
-    public class PizzaAuthenticationState : RemoteAuthenticationState
-    {
-        public Order Order { get; set; }
-    }
+	public Order Order { get; set; }
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs b/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs
index afeee128..41eedccb 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs
@@ -1,31 +1,20 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
+using BlazingPizza.Client;
 
-namespace BlazingPizza.Client
-{
-    public class Program
-    {
-        public static async Task Main(string[] args)
-        {
-            var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("#app");
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<App>("#app");
 
-            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
-            builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
-                .AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
-            builder.Services.AddScoped<OrderState>();
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
+		.AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
+builder.Services.AddScoped<OrderState>();
 
-            // Add auth services
-            builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
-            {
-                options.AuthenticationPaths.LogOutSucceededPath = "";
-            });
+// Add auth services
+builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
+{
+	options.AuthenticationPaths.LogOutSucceededPath = "";
+});
 
-            await builder.Build().RunAsync();
-        }
-    }
-}
+await builder.Build().RunAsync();
diff --git a/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index 1ec992ad..edb7908d 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index f36b098e..bb84f13c 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -1,17 +1,15 @@
 using Microsoft.JSInterop;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.ComponentsLibrary
+namespace BlazingPizza.ComponentsLibrary;
+
+public static class LocalStorage
 {
-    public static class LocalStorage
-    {
-        public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-        public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-        public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
-    }
-}
+	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+}
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/09-progressive-web-app/BlazingPizza.Server/BlazingPizza.Server.csproj
index e1e7aaef..abd2317b 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/AddressEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/AddressEntityType.cs
new file mode 100644
index 00000000..82db81b6
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/AddressEntityType.cs
@@ -0,0 +1,92 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class AddressEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Address",
+                typeof(Address),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Address).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var city = runtimeEntityType.AddProperty(
+                "City",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("City", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<City>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var line1 = runtimeEntityType.AddProperty(
+                "Line1",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var line2 = runtimeEntityType.AddProperty(
+                "Line2",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var postalCode = runtimeEntityType.AddProperty(
+                "PostalCode",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("PostalCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<PostalCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var region = runtimeEntityType.AddProperty(
+                "Region",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Region", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Region>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Address");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
new file mode 100644
index 00000000..1dd4563b
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
@@ -0,0 +1,114 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class DeviceFlowCodesEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes",
+                typeof(DeviceFlowCodes),
+                baseEntityType);
+
+            var userCode = runtimeEntityType.AddProperty(
+                "UserCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("UserCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<UserCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var deviceCode = runtimeEntityType.AddProperty(
+                "DeviceCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("DeviceCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<DeviceCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userCode });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deviceCode },
+                unique: true);
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DeviceCodes");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
new file mode 100644
index 00000000..8946b261
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>",
+                typeof(IdentityRoleClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoleClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityRoleEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
new file mode 100644
index 00000000..2f1fec2b
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
@@ -0,0 +1,78 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRole",
+                typeof(IdentityRole),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedName = runtimeEntityType.AddProperty(
+                "NormalizedName",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("NormalizedName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<NormalizedName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedName },
+                unique: true);
+            index.AddAnnotation("Relational:Name", "RoleNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
new file mode 100644
index 00000000..55418a1e
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserClaim<string>",
+                typeof(IdentityUserClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
new file mode 100644
index 00000000..3ca029bd
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserLoginstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserLogin<string>",
+                typeof(IdentityUserLogin<string>),
+                baseEntityType);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerKey = runtimeEntityType.AddProperty(
+                "ProviderKey",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderKey", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderKey>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerDisplayName = runtimeEntityType.AddProperty(
+                "ProviderDisplayName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderDisplayName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderDisplayName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { loginProvider, providerKey });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserLogins");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
new file mode 100644
index 00000000..70078d7a
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
@@ -0,0 +1,82 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserRolestringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserRole<string>",
+                typeof(IdentityUserRole<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, roleId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
new file mode 100644
index 00000000..93ba6d31
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
@@ -0,0 +1,84 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserTokenstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserToken<string>",
+                typeof(IdentityUserToken<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var value = runtimeEntityType.AddProperty(
+                "Value",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Value", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Value>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, loginProvider, name });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserTokens");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/KeyEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/KeyEntityType.cs
new file mode 100644
index 00000000..f6c6b4c7
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/KeyEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class KeyEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.Key",
+                typeof(Key),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var algorithm = runtimeEntityType.AddProperty(
+                "Algorithm",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Algorithm", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Algorithm>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var created = runtimeEntityType.AddProperty(
+                "Created",
+                typeof(DateTime),
+                propertyInfo: typeof(Key).GetProperty("Created", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Created>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var dataProtected = runtimeEntityType.AddProperty(
+                "DataProtected",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("DataProtected", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<DataProtected>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var isX509Certificate = runtimeEntityType.AddProperty(
+                "IsX509Certificate",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("IsX509Certificate", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<IsX509Certificate>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var use = runtimeEntityType.AddProperty(
+                "Use",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Use", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Use>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var version = runtimeEntityType.AddProperty(
+                "Version",
+                typeof(int),
+                propertyInfo: typeof(Key).GetProperty("Version", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Version>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { use });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Keys");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/LatLongEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/LatLongEntityType.cs
new file mode 100644
index 00000000..3fd254bd
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/LatLongEntityType.cs
@@ -0,0 +1,80 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class LatLongEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.LatLong",
+                typeof(LatLong),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var latitude = runtimeEntityType.AddProperty(
+                "Latitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Latitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Latitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var longitude = runtimeEntityType.AddProperty(
+                "Longitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Longitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Longitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                ownership: true);
+
+            var deliveryLocation = principalEntityType.AddNavigation("DeliveryLocation",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(LatLong),
+                propertyInfo: typeof(Order).GetProperty("DeliveryLocation", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryLocation>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
new file mode 100644
index 00000000..db236e4c
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
@@ -0,0 +1,77 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class NotificationSubscriptionEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.NotificationSubscription",
+                typeof(NotificationSubscription),
+                baseEntityType);
+
+            var notificationSubscriptionId = runtimeEntityType.AddProperty(
+                "NotificationSubscriptionId",
+                typeof(int),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("NotificationSubscriptionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<NotificationSubscriptionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var auth = runtimeEntityType.AddProperty(
+                "Auth",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Auth", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Auth>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var p256dh = runtimeEntityType.AddProperty(
+                "P256dh",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("P256dh", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<P256dh>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var url = runtimeEntityType.AddProperty(
+                "Url",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Url", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Url>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { notificationSubscriptionId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "NotificationSubscriptions");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/OrderEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/OrderEntityType.cs
new file mode 100644
index 00000000..9d9ec6fd
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/OrderEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class OrderEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Order",
+                typeof(Order),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Order).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var createdTime = runtimeEntityType.AddProperty(
+                "CreatedTime",
+                typeof(DateTime),
+                propertyInfo: typeof(Order).GetProperty("CreatedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<CreatedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var deliveryAddressId = runtimeEntityType.AddProperty(
+                "DeliveryAddressId",
+                typeof(int?),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(Order).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deliveryAddressId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("DeliveryAddressId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var deliveryAddress = declaringEntityType.AddNavigation("DeliveryAddress",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Address),
+                propertyInfo: typeof(Order).GetProperty("DeliveryAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PersistedGrantEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
new file mode 100644
index 00000000..842d53a5
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
@@ -0,0 +1,127 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PersistedGrantEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.PersistedGrant",
+                typeof(PersistedGrant),
+                baseEntityType);
+
+            var key = runtimeEntityType.AddProperty(
+                "Key",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Key", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Key>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var consumedTime = runtimeEntityType.AddProperty(
+                "ConsumedTime",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ConsumedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ConsumedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(PersistedGrant).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var type = runtimeEntityType.AddProperty(
+                "Type",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Type", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Type>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var key0 = runtimeEntityType.AddKey(
+                new[] { key });
+            runtimeEntityType.SetPrimaryKey(key0);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { consumedTime });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            var index1 = runtimeEntityType.AddIndex(
+                new[] { subjectId, clientId, type });
+
+            var index2 = runtimeEntityType.AddIndex(
+                new[] { subjectId, sessionId, type });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PersistedGrants");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaEntityType.cs
new file mode 100644
index 00000000..3a124e63
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaEntityType.cs
@@ -0,0 +1,111 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Pizza",
+                typeof(Pizza),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var size = runtimeEntityType.AddProperty(
+                "Size",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Size", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Size>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var specialId = runtimeEntityType.AddProperty(
+                "SpecialId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("SpecialId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<SpecialId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { orderId });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { specialId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var pizzas = principalEntityType.AddNavigation("Pizzas",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<Pizza>),
+                propertyInfo: typeof(Order).GetProperty("Pizzas", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<Pizzas>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("SpecialId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var special = declaringEntityType.AddNavigation("Special",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(PizzaSpecial),
+                propertyInfo: typeof(Pizza).GetProperty("Special", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Special>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Pizzas");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
new file mode 100644
index 00000000..e86b0f50
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
@@ -0,0 +1,76 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaSpecialEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaSpecial",
+                typeof(PizzaSpecial),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var basePrice = runtimeEntityType.AddProperty(
+                "BasePrice",
+                typeof(decimal),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("BasePrice", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<BasePrice>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var imageUrl = runtimeEntityType.AddProperty(
+                "ImageUrl",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("ImageUrl", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<ImageUrl>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Specials");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaStoreContextModel.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
new file mode 100644
index 00000000..8b516a68
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
@@ -0,0 +1,28 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    [DbContext(typeof(PizzaStoreContext))]
+    public partial class PizzaStoreContextModel : RuntimeModel
+    {
+        static PizzaStoreContextModel()
+        {
+            var model = new PizzaStoreContextModel();
+            model.Initialize();
+            model.Customize();
+            _instance = model;
+        }
+
+        private static PizzaStoreContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
new file mode 100644
index 00000000..d46f50f4
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
@@ -0,0 +1,69 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    public partial class PizzaStoreContextModel
+    {
+        partial void Initialize()
+        {
+            var address = AddressEntityType.Create(this);
+            var latLong = LatLongEntityType.Create(this);
+            var notificationSubscription = NotificationSubscriptionEntityType.Create(this);
+            var order = OrderEntityType.Create(this);
+            var pizza = PizzaEntityType.Create(this);
+            var pizzaSpecial = PizzaSpecialEntityType.Create(this);
+            var pizzaTopping = PizzaToppingEntityType.Create(this);
+            var pizzaStoreUser = PizzaStoreUserEntityType.Create(this);
+            var topping = ToppingEntityType.Create(this);
+            var deviceFlowCodes = DeviceFlowCodesEntityType.Create(this);
+            var key = KeyEntityType.Create(this);
+            var persistedGrant = PersistedGrantEntityType.Create(this);
+            var identityRole = IdentityRoleEntityType.Create(this);
+            var identityRoleClaimstring = IdentityRoleClaimstringEntityType.Create(this);
+            var identityUserClaimstring = IdentityUserClaimstringEntityType.Create(this);
+            var identityUserLoginstring = IdentityUserLoginstringEntityType.Create(this);
+            var identityUserRolestring = IdentityUserRolestringEntityType.Create(this);
+            var identityUserTokenstring = IdentityUserTokenstringEntityType.Create(this);
+
+            LatLongEntityType.CreateForeignKey1(latLong, order);
+            OrderEntityType.CreateForeignKey1(order, address);
+            PizzaEntityType.CreateForeignKey1(pizza, order);
+            PizzaEntityType.CreateForeignKey2(pizza, pizzaSpecial);
+            PizzaToppingEntityType.CreateForeignKey1(pizzaTopping, pizza);
+            PizzaToppingEntityType.CreateForeignKey2(pizzaTopping, topping);
+            IdentityRoleClaimstringEntityType.CreateForeignKey1(identityRoleClaimstring, identityRole);
+            IdentityUserClaimstringEntityType.CreateForeignKey1(identityUserClaimstring, pizzaStoreUser);
+            IdentityUserLoginstringEntityType.CreateForeignKey1(identityUserLoginstring, pizzaStoreUser);
+            IdentityUserRolestringEntityType.CreateForeignKey1(identityUserRolestring, identityRole);
+            IdentityUserRolestringEntityType.CreateForeignKey2(identityUserRolestring, pizzaStoreUser);
+            IdentityUserTokenstringEntityType.CreateForeignKey1(identityUserTokenstring, pizzaStoreUser);
+
+            AddressEntityType.CreateAnnotations(address);
+            LatLongEntityType.CreateAnnotations(latLong);
+            NotificationSubscriptionEntityType.CreateAnnotations(notificationSubscription);
+            OrderEntityType.CreateAnnotations(order);
+            PizzaEntityType.CreateAnnotations(pizza);
+            PizzaSpecialEntityType.CreateAnnotations(pizzaSpecial);
+            PizzaToppingEntityType.CreateAnnotations(pizzaTopping);
+            PizzaStoreUserEntityType.CreateAnnotations(pizzaStoreUser);
+            ToppingEntityType.CreateAnnotations(topping);
+            DeviceFlowCodesEntityType.CreateAnnotations(deviceFlowCodes);
+            KeyEntityType.CreateAnnotations(key);
+            PersistedGrantEntityType.CreateAnnotations(persistedGrant);
+            IdentityRoleEntityType.CreateAnnotations(identityRole);
+            IdentityRoleClaimstringEntityType.CreateAnnotations(identityRoleClaimstring);
+            IdentityUserClaimstringEntityType.CreateAnnotations(identityUserClaimstring);
+            IdentityUserLoginstringEntityType.CreateAnnotations(identityUserLoginstring);
+            IdentityUserRolestringEntityType.CreateAnnotations(identityUserRolestring);
+            IdentityUserTokenstringEntityType.CreateAnnotations(identityUserTokenstring);
+
+            AddAnnotation("ProductVersion", "6.0.0");
+        }
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
new file mode 100644
index 00000000..18b2d96d
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
@@ -0,0 +1,156 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaStoreUserEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Server.PizzaStoreUser",
+                typeof(PizzaStoreUser),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var accessFailedCount = runtimeEntityType.AddProperty(
+                "AccessFailedCount",
+                typeof(int),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("AccessFailedCount", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<AccessFailedCount>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var email = runtimeEntityType.AddProperty(
+                "Email",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Email", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Email>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var emailConfirmed = runtimeEntityType.AddProperty(
+                "EmailConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("EmailConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<EmailConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnabled = runtimeEntityType.AddProperty(
+                "LockoutEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnd = runtimeEntityType.AddProperty(
+                "LockoutEnd",
+                typeof(DateTimeOffset?),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnd", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnd>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var normalizedEmail = runtimeEntityType.AddProperty(
+                "NormalizedEmail",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedEmail", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedEmail>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedUserName = runtimeEntityType.AddProperty(
+                "NormalizedUserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedUserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedUserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var passwordHash = runtimeEntityType.AddProperty(
+                "PasswordHash",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PasswordHash", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PasswordHash>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumber = runtimeEntityType.AddProperty(
+                "PhoneNumber",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumber", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumber>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumberConfirmed = runtimeEntityType.AddProperty(
+                "PhoneNumberConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumberConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumberConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var securityStamp = runtimeEntityType.AddProperty(
+                "SecurityStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("SecurityStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<SecurityStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var twoFactorEnabled = runtimeEntityType.AddProperty(
+                "TwoFactorEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("TwoFactorEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<TwoFactorEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var userName = runtimeEntityType.AddProperty(
+                "UserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("UserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<UserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedEmail });
+            index.AddAnnotation("Relational:Name", "EmailIndex");
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { normalizedUserName },
+                unique: true);
+            index0.AddAnnotation("Relational:Name", "UserNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUsers");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaToppingEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
new file mode 100644
index 00000000..b97d2a24
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaTopping",
+                typeof(PizzaTopping),
+                baseEntityType);
+
+            var pizzaId = runtimeEntityType.AddProperty(
+                "PizzaId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("PizzaId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<PizzaId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var toppingId = runtimeEntityType.AddProperty(
+                "ToppingId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("ToppingId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<ToppingId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { pizzaId, toppingId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { toppingId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PizzaId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var toppings = principalEntityType.AddNavigation("Toppings",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<PizzaTopping>),
+                propertyInfo: typeof(Pizza).GetProperty("Toppings", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Toppings>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("ToppingId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var topping = declaringEntityType.AddNavigation("Topping",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Topping),
+                propertyInfo: typeof(PizzaTopping).GetProperty("Topping", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<Topping>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PizzaTopping");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Models/ToppingEntityType.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/ToppingEntityType.cs
new file mode 100644
index 00000000..9295f9bf
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Models/ToppingEntityType.cs
@@ -0,0 +1,62 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class ToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Topping",
+                typeof(Topping),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Topping).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Topping).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var price = runtimeEntityType.AddProperty(
+                "Price",
+                typeof(decimal),
+                propertyInfo: typeof(Topping).GetProperty("Price", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Price>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Toppings");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/OidcConfigurationController.cs
index c074debf..dc75ecb3 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/OidcConfigurationController.cs
@@ -1,26 +1,21 @@
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class OidcConfigurationController : Controller
 {
-    public class OidcConfigurationController : Controller
-    {
-        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-        {
-            ClientRequestParametersProvider = clientRequestParametersProvider;
-        }
+	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+	{
+		ClientRequestParametersProvider = clientRequestParametersProvider;
+	}
 
-        public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-        [HttpGet("_configuration/{clientId}")]
-        public IActionResult GetClientRequestParameters([FromRoute]string clientId)
-        {
-            var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-            return Ok(parameters);
-        }
-    }
+	[HttpGet("_configuration/{clientId}")]
+	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+	{
+		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+		return Ok(parameters);
+	}
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/OrdersController.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/OrdersController.cs
index bab775e4..1859decd 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/OrdersController.cs
@@ -1,135 +1,130 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
+using System.Security.Claims;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using WebPush;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+[Route("orders")]
+[ApiController]
+[Authorize]
+public class OrdersController : Controller
 {
-    [Route("orders")]
-    [ApiController]
-    [Authorize]
-    public class OrdersController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public OrdersController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-        {
-            var orders = await _db.Orders
-                .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .OrderByDescending(o => o.CreatedTime)
-                .ToListAsync();
-
-            return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-        }
-
-        [HttpGet("{orderId}")]
-        public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-        {
-            var order = await _db.Orders
-                .Where(o => o.OrderId == orderId)
-                .Where(o => o.UserId == GetUserId())
-                .Include(o => o.DeliveryLocation)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
-                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-                .SingleOrDefaultAsync();
-
-            if (order == null)
-            {
-                return NotFound();
-            }
-
-            return OrderWithStatus.FromOrder(order);
-        }
-
-        [HttpPost]
-        public async Task<ActionResult<int>> PlaceOrder(Order order)
-        {
-            order.CreatedTime = DateTime.Now;
-            order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-            order.UserId = GetUserId();
-
-            // Enforce existence of Pizza.SpecialId and Topping.ToppingId
-            // in the database - prevent the submitter from making up
-            // new specials and toppings
-            foreach (var pizza in order.Pizzas)
-            {
-                pizza.SpecialId = pizza.Special.Id;
-                pizza.Special = null;
-
-                foreach (var topping in pizza.Toppings)
-                {
-                    topping.ToppingId = topping.Topping.Id;
-                    topping.Topping = null;
-                }
-            }
-
-            _db.Orders.Attach(order);
-            await _db.SaveChangesAsync();
-
-            // In the background, send push notifications if possible
-            var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-            if (subscription != null)
-            {
-                _ = TrackAndSendNotificationsAsync(order, subscription);
-            }
-
-            return order.OrderId;
-        }
-
-        private string GetUserId()
-        {
-            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-        }
-
-        private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-        {
-            // In a realistic case, some other backend process would track
-            // order delivery progress and send us notifications when it
-            // changes. Since we don't have any such process here, fake it.
-            await Task.Delay(OrderWithStatus.PreparationDuration);
-            await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-            await Task.Delay(OrderWithStatus.DeliveryDuration);
-            await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-        }
-
-        private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-        {
-            // For a real application, generate your own
-            var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
-            var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
-
-            var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
-            var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
-            var webPushClient = new WebPushClient();
-            try
-            {
-                var payload = JsonSerializer.Serialize(new
-                {
-                    message,
-                    url = $"myorders/{order.OrderId}",
-                });
-                await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
-            }
-            catch (Exception ex)
-            {
-                Console.Error.WriteLine("Error sending push notification: " + ex.Message);
-            }
-        }
-    }
+	private readonly PizzaStoreContext _db;
+
+	public OrdersController(PizzaStoreContext db)
+	{
+		_db = db;
+	}
+
+	[HttpGet]
+	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+	{
+		var orders = await _db.Orders
+				.Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.OrderByDescending(o => o.CreatedTime)
+				.ToListAsync();
+
+		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+	}
+
+	[HttpGet("{orderId}")]
+	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+	{
+		var order = await _db.Orders
+				.Where(o => o.OrderId == orderId)
+				.Where(o => o.UserId == GetUserId())
+				.Include(o => o.DeliveryLocation)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
+				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+				.SingleOrDefaultAsync();
+
+		if (order == null)
+		{
+			return NotFound();
+		}
+
+		return OrderWithStatus.FromOrder(order);
+	}
+
+	[HttpPost]
+	public async Task<ActionResult<int>> PlaceOrder(Order order)
+	{
+		order.CreatedTime = DateTime.Now;
+		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+		order.UserId = GetUserId();
+
+		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
+		// in the database - prevent the submitter from making up
+		// new specials and toppings
+		foreach (var pizza in order.Pizzas)
+		{
+			pizza.SpecialId = pizza.Special.Id;
+			pizza.Special = null;
+
+			foreach (var topping in pizza.Toppings)
+			{
+				topping.ToppingId = topping.Topping.Id;
+				topping.Topping = null;
+			}
+		}
+
+		_db.Orders.Attach(order);
+		await _db.SaveChangesAsync();
+
+		// In the background, send push notifications if possible
+		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+		if (subscription != null)
+		{
+			_ = TrackAndSendNotificationsAsync(order, subscription);
+		}
+
+		return order.OrderId;
+	}
+
+	private string GetUserId()
+	{
+		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+	{
+		// In a realistic case, some other backend process would track
+		// order delivery progress and send us notifications when it
+		// changes. Since we don't have any such process here, fake it.
+		await Task.Delay(OrderWithStatus.PreparationDuration);
+		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+		await Task.Delay(OrderWithStatus.DeliveryDuration);
+		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+	}
+
+	private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+	{
+		// For a real application, generate your own
+		var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
+		var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
+
+		var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
+		var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
+		var webPushClient = new WebPushClient();
+		try
+		{
+			var payload = JsonSerializer.Serialize(new
+			{
+				message,
+				url = $"myorders/{order.OrderId}",
+			});
+			await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
+		}
+		catch (Exception ex)
+		{
+			Console.Error.WriteLine("Error sending push notification: " + ex.Message);
+		}
+	}
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaApiExtensions.cs
new file mode 100644
index 00000000..bf6b7bde
--- /dev/null
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -0,0 +1,60 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
+
+namespace BlazingPizza.Server;
+
+public static class PizzaApiExtensions
+{
+
+	public static WebApplication MapPizzaApi(this WebApplication app)
+	{
+
+		// Subscribe to notifications
+		app.MapPut("/notifications/subscribe", [Authorize] async (
+			HttpContext context,
+			PizzaStoreContext db,
+			NotificationSubscription subscription) =>
+		{
+
+			// We're storing at most one subscription per user, so delete old ones.
+			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+			var userId = GetUserId(context);
+			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+
+			// Store new subscription
+			subscription.UserId = userId;
+			db.NotificationSubscriptions.Attach(subscription);
+
+			await db.SaveChangesAsync();
+			return Results.Ok(subscription);
+
+		});
+
+		// Specials
+		app.MapGet("/specials", async (PizzaStoreContext db) =>
+		{
+
+			var specials = await db.Specials.ToListAsync();
+			return Results.Ok(specials);
+
+		});
+
+		// Toppings
+		app.MapGet("/toppings", async (PizzaStoreContext db) =>
+		{
+			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+			return Results.Ok(toppings);
+		});
+
+		return app;
+
+	}
+
+	private static string GetUserId(HttpContext context)
+	{
+		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+	}
+
+}
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreContext.cs
index 9485bd12..992baa19 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,39 +1,38 @@
-using Duende.IdentityServer.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-    public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
-    {
-        public PizzaStoreContext(
-            DbContextOptions options,
-            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-        {
-        }
+	public PizzaStoreContext(
+			DbContextOptions options,
+			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+	{
+	}
 
-        public DbSet<Order> Orders { get; set; }
+	public DbSet<Order> Orders { get; set; }
 
-        public DbSet<Pizza> Pizzas { get; set; }
+	public DbSet<Pizza> Pizzas { get; set; }
 
-        public DbSet<PizzaSpecial> Specials { get; set; }
+	public DbSet<PizzaSpecial> Specials { get; set; }
 
-        public DbSet<Topping> Toppings { get; set; }
+	public DbSet<Topping> Toppings { get; set; }
 
-        public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
+	protected override void OnModelCreating(ModelBuilder modelBuilder)
+	{
+		base.OnModelCreating(modelBuilder);
 
-            // Configuring a many-to-many special -> topping relationship that is friendly for serialization
-            modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-            modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-            modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
+		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-            // Inline the Lat-Long pairs in Order rather than having a FK to another table
-            modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-        }
-    }
-}
\ No newline at end of file
+		// Inline the Lat-Long pairs in Order rather than having a FK to another table
+		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+	}
+}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreUser.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreUser.cs
index 171ce83d..7ab40235 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreUser.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreUser.cs
@@ -1,8 +1,5 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace BlazingPizza.Server
-{
-    public class PizzaStoreUser : IdentityUser
-    {
-    }
-}
\ No newline at end of file
+namespace BlazingPizza.Server;
+
+public class PizzaStoreUser : IdentityUser { }
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/PizzasController.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/PizzasController.cs
deleted file mode 100644
index c082552c..00000000
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/PizzasController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("pizzas")]
-    [ApiController]
-    public class PizzasController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public PizzasController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-    }
-}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Program.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Program.cs
index 40a47641..4484d8f7 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/Program.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Program.cs
@@ -1,33 +1,67 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.EntityFrameworkCore;
+using BlazingPizza.Server;
 
-namespace BlazingPizza.Server
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddControllersWithViews()
+	.AddJsonOptions(options =>  {
+		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+	});
+builder.Services.AddRazorPages();
+
+builder.Services.AddDbContext<PizzaStoreContext>(options =>
+		options.UseSqlite("Data Source=pizza.db")
+			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+
+builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
+		.AddEntityFrameworkStores<PizzaStoreContext>();
+
+builder.Services.AddIdentityServer()
+		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+
+builder.Services.AddAuthentication()
+		.AddIdentityServerJwt();
+
+var app = builder.Build();
+
+// Initialize the database
+var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
+using (var scope = scopeFactory.CreateScope())
+{
+	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+	if (db.Database.EnsureCreated())
+	{
+		SeedData.Initialize(db);
+	}
+}
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseWebAssemblyDebugging();
+}
+else
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var host = CreateHostBuilder(args).Build();
-
-            // Initialize the database
-            var scopeFactory = host.Services.GetRequiredService<IServiceScopeFactory>();
-            using (var scope = scopeFactory.CreateScope())
-            {
-                var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-                if (db.Database.EnsureCreated())
-                {
-                    SeedData.Initialize(db);
-                }
-            }
-
-            host.Run();
-        }
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+    app.UseExceptionHandler("/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
 }
+
+app.UseHttpsRedirection();
+app.UseBlazorFrameworkFiles();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseIdentityServer();
+app.UseAuthorization();
+
+app.MapPizzaApi();
+
+app.MapRazorPages();
+app.MapControllers();
+app.MapFallbackToFile("index.html");
+
+app.Run();
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/SeedData.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/SeedData.cs
index 7c86a5b2..a1e47973 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/SeedData.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/SeedData.cs
@@ -1,193 +1,192 @@
-namespace BlazingPizza.Server
+namespace BlazingPizza.Server;
+
+public static class SeedData
 {
-    public static class SeedData
-    {
-        public static void Initialize(PizzaStoreContext db)
-        {
-            var toppings = new Topping[]
-            {
-                new Topping()
-                {
-                    Name = "Extra cheese",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "American bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "British bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Canadian bacon",
-                    Price = 2.99m,
-                },
-                new Topping()
-                {
-                    Name = "Tea and crumpets",
-                    Price = 5.00m
-                },
-                new Topping()
-                {
-                    Name = "Fresh-baked scones",
-                    Price = 4.50m,
-                },
-                new Topping()
-                {
-                    Name = "Bell peppers",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Onions",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Mushrooms",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Pepperoni",
-                    Price = 1.00m,
-                },
-                new Topping()
-                {
-                    Name = "Duck sausage",
-                    Price = 3.20m,
-                },
-                new Topping()
-                {
-                    Name = "Venison meatballs",
-                    Price = 2.50m,
-                },
-                new Topping()
-                {
-                    Name = "Served on a silver platter",
-                    Price = 250.99m,
-                },
-                new Topping()
-                {
-                    Name = "Lobster on top",
-                    Price = 64.50m,
-                },
-                new Topping()
-                {
-                    Name = "Sturgeon caviar",
-                    Price = 101.75m,
-                },
-                new Topping()
-                {
-                    Name = "Artichoke hearts",
-                    Price = 3.40m,
-                },
-                new Topping()
-                {
-                    Name = "Fresh tomatoes",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Basil",
-                    Price = 1.50m,
-                },
-                new Topping()
-                {
-                    Name = "Steak (medium-rare)",
-                    Price = 8.50m,
-                },
-                new Topping()
-                {
-                    Name = "Blazing hot peppers",
-                    Price = 4.20m,
-                },
-                new Topping()
-                {
-                    Name = "Buffalo chicken",
-                    Price = 5.00m,
-                },
-                new Topping()
-                {
-                    Name = "Blue cheese",
-                    Price = 2.50m,
-                },
-            };
+	public static void Initialize(PizzaStoreContext db)
+	{
+		var toppings = new Topping[]
+		{
+			new Topping()
+			{
+					Name = "Extra cheese",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "American bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "British bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Canadian bacon",
+					Price = 2.99m,
+			},
+			new Topping()
+			{
+					Name = "Tea and crumpets",
+					Price = 5.00m
+			},
+			new Topping()
+			{
+					Name = "Fresh-baked scones",
+					Price = 4.50m,
+			},
+			new Topping()
+			{
+					Name = "Bell peppers",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Onions",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Mushrooms",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Pepperoni",
+					Price = 1.00m,
+			},
+			new Topping()
+			{
+					Name = "Duck sausage",
+					Price = 3.20m,
+			},
+			new Topping()
+			{
+					Name = "Venison meatballs",
+					Price = 2.50m,
+			},
+			new Topping()
+			{
+					Name = "Served on a silver platter",
+					Price = 250.99m,
+			},
+			new Topping()
+			{
+					Name = "Lobster on top",
+					Price = 64.50m,
+			},
+			new Topping()
+			{
+					Name = "Sturgeon caviar",
+					Price = 101.75m,
+			},
+			new Topping()
+			{
+					Name = "Artichoke hearts",
+					Price = 3.40m,
+			},
+			new Topping()
+			{
+					Name = "Fresh tomatoes",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Basil",
+					Price = 1.50m,
+			},
+			new Topping()
+			{
+					Name = "Steak (medium-rare)",
+					Price = 8.50m,
+			},
+			new Topping()
+			{
+					Name = "Blazing hot peppers",
+					Price = 4.20m,
+			},
+			new Topping()
+			{
+					Name = "Buffalo chicken",
+					Price = 5.00m,
+			},
+			new Topping()
+			{
+					Name = "Blue cheese",
+					Price = 2.50m,
+			},
+		};
 
-            var specials = new PizzaSpecial[]
-            {
-                new PizzaSpecial()
-                {
-                    Name = "Basic Cheese Pizza",
-                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/cheese.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 2,
-                    Name = "The Baconatorizor",
-                    Description = "It has EVERY kind of bacon",
-                    BasePrice = 11.99m,
-                    ImageUrl = "img/pizzas/bacon.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 3,
-                    Name = "Classic pepperoni",
-                    Description = "It's the pizza you grew up with, but Blazing hot!",
-                    BasePrice = 10.50m,
-                    ImageUrl = "img/pizzas/pepperoni.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 4,
-                    Name = "Buffalo chicken",
-                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-                    BasePrice = 12.75m,
-                    ImageUrl = "img/pizzas/meaty.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 5,
-                    Name = "Mushroom Lovers",
-                    Description = "It has mushrooms. Isn't that obvious?",
-                    BasePrice = 11.00m,
-                    ImageUrl = "img/pizzas/mushroom.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 6,
-                    Name = "The Brit",
-                    Description = "When in London...",
-                    BasePrice = 10.25m,
-                    ImageUrl = "img/pizzas/brit.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 7,
-                    Name = "Veggie Delight",
-                    Description = "It's like salad, but on a pizza",
-                    BasePrice = 11.50m,
-                    ImageUrl = "img/pizzas/salad.jpg",
-                },
-                new PizzaSpecial()
-                {
-                    Id = 8,
-                    Name = "Margherita",
-                    Description = "Traditional Italian pizza with tomatoes and basil",
-                    BasePrice = 9.99m,
-                    ImageUrl = "img/pizzas/margherita.jpg",
-                },
-            };
+		var specials = new PizzaSpecial[]
+		{
+			new PizzaSpecial()
+			{
+					Name = "Basic Cheese Pizza",
+					Description = "It's cheesy and delicious. Why wouldn't you want one?",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/cheese.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 2,
+					Name = "The Baconatorizor",
+					Description = "It has EVERY kind of bacon",
+					BasePrice = 11.99m,
+					ImageUrl = "img/pizzas/bacon.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 3,
+					Name = "Classic pepperoni",
+					Description = "It's the pizza you grew up with, but Blazing hot!",
+					BasePrice = 10.50m,
+					ImageUrl = "img/pizzas/pepperoni.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 4,
+					Name = "Buffalo chicken",
+					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+					BasePrice = 12.75m,
+					ImageUrl = "img/pizzas/meaty.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 5,
+					Name = "Mushroom Lovers",
+					Description = "It has mushrooms. Isn't that obvious?",
+					BasePrice = 11.00m,
+					ImageUrl = "img/pizzas/mushroom.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 6,
+					Name = "The Brit",
+					Description = "When in London...",
+					BasePrice = 10.25m,
+					ImageUrl = "img/pizzas/brit.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 7,
+					Name = "Veggie Delight",
+					Description = "It's like salad, but on a pizza",
+					BasePrice = 11.50m,
+					ImageUrl = "img/pizzas/salad.jpg",
+			},
+			new PizzaSpecial()
+			{
+					Id = 8,
+					Name = "Margherita",
+					Description = "Traditional Italian pizza with tomatoes and basil",
+					BasePrice = 9.99m,
+					ImageUrl = "img/pizzas/margherita.jpg",
+			},
+		};
 
-            db.Toppings.AddRange(toppings);
-            db.Specials.AddRange(specials);
-            db.SaveChanges();
-        }
-    }
-}
+		db.Toppings.AddRange(toppings);
+		db.Specials.AddRange(specials);
+		db.SaveChanges();
+	}
+}
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/SpecialsController.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/SpecialsController.cs
deleted file mode 100644
index a176844c..00000000
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/SpecialsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("specials")]
-    [ApiController]
-    public class SpecialsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public SpecialsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<PizzaSpecial>>> GetSpecials()
-        {
-            return (await _db.Specials.ToListAsync()).OrderByDescending(s => s.BasePrice).ToList();
-        }
-    }
-}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Startup.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Startup.cs
deleted file mode 100644
index 3d59708b..00000000
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/Startup.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace BlazingPizza.Server
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllersWithViews();
-            services.AddRazorPages();
-
-            services.AddDbContext<PizzaStoreContext>(options =>
-                options.UseSqlite("Data Source=pizza.db"));
-
-            services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-                .AddEntityFrameworkStores<PizzaStoreContext>();
-
-            services.AddIdentityServer()
-                .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
-
-            services.AddAuthentication()
-                .AddIdentityServerJwt();
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                app.UseWebAssemblyDebugging();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Error");
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
-
-            app.UseHttpsRedirection();
-            app.UseBlazorFrameworkFiles();
-            app.UseStaticFiles();
-
-            app.UseRouting();
-
-            app.UseAuthentication();
-            app.UseIdentityServer();
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-                endpoints.MapRazorPages();
-                endpoints.MapFallbackToFile("index.html");
-            });
-        }
-    }
-}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/ToppingsController.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/ToppingsController.cs
deleted file mode 100644
index 6a677639..00000000
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/ToppingsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace BlazingPizza.Server
-{
-    [Route("toppings")]
-    [ApiController]
-    public class ToppingsController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public ToppingsController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<List<Topping>>> GetToppings()
-        {
-            return await _db.Toppings.OrderBy(t => t.Name).ToListAsync();
-        }
-    }
-}
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/Address.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/Address.cs
index d76bc52a..79be9c5b 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/Address.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/Address.cs
@@ -1,27 +1,24 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class Address
 {
-    public class Address
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        [Required, MaxLength(100)]
-        public string Name { get; set; }
+	[Required, MaxLength(100)]
+	public string Name { get; set; }
 
-        [Required, MaxLength(100)]
-        public string Line1 { get; set; }
+	[Required, MaxLength(100)]
+	public string Line1 { get; set; }
 
-        [MaxLength(100)]
-        public string Line2 { get; set; }
+	[MaxLength(100)]
+	public string Line2 { get; set; }
 
-        [Required, MaxLength(50)]
-        public string City { get; set; }
+	[Required, MaxLength(50)]
+	public string City { get; set; }
 
-        [Required, MaxLength(20)]
-        public string Region { get; set; }
+	[Required, MaxLength(20)]
+	public string Region { get; set; }
 
-        [Required, MaxLength(20)]
-        public string PostalCode { get; set; }
-    }
+	[Required, MaxLength(20)]
+	public string PostalCode { get; set; }
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/BlazingPizza.Shared.csproj b/save-points/09-progressive-web-app/BlazingPizza.Shared/BlazingPizza.Shared.csproj
index f7b7dd02..fb17e53b 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/BlazingPizza.Shared.csproj
@@ -3,8 +3,13 @@
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
     <RootNamespace>BlazingPizza</RootNamespace>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
+	<ItemGroup>
+		<Using Include="System.ComponentModel.DataAnnotations" />
+	</ItemGroup>
+	
   <ItemGroup>
     <ProjectReference Include="..\BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj" />
   </ItemGroup>
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/LatLong.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/LatLong.cs
index 9b8c3811..14a94c26 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/LatLong.cs
@@ -1,27 +1,26 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class LatLong
 {
-    public class LatLong
-    {
-        public LatLong()
-        {
-        }
+	public LatLong()
+	{
+	}
 
-        public LatLong(double latitude, double longitude) : this()
-        {
-            Latitude = latitude;
-            Longitude = longitude;
-        }
+	public LatLong(double latitude, double longitude) : this()
+	{
+		Latitude = latitude;
+		Longitude = longitude;
+	}
 
-        public double Latitude { get; set; }
+	public double Latitude { get; set; }
 
-        public double Longitude { get; set; }
+	public double Longitude { get; set; }
 
-        public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-        {
-            // The Earth is flat, right? So no need for spherical interpolation.
-            return new LatLong(
-                start.Latitude + (end.Latitude - start.Latitude) * proportion,
-                start.Longitude + (end.Longitude - start.Longitude) * proportion);
-        }
-    }
-}
+	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+	{
+		// The Earth is flat, right? So no need for spherical interpolation.
+		return new LatLong(
+				start.Latitude + (end.Latitude - start.Latitude) * proportion,
+				start.Longitude + (end.Longitude - start.Longitude) * proportion);
+	}
+}
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/NotificationSubscription.cs
index 04259c2f..9109ff57 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/NotificationSubscription.cs
@@ -1,17 +1,14 @@
-using System.ComponentModel.DataAnnotations;
+namespace BlazingPizza;
 
-namespace BlazingPizza
+public class NotificationSubscription
 {
-    public class NotificationSubscription
-    {
-        public int NotificationSubscriptionId { get; set; }
+	public int NotificationSubscriptionId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public string Url { get; set; }
+	public string Url { get; set; }
 
-        public string P256dh { get; set; }
+	public string P256dh { get; set; }
 
-        public string Auth { get; set; }
-    }
+	public string Auth { get; set; }
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/Order.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/Order.cs
index fb003bd6..aca04ca1 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/Order.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/Order.cs
@@ -1,25 +1,32 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Order
 {
-    public class Order
-    {
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public string UserId { get; set; }
+	public string UserId { get; set; }
 
-        public DateTime CreatedTime { get; set; }
+	public DateTime CreatedTime { get; set; }
 
-        public Address DeliveryAddress { get; set; } = new Address();
+	public Address DeliveryAddress { get; set; } = new Address();
 
-        public LatLong DeliveryLocation { get; set; }
+	public LatLong DeliveryLocation { get; set; }
 
-        public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-        public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-        public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
-    }
+	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(Order))]
+[JsonSerializable(typeof(OrderWithStatus))]
+[JsonSerializable(typeof(List<OrderWithStatus>))]
+[JsonSerializable(typeof(Pizza))]
+[JsonSerializable(typeof(List<PizzaSpecial>))]
+[JsonSerializable(typeof(List<Topping>))]
+[JsonSerializable(typeof(Topping))]
+public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/OrderWithStatus.cs
index 021de78c..f5f153b6 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/OrderWithStatus.cs
@@ -1,79 +1,78 @@
-using BlazingPizza.ComponentsLibrary.Map;
-using System;
-using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using BlazingPizza.ComponentsLibrary.Map;
 
-namespace BlazingPizza
+
+namespace BlazingPizza;
+
+public class OrderWithStatus
 {
-    public class OrderWithStatus
-    {
-        public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-        public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-        public Order Order { get; set; }
+	public Order Order { get; set; }
 
-        public string StatusText { get; set; }
+	public string StatusText { get; set; }
 
-        public bool IsDelivered => StatusText == "Delivered";
+	public bool IsDelivered => StatusText == "Delivered";
 
-        public List<Marker> MapMarkers { get; set; }
+	public List<Marker> MapMarkers { get; set; }
 
-        public static OrderWithStatus FromOrder(Order order)
-        {
-            // To simulate a real backend process, we fake status updates based on the amount
-            // of time since the order was placed
-            string statusText;
-            List<Marker> mapMarkers;
-            var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+	public static OrderWithStatus FromOrder(Order order)
+	{
+		// To simulate a real backend process, we fake status updates based on the amount
+		// of time since the order was placed
+		string statusText;
+		List<Marker> mapMarkers;
+		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-            if (DateTime.Now < dispatchTime)
-            {
-                statusText = "Preparing";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-                };
-            }
-            else if (DateTime.Now < dispatchTime + DeliveryDuration)
-            {
-                statusText = "Out for delivery";
+		if (DateTime.Now < dispatchTime)
+		{
+			statusText = "Preparing";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+								};
+		}
+		else if (DateTime.Now < dispatchTime + DeliveryDuration)
+		{
+			statusText = "Out for delivery";
 
-                var startPosition = ComputeStartPosition(order);
-                var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-                var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("You", order.DeliveryLocation),
-                    ToMapMarker("Driver", driverPosition, showPopup: true),
-                };
-            }
-            else
-            {
-                statusText = "Delivered";
-                mapMarkers = new List<Marker>
-                {
-                    ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-                };
-            }
+			var startPosition = ComputeStartPosition(order);
+			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("You", order.DeliveryLocation),
+										ToMapMarker("Driver", driverPosition, showPopup: true),
+								};
+		}
+		else
+		{
+			statusText = "Delivered";
+			mapMarkers = new List<Marker>
+								{
+										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+								};
+		}
 
-            return new OrderWithStatus
-            {
-                Order = order,
-                StatusText = statusText,
-                MapMarkers = mapMarkers,
-            };
-        }
+		return new OrderWithStatus
+		{
+			Order = order,
+			StatusText = statusText,
+			MapMarkers = mapMarkers,
+		};
+	}
 
-        private static LatLong ComputeStartPosition(Order order)
-        {
-            // Random but deterministic based on order ID
-            var rng = new Random(order.OrderId);
-            var distance = 0.01 + rng.NextDouble() * 0.02;
-            var angle = rng.NextDouble() * Math.PI * 2;
-            var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-            return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-        }
+	private static LatLong ComputeStartPosition(Order order)
+	{
+		// Random but deterministic based on order ID
+		var rng = new Random(order.OrderId);
+		var distance = 0.01 + rng.NextDouble() * 0.02;
+		var angle = rng.NextDouble() * Math.PI * 2;
+		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+	}
 
-        static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
-    }
-}
+	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+}
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/Pizza.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/Pizza.cs
index ec1108a9..459298f4 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/Pizza.cs
@@ -1,42 +1,44 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json.Serialization;
 
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+///    /// Represents a customized pizza as part of an order
+/// </summary>
+public class Pizza
 {
-    /// <summary>
-    /// Represents a customized pizza as part of an order
-    /// </summary>
-    public class Pizza
-    {
-        public const int DefaultSize = 12;
-        public const int MinimumSize = 9;
-        public const int MaximumSize = 17;
+	public const int DefaultSize = 12;
+	public const int MinimumSize = 9;
+	public const int MaximumSize = 17;
 
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public int OrderId { get; set; }
+	public int OrderId { get; set; }
 
-        public PizzaSpecial Special { get; set; }
+	public PizzaSpecial Special { get; set; }
 
-        public int SpecialId { get; set; }
+	public int SpecialId { get; set; }
 
-        public int Size { get; set; }
+	public int Size { get; set; }
 
-        public List<PizzaTopping> Toppings { get; set; }
+	public List<PizzaTopping> Toppings { get; set; }
 
-        public decimal GetBasePrice()
-        {
-            return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-        }
+	public decimal GetBasePrice()
+	{
+		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+	}
 
-        public decimal GetTotalPrice()
-        {
-            return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-        }
+	public decimal GetTotalPrice()
+	{
+		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+	}
 
-        public string GetFormattedTotalPrice()
-        {
-            return GetTotalPrice().ToString("0.00");
-        }
-    }
+	public string GetFormattedTotalPrice()
+	{
+		return GetTotalPrice().ToString("0.00");
+	}
 }
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
+[JsonSerializable(typeof(Pizza))]
+public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaSpecial.cs
index 2f2b3383..9653300c 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaSpecial.cs
@@ -1,20 +1,19 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+/// <summary>
+/// Represents a pre-configured template for a pizza a user can order
+/// </summary>
+public class PizzaSpecial
 {
-    /// <summary>
-    /// Represents a pre-configured template for a pizza a user can order
-    /// </summary>
-    public class PizzaSpecial
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal BasePrice { get; set; }
+	public decimal BasePrice { get; set; }
 
-        public string Description { get; set; }
+	public string Description { get; set; }
 
-        public string ImageUrl { get; set; }
+	public string ImageUrl { get; set; }
 
-        public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
-    }
-}
+	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+}
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaTopping.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaTopping.cs
index f5a6c1ac..0a711647 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaTopping.cs
@@ -1,11 +1,11 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class PizzaTopping
 {
-    public class PizzaTopping
-    {
-        public Topping Topping { get; set; }
+	public Topping Topping { get; set; }
+
+	public int ToppingId { get; set; }
 
-        public int ToppingId { get; set; }
-        
-        public int PizzaId { get; set; }
-    }
-}
+	public int PizzaId { get; set; }
+	
+}
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/Topping.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/Topping.cs
index 61bdeb92..376c311a 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/Topping.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/Topping.cs
@@ -1,13 +1,13 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class Topping
 {
-    public class Topping
-    {
-        public int Id { get; set; }
+	public int Id { get; set; }
 
-        public string Name { get; set; }
+	public string Name { get; set; }
 
-        public decimal Price { get; set; }
+	public decimal Price { get; set; }
 
-        public string GetFormattedPrice() => Price.ToString("0.00");
-    }
-}
+	public string GetFormattedPrice() => Price.ToString("0.00");
+	
+}
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/UserInfo.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/UserInfo.cs
index 4996ef80..362f8f8e 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/UserInfo.cs
@@ -1,9 +1,9 @@
-namespace BlazingPizza
+namespace BlazingPizza;
+
+public class UserInfo
 {
-    public class UserInfo
-    {
-        public bool IsAuthenticated { get; set; }
+	public bool IsAuthenticated { get; set; }
 
-        public string Name { get; set; }
-    }
-}
+	public string Name { get; set; }
+	
+}
\ No newline at end of file

From 2ee7aab74ac250f87b3949d70efac3ccaab82389 Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Fritz" <csharpfritz@users.noreply.github.com>
Date: Wed, 16 Mar 2022 11:34:29 -0400
Subject: [PATCH 12/20] Added PageTitle feature

---
 save-points/00-get-started/BlazingPizza.Client/Program.cs       | 2 ++
 .../01-Components-and-layout/BlazingPizza.Client/Program.cs     | 2 ++
 .../02-customize-a-pizza/BlazingPizza.Client/Pages/Index.razor  | 2 ++
 save-points/02-customize-a-pizza/BlazingPizza.Client/Program.cs | 2 ++
 .../03-show-order-status/BlazingPizza.Client/Pages/Index.razor  | 2 ++
 .../BlazingPizza.Client/Pages/MyOrders.razor                    | 2 ++
 .../BlazingPizza.Client/Pages/OrderDetails.razor                | 2 ++
 save-points/03-show-order-status/BlazingPizza.Client/Program.cs | 2 ++
 .../BlazingPizza.Client/Pages/Index.razor                       | 2 ++
 .../BlazingPizza.Client/Pages/MyOrders.razor                    | 2 ++
 .../BlazingPizza.Client/Pages/OrderDetails.razor                | 2 ++
 .../04-refactor-state-management/BlazingPizza.Client/Program.cs | 2 ++
 .../BlazingPizza.Client/Pages/Checkout.razor                    | 2 ++
 .../BlazingPizza.Client/Pages/Index.razor                       | 2 ++
 .../BlazingPizza.Client/Pages/MyOrders.razor                    | 2 ++
 .../BlazingPizza.Client/Pages/OrderDetails.razor                | 2 ++
 .../05-checkout-with-validation/BlazingPizza.Client/Program.cs  | 2 ++
 .../BlazingPizza.Client/Pages/Checkout.razor                    | 2 ++
 .../BlazingPizza.Client/Pages/Index.razor                       | 2 ++
 .../BlazingPizza.Client/Pages/MyOrders.razor                    | 2 ++
 .../BlazingPizza.Client/Pages/OrderDetails.razor                | 2 ++
 .../BlazingPizza.Client/Program.cs                              | 2 ++
 .../BlazingPizza.Client/Pages/Checkout.razor                    | 2 ++
 .../07-javascript-interop/BlazingPizza.Client/Pages/Index.razor | 2 ++
 .../BlazingPizza.Client/Pages/MyOrders.razor                    | 2 ++
 .../BlazingPizza.Client/Pages/OrderDetails.razor                | 2 ++
 .../07-javascript-interop/BlazingPizza.Client/Program.cs        | 2 ++
 .../BlazingPizza.Client/Pages/Checkout.razor                    | 2 ++
 .../BlazingPizza.Client/Pages/Index.razor                       | 2 ++
 .../BlazingPizza.Client/Pages/MyOrders.razor                    | 2 ++
 .../BlazingPizza.Client/Pages/OrderDetails.razor                | 2 ++
 .../08-templated-components/BlazingPizza.Client/Program.cs      | 2 ++
 .../BlazingPizza.Client/Pages/Checkout.razor                    | 2 ++
 .../BlazingPizza.Client/Pages/Index.razor                       | 2 ++
 .../BlazingPizza.Client/Pages/MyOrders.razor                    | 2 ++
 .../BlazingPizza.Client/Pages/OrderDetails.razor                | 2 ++
 .../09-progressive-web-app/BlazingPizza.Client/Program.cs       | 2 ++
 src/BlazingPizza.Client/Pages/Checkout.razor                    | 2 ++
 src/BlazingPizza.Client/Pages/Index.razor                       | 2 ++
 src/BlazingPizza.Client/Pages/MyOrders.razor                    | 2 ++
 src/BlazingPizza.Client/Pages/OrderDetails.razor                | 2 ++
 src/BlazingPizza.Client/Program.cs                              | 2 ++
 42 files changed, 84 insertions(+)

diff --git a/save-points/00-get-started/BlazingPizza.Client/Program.cs b/save-points/00-get-started/BlazingPizza.Client/Program.cs
index ab7dd4d9..c5023d76 100644
--- a/save-points/00-get-started/BlazingPizza.Client/Program.cs
+++ b/save-points/00-get-started/BlazingPizza.Client/Program.cs
@@ -1,8 +1,10 @@
 using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Client/Program.cs b/save-points/01-Components-and-layout/BlazingPizza.Client/Program.cs
index ab7dd4d9..c5023d76 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Client/Program.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Client/Program.cs
@@ -1,8 +1,10 @@
 using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Client/Pages/Index.razor b/save-points/02-customize-a-pizza/BlazingPizza.Client/Pages/Index.razor
index 808b7307..76b485f7 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Client/Pages/Index.razor
@@ -1,6 +1,8 @@
 @page "/"
 @inject HttpClient HttpClient
 
+<PageTitle>Blazing Pizza</PageTitle>
+
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Client/Program.cs b/save-points/02-customize-a-pizza/BlazingPizza.Client/Program.cs
index ab7dd4d9..c5023d76 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Client/Program.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Client/Program.cs
@@ -1,8 +1,10 @@
 using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
diff --git a/save-points/03-show-order-status/BlazingPizza.Client/Pages/Index.razor b/save-points/03-show-order-status/BlazingPizza.Client/Pages/Index.razor
index 1914e003..5193e558 100644
--- a/save-points/03-show-order-status/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/03-show-order-status/BlazingPizza.Client/Pages/Index.razor
@@ -2,6 +2,8 @@
 @inject HttpClient HttpClient
 @inject NavigationManager NavigationManager
 
+<PageTitle>Blazing Pizza</PageTitle>
+
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/03-show-order-status/BlazingPizza.Client/Pages/MyOrders.razor b/save-points/03-show-order-status/BlazingPizza.Client/Pages/MyOrders.razor
index a4d5f14c..36d3902e 100644
--- a/save-points/03-show-order-status/BlazingPizza.Client/Pages/MyOrders.razor
+++ b/save-points/03-show-order-status/BlazingPizza.Client/Pages/MyOrders.razor
@@ -1,6 +1,8 @@
 @page "/myorders"
 @inject HttpClient HttpClient
 
+<PageTitle>Blazing Pizza - My Orders</PageTitle>
+
 <div class="main">
     @if (ordersWithStatus == null)
     {
diff --git a/save-points/03-show-order-status/BlazingPizza.Client/Pages/OrderDetails.razor b/save-points/03-show-order-status/BlazingPizza.Client/Pages/OrderDetails.razor
index 05d96c1e..25e06141 100644
--- a/save-points/03-show-order-status/BlazingPizza.Client/Pages/OrderDetails.razor
+++ b/save-points/03-show-order-status/BlazingPizza.Client/Pages/OrderDetails.razor
@@ -3,6 +3,8 @@
 @inject HttpClient HttpClient
 @implements IDisposable
 
+<PageTitle>Blazing Pizza - Order Details</PageTitle>
+
 <div class="main">
     @if (invalidOrder)
     {
diff --git a/save-points/03-show-order-status/BlazingPizza.Client/Program.cs b/save-points/03-show-order-status/BlazingPizza.Client/Program.cs
index ab7dd4d9..c5023d76 100644
--- a/save-points/03-show-order-status/BlazingPizza.Client/Program.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Client/Program.cs
@@ -1,8 +1,10 @@
 using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/Index.razor b/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/Index.razor
index 69bcedd9..2e72330c 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/Index.razor
@@ -3,6 +3,8 @@
 @inject OrderState OrderState
 @inject NavigationManager NavigationManager
 
+<PageTitle>Blazing Pizza</PageTitle>
+
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/MyOrders.razor b/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/MyOrders.razor
index a4d5f14c..36d3902e 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/MyOrders.razor
+++ b/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/MyOrders.razor
@@ -1,6 +1,8 @@
 @page "/myorders"
 @inject HttpClient HttpClient
 
+<PageTitle>Blazing Pizza - My Orders</PageTitle>
+
 <div class="main">
     @if (ordersWithStatus == null)
     {
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/OrderDetails.razor b/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/OrderDetails.razor
index 05d96c1e..25e06141 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/OrderDetails.razor
+++ b/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/OrderDetails.razor
@@ -3,6 +3,8 @@
 @inject HttpClient HttpClient
 @implements IDisposable
 
+<PageTitle>Blazing Pizza - Order Details</PageTitle>
+
 <div class="main">
     @if (invalidOrder)
     {
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs b/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs
index 3363acbb..6b8ae30d 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs
@@ -1,8 +1,10 @@
 using BlazingPizza.Client;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.AspNetCore.Components.Web;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 builder.Services.AddScoped<OrderState>();
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/Checkout.razor b/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/Checkout.razor
index 4306f55f..78b3d148 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/Checkout.razor
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/Checkout.razor
@@ -3,6 +3,8 @@
 @inject HttpClient HttpClient
 @inject NavigationManager NavigationManager
 
+<PageTitle>Blazing Pizza - Checkout</PageTitle>
+
 <div class="main">
     <EditForm Model="OrderState.Order.DeliveryAddress" OnValidSubmit="PlaceOrder">
         <div class="checkout-cols">
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/Index.razor b/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/Index.razor
index e3dbe2ce..254953c6 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/Index.razor
@@ -3,6 +3,8 @@
 @inject OrderState OrderState
 @inject NavigationManager NavigationManager
 
+<PageTitle>Blazing Pizza</PageTitle>
+
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/MyOrders.razor b/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/MyOrders.razor
index a4d5f14c..36d3902e 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/MyOrders.razor
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/MyOrders.razor
@@ -1,6 +1,8 @@
 @page "/myorders"
 @inject HttpClient HttpClient
 
+<PageTitle>Blazing Pizza - My Orders</PageTitle>
+
 <div class="main">
     @if (ordersWithStatus == null)
     {
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/OrderDetails.razor b/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/OrderDetails.razor
index 05d96c1e..25e06141 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/OrderDetails.razor
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/OrderDetails.razor
@@ -3,6 +3,8 @@
 @inject HttpClient HttpClient
 @implements IDisposable
 
+<PageTitle>Blazing Pizza - Order Details</PageTitle>
+
 <div class="main">
     @if (invalidOrder)
     {
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs b/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs
index 8c6740d5..031ebc57 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs
@@ -1,8 +1,10 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 builder.Services.AddScoped<OrderState>();
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/Checkout.razor b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/Checkout.razor
index 7c6419f3..44b01467 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/Checkout.razor
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/Checkout.razor
@@ -4,6 +4,8 @@
 @inject OrdersClient OrdersClient
 @inject NavigationManager NavigationManager
 
+<PageTitle>Blazing Pizza - Checkout</PageTitle>
+
 <div class="main">
     <EditForm Model="OrderState.Order.DeliveryAddress" OnValidSubmit="PlaceOrder">
         <div class="checkout-cols">
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/Index.razor b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/Index.razor
index e3dbe2ce..254953c6 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/Index.razor
@@ -3,6 +3,8 @@
 @inject OrderState OrderState
 @inject NavigationManager NavigationManager
 
+<PageTitle>Blazing Pizza</PageTitle>
+
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/MyOrders.razor b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/MyOrders.razor
index 792d4ccf..b28dedeb 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/MyOrders.razor
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/MyOrders.razor
@@ -3,6 +3,8 @@
 @inject OrdersClient OrdersClient
 @inject NavigationManager NavigationManager
 
+<PageTitle>Blazing Pizza - My Orders</PageTitle>
+
 <div class="main">
     @if (ordersWithStatus == null)
     {
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/OrderDetails.razor b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/OrderDetails.razor
index edf57411..5de448cc 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/OrderDetails.razor
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/OrderDetails.razor
@@ -5,6 +5,8 @@
 @inject NavigationManager NavigationManager
 @implements IDisposable
 
+<PageTitle>Blazing Pizza - Order Details</PageTitle>
+
 <div class="main">
     @if (invalidOrder)
     {
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs
index 41eedccb..5084a0ad 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs
@@ -2,9 +2,11 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/Pages/Checkout.razor b/save-points/07-javascript-interop/BlazingPizza.Client/Pages/Checkout.razor
index 7c6419f3..44b01467 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/Pages/Checkout.razor
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/Pages/Checkout.razor
@@ -4,6 +4,8 @@
 @inject OrdersClient OrdersClient
 @inject NavigationManager NavigationManager
 
+<PageTitle>Blazing Pizza - Checkout</PageTitle>
+
 <div class="main">
     <EditForm Model="OrderState.Order.DeliveryAddress" OnValidSubmit="PlaceOrder">
         <div class="checkout-cols">
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/Pages/Index.razor b/save-points/07-javascript-interop/BlazingPizza.Client/Pages/Index.razor
index 26b1fe38..a5a0e544 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/Pages/Index.razor
@@ -4,6 +4,8 @@
 @inject NavigationManager NavigationManager
 @inject IJSRuntime JS
 
+<PageTitle>Blazing Pizza</PageTitle>
+
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/Pages/MyOrders.razor b/save-points/07-javascript-interop/BlazingPizza.Client/Pages/MyOrders.razor
index 792d4ccf..b28dedeb 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/Pages/MyOrders.razor
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/Pages/MyOrders.razor
@@ -3,6 +3,8 @@
 @inject OrdersClient OrdersClient
 @inject NavigationManager NavigationManager
 
+<PageTitle>Blazing Pizza - My Orders</PageTitle>
+
 <div class="main">
     @if (ordersWithStatus == null)
     {
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/Pages/OrderDetails.razor b/save-points/07-javascript-interop/BlazingPizza.Client/Pages/OrderDetails.razor
index 7df9161e..548bbd59 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/Pages/OrderDetails.razor
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/Pages/OrderDetails.razor
@@ -5,6 +5,8 @@
 @inject NavigationManager NavigationManager
 @implements IDisposable
 
+<PageTitle>Blazing Pizza - Order Details</PageTitle>
+
 <div class="main">
     @if (invalidOrder)
     {
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs b/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs
index 41eedccb..5084a0ad 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs
@@ -2,9 +2,11 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
diff --git a/save-points/08-templated-components/BlazingPizza.Client/Pages/Checkout.razor b/save-points/08-templated-components/BlazingPizza.Client/Pages/Checkout.razor
index 7c6419f3..44b01467 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/Pages/Checkout.razor
+++ b/save-points/08-templated-components/BlazingPizza.Client/Pages/Checkout.razor
@@ -4,6 +4,8 @@
 @inject OrdersClient OrdersClient
 @inject NavigationManager NavigationManager
 
+<PageTitle>Blazing Pizza - Checkout</PageTitle>
+
 <div class="main">
     <EditForm Model="OrderState.Order.DeliveryAddress" OnValidSubmit="PlaceOrder">
         <div class="checkout-cols">
diff --git a/save-points/08-templated-components/BlazingPizza.Client/Pages/Index.razor b/save-points/08-templated-components/BlazingPizza.Client/Pages/Index.razor
index ca5ac084..94edddfb 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/08-templated-components/BlazingPizza.Client/Pages/Index.razor
@@ -4,6 +4,8 @@
 @inject NavigationManager NavigationManager
 @inject IJSRuntime JS
 
+<PageTitle>Blazing Pizza</PageTitle>
+
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/08-templated-components/BlazingPizza.Client/Pages/MyOrders.razor b/save-points/08-templated-components/BlazingPizza.Client/Pages/MyOrders.razor
index e4e6f953..8d97c52d 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/Pages/MyOrders.razor
+++ b/save-points/08-templated-components/BlazingPizza.Client/Pages/MyOrders.razor
@@ -3,6 +3,8 @@
 @inject OrdersClient OrdersClient
 @inject NavigationManager NavigationManager
 
+<PageTitle>Blazing Pizza - My Orders</PageTitle>
+
 <div class="main">
     <TemplatedList Loader="@LoadOrders" ListGroupClass="orders-list">
         <Loading>Loading...</Loading>
diff --git a/save-points/08-templated-components/BlazingPizza.Client/Pages/OrderDetails.razor b/save-points/08-templated-components/BlazingPizza.Client/Pages/OrderDetails.razor
index 7df9161e..548bbd59 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/Pages/OrderDetails.razor
+++ b/save-points/08-templated-components/BlazingPizza.Client/Pages/OrderDetails.razor
@@ -5,6 +5,8 @@
 @inject NavigationManager NavigationManager
 @implements IDisposable
 
+<PageTitle>Blazing Pizza - Order Details</PageTitle>
+
 <div class="main">
     @if (invalidOrder)
     {
diff --git a/save-points/08-templated-components/BlazingPizza.Client/Program.cs b/save-points/08-templated-components/BlazingPizza.Client/Program.cs
index 41eedccb..5084a0ad 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/Program.cs
+++ b/save-points/08-templated-components/BlazingPizza.Client/Program.cs
@@ -2,9 +2,11 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/Checkout.razor b/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/Checkout.razor
index 611f152c..c78cacd1 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/Checkout.razor
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/Checkout.razor
@@ -5,6 +5,8 @@
 @inject NavigationManager NavigationManager
 @inject IJSRuntime JSRuntime
 
+<PageTitle>Blazing Pizza - Checkout</PageTitle>
+
 <div class="main">
     <EditForm Model="OrderState.Order.DeliveryAddress" OnValidSubmit="PlaceOrder">
         <div class="checkout-cols">
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/Index.razor b/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/Index.razor
index ca5ac084..94edddfb 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/Index.razor
@@ -4,6 +4,8 @@
 @inject NavigationManager NavigationManager
 @inject IJSRuntime JS
 
+<PageTitle>Blazing Pizza</PageTitle>
+
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/MyOrders.razor b/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/MyOrders.razor
index 39e23e20..ad99fb4f 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/MyOrders.razor
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/MyOrders.razor
@@ -2,6 +2,8 @@
 @attribute [Authorize]
 @inject OrdersClient OrdersClient
 
+<PageTitle>Blazing Pizza - My Orders</PageTitle>
+
 <div class="main">
     <TemplatedList Loader="@LoadOrders" ListGroupClass="orders-list">
         <Loading>Loading...</Loading>
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/OrderDetails.razor b/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/OrderDetails.razor
index 29693df9..b9500427 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/OrderDetails.razor
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/OrderDetails.razor
@@ -4,6 +4,8 @@
 @inject OrdersClient OrdersClient
 @implements IDisposable
 
+<PageTitle>Blazing Pizza - Order Details</PageTitle>
+
 <div class="main">
     @if (invalidOrder)
     {
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs b/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs
index 41eedccb..5084a0ad 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs
@@ -2,9 +2,11 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
diff --git a/src/BlazingPizza.Client/Pages/Checkout.razor b/src/BlazingPizza.Client/Pages/Checkout.razor
index 611f152c..c78cacd1 100644
--- a/src/BlazingPizza.Client/Pages/Checkout.razor
+++ b/src/BlazingPizza.Client/Pages/Checkout.razor
@@ -5,6 +5,8 @@
 @inject NavigationManager NavigationManager
 @inject IJSRuntime JSRuntime
 
+<PageTitle>Blazing Pizza - Checkout</PageTitle>
+
 <div class="main">
     <EditForm Model="OrderState.Order.DeliveryAddress" OnValidSubmit="PlaceOrder">
         <div class="checkout-cols">
diff --git a/src/BlazingPizza.Client/Pages/Index.razor b/src/BlazingPizza.Client/Pages/Index.razor
index f8ff79df..2d8dab2f 100644
--- a/src/BlazingPizza.Client/Pages/Index.razor
+++ b/src/BlazingPizza.Client/Pages/Index.razor
@@ -4,6 +4,8 @@
 @inject NavigationManager NavigationManager
 @inject IJSRuntime JS
 
+<PageTitle>Blazing Pizza</PageTitle>
+
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/src/BlazingPizza.Client/Pages/MyOrders.razor b/src/BlazingPizza.Client/Pages/MyOrders.razor
index 39e23e20..ad99fb4f 100644
--- a/src/BlazingPizza.Client/Pages/MyOrders.razor
+++ b/src/BlazingPizza.Client/Pages/MyOrders.razor
@@ -2,6 +2,8 @@
 @attribute [Authorize]
 @inject OrdersClient OrdersClient
 
+<PageTitle>Blazing Pizza - My Orders</PageTitle>
+
 <div class="main">
     <TemplatedList Loader="@LoadOrders" ListGroupClass="orders-list">
         <Loading>Loading...</Loading>
diff --git a/src/BlazingPizza.Client/Pages/OrderDetails.razor b/src/BlazingPizza.Client/Pages/OrderDetails.razor
index 29693df9..b9500427 100644
--- a/src/BlazingPizza.Client/Pages/OrderDetails.razor
+++ b/src/BlazingPizza.Client/Pages/OrderDetails.razor
@@ -4,6 +4,8 @@
 @inject OrdersClient OrdersClient
 @implements IDisposable
 
+<PageTitle>Blazing Pizza - Order Details</PageTitle>
+
 <div class="main">
     @if (invalidOrder)
     {
diff --git a/src/BlazingPizza.Client/Program.cs b/src/BlazingPizza.Client/Program.cs
index 41eedccb..5084a0ad 100644
--- a/src/BlazingPizza.Client/Program.cs
+++ b/src/BlazingPizza.Client/Program.cs
@@ -2,9 +2,11 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))

From ffc9189a40143521c1bd2f1bb1ac84ad45f02ded Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Fritz" <csharpfritz@users.noreply.github.com>
Date: Wed, 16 Mar 2022 11:38:27 -0400
Subject: [PATCH 13/20] Removed unnecessary PageTitle on Index

---
 .../02-customize-a-pizza/BlazingPizza.Client/Pages/Index.razor  | 2 --
 .../03-show-order-status/BlazingPizza.Client/Pages/Index.razor  | 2 --
 .../BlazingPizza.Client/Pages/Index.razor                       | 2 --
 .../BlazingPizza.Client/Pages/Index.razor                       | 2 --
 .../BlazingPizza.Client/Pages/Index.razor                       | 2 --
 .../07-javascript-interop/BlazingPizza.Client/Pages/Index.razor | 2 --
 .../BlazingPizza.Client/Pages/Index.razor                       | 2 --
 .../BlazingPizza.Client/Pages/Index.razor                       | 2 --
 src/BlazingPizza.Client/Pages/Index.razor                       | 2 --
 9 files changed, 18 deletions(-)

diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Client/Pages/Index.razor b/save-points/02-customize-a-pizza/BlazingPizza.Client/Pages/Index.razor
index 76b485f7..808b7307 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Client/Pages/Index.razor
@@ -1,8 +1,6 @@
 @page "/"
 @inject HttpClient HttpClient
 
-<PageTitle>Blazing Pizza</PageTitle>
-
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/03-show-order-status/BlazingPizza.Client/Pages/Index.razor b/save-points/03-show-order-status/BlazingPizza.Client/Pages/Index.razor
index 5193e558..1914e003 100644
--- a/save-points/03-show-order-status/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/03-show-order-status/BlazingPizza.Client/Pages/Index.razor
@@ -2,8 +2,6 @@
 @inject HttpClient HttpClient
 @inject NavigationManager NavigationManager
 
-<PageTitle>Blazing Pizza</PageTitle>
-
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/Index.razor b/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/Index.razor
index 2e72330c..69bcedd9 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/Index.razor
@@ -3,8 +3,6 @@
 @inject OrderState OrderState
 @inject NavigationManager NavigationManager
 
-<PageTitle>Blazing Pizza</PageTitle>
-
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/Index.razor b/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/Index.razor
index 254953c6..e3dbe2ce 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/Pages/Index.razor
@@ -3,8 +3,6 @@
 @inject OrderState OrderState
 @inject NavigationManager NavigationManager
 
-<PageTitle>Blazing Pizza</PageTitle>
-
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/Index.razor b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/Index.razor
index 254953c6..e3dbe2ce 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Pages/Index.razor
@@ -3,8 +3,6 @@
 @inject OrderState OrderState
 @inject NavigationManager NavigationManager
 
-<PageTitle>Blazing Pizza</PageTitle>
-
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/Pages/Index.razor b/save-points/07-javascript-interop/BlazingPizza.Client/Pages/Index.razor
index a5a0e544..26b1fe38 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/Pages/Index.razor
@@ -4,8 +4,6 @@
 @inject NavigationManager NavigationManager
 @inject IJSRuntime JS
 
-<PageTitle>Blazing Pizza</PageTitle>
-
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/08-templated-components/BlazingPizza.Client/Pages/Index.razor b/save-points/08-templated-components/BlazingPizza.Client/Pages/Index.razor
index 94edddfb..ca5ac084 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/08-templated-components/BlazingPizza.Client/Pages/Index.razor
@@ -4,8 +4,6 @@
 @inject NavigationManager NavigationManager
 @inject IJSRuntime JS
 
-<PageTitle>Blazing Pizza</PageTitle>
-
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/Index.razor b/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/Index.razor
index 94edddfb..ca5ac084 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/Index.razor
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/Pages/Index.razor
@@ -4,8 +4,6 @@
 @inject NavigationManager NavigationManager
 @inject IJSRuntime JS
 
-<PageTitle>Blazing Pizza</PageTitle>
-
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)
diff --git a/src/BlazingPizza.Client/Pages/Index.razor b/src/BlazingPizza.Client/Pages/Index.razor
index 2d8dab2f..f8ff79df 100644
--- a/src/BlazingPizza.Client/Pages/Index.razor
+++ b/src/BlazingPizza.Client/Pages/Index.razor
@@ -4,8 +4,6 @@
 @inject NavigationManager NavigationManager
 @inject IJSRuntime JS
 
-<PageTitle>Blazing Pizza</PageTitle>
-
 <div class="main">
     <ul class="pizza-cards">
         @if (specials != null)

From b2d51649b690dded044659a782e33d3dba6f35cf Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Fritz" <csharpfritz@users.noreply.github.com>
Date: Wed, 16 Mar 2022 11:49:13 -0400
Subject: [PATCH 14/20] Added PageTitle reference

---
 docs/03-show-order-status.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/03-show-order-status.md b/docs/03-show-order-status.md
index f67d7b9f..df81d10d 100644
--- a/docs/03-show-order-status.md
+++ b/docs/03-show-order-status.md
@@ -56,6 +56,26 @@ Now when you run the app, you'll be able to visit this page:
 
 Also notice that this time, no full-page load occurs when you navigate, because the URL is matched entirely within the client-side SPA. As such, navigation is instantaneous.
 
+## Adding a page title
+
+In your browser, the title of the new page is listed as **Blazing Pizza** and it would be nice to update the title to reflect that this is the 'My Orders' page.  We can use the new `PageTitle` component to update the title from the `MyOrders.razor` page:
+
+```html
+@page "/myorders"
+
+<PageTitle>Blazing Pizza - My Orders</PageTitle>
+
+<div class="main">
+    My orders will go here
+</div>
+```
+
+This works because inside the `Program.cs` file is an entry that adds a `HeadOutlet` component to the HTML presenting the BlazingPizza application.  Blazor uses this `HeadOutlet` to write content into the header of the HTML page.
+
+```csharp
+builder.RootComponents.Add<HeadOutlet>("head::after");
+```
+
 ## Highlighting navigation position
 
 Look closely at the top bar. Notice that when you're on "My orders", the link *isn't* highlighted in yellow. How can we highlight links when the user is on them? By using a `NavLink` component instead of a plain `<a>` tag. The only special thing a `NavLink` component does is toggle its own `active` CSS class depending on whether its `href` matches the current navigation state.

From 451cb30fc001866ddd62419dfa6aa4380e922de6 Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Fritz" <csharpfritz@users.noreply.github.com>
Date: Wed, 16 Mar 2022 11:51:11 -0400
Subject: [PATCH 15/20] Added PageTitle to 05 docs

---
 docs/05-checkout-with-validation.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/05-checkout-with-validation.md b/docs/05-checkout-with-validation.md
index a593698e..3a48f848 100644
--- a/docs/05-checkout-with-validation.md
+++ b/docs/05-checkout-with-validation.md
@@ -9,6 +9,8 @@ It's time to fix this by adding a "checkout" screen that requires customers to e
 Start by adding a new page component, `Checkout.razor`, with a `@page` directive matching the URL `/checkout`. For the initial markup, let's display the details of the order using your `OrderReview` component:
 
 ```razor
+<PageTitle>Blazing Pizza - Checkout</PageTitle>
+
 <div class="main">
     <div class="checkout-cols">
         <div class="checkout-order-details">

From ac69e9a636d014825d715cdccf65520d77a84c4d Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Fritz" <csharpfritz@users.noreply.github.com>
Date: Wed, 16 Mar 2022 13:25:35 -0400
Subject: [PATCH 16/20] Removed pizza.db

---
 .../BlazingPizza.Server/pizza.db-shm           | Bin 32768 -> 0 bytes
 .../BlazingPizza.Server/pizza.db-wal           | Bin 214272 -> 0 bytes
 .../BlazingPizza.Server/pizza.db-shm           | Bin 32768 -> 0 bytes
 .../BlazingPizza.Server/pizza.db-wal           | Bin 226632 -> 0 bytes
 .../BlazingPizza.Server/pizza.db-shm           | Bin 32768 -> 0 bytes
 .../BlazingPizza.Server/pizza.db-wal           | Bin 226632 -> 0 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/pizza.db-shm
 delete mode 100644 save-points/04-refactor-state-management/BlazingPizza.Server/pizza.db-wal
 delete mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/pizza.db-shm
 delete mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/pizza.db-wal
 delete mode 100644 save-points/08-templated-components/BlazingPizza.Server/pizza.db-shm
 delete mode 100644 save-points/08-templated-components/BlazingPizza.Server/pizza.db-wal

diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/pizza.db-shm b/save-points/04-refactor-state-management/BlazingPizza.Server/pizza.db-shm
deleted file mode 100644
index 0ba16f0cb838a14216aa22cdaa5553f246a133be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeI*xiW)c7{&3A*tf(Ud#te&6e^w4j7I4q+=t6hxdV+-L$6RUN;kndMMla;VR+y9
zpP4fg=9@@<z4KJxcZz1(ilTC)9~$c0S^f6>?y2#5ef4<q@N#kgar0b1J-)2|@cHI@
z`+YxK()xS9*55AL)sotwcB)-!x7wrjs(os|I-m}!Luy&AsKe@rI;xJT<LZPusaDk~
zby}TKXVp1%UR_XY>Y}=&E~_i*s=B7u)pd14-Bh>KZPjYK>Ylo<+RUH5`FZq`Ab<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagkfDJ8^PWTmyn8?*0$!a+Bi@`K5dklLkcfcyR?^7#
zMok)@_wPQXw{A#8pi~@09{UH+cxQ-21ibP@A_CsnN+Vv_A`t=an~{is*X7cPx8+Dg
zz{`FlBH&%cG~!i75)tsGC5Z@lQIzB*;5Ang5%88S$xFaH#v~%(6={-}fET<;M8Ny$
zBrkzlUSH=Izl|>kkh}zZwShzgd^3aOCE$A{BqHEzF(fYmU+N(d0pCd?c?tMN6^RIx
zi^IrcJd==sud|VeK&9~IJ(81v?-G)TfUiQ5yaaralSBl350&I4;9ImLBH&BFBrgG9
YVI~m)-@qn$3Hbgvi3s@mJBbK<0sk;F>Hq)$

diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/pizza.db-wal b/save-points/04-refactor-state-management/BlazingPizza.Server/pizza.db-wal
deleted file mode 100644
index 435bedc6a6aeb137805dda08f553d088e56512e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 214272
zcmeI54R9Q1dB^Xh^PMD1Iwy*JksZbBlO5|KOSbGN!QsO>pHB86`6QoCj@^)4R(G$Z
zjqh&HyL+}Jnt&|FkisOCQrbd+6hi5cCX_H~389pRmhw^P2M}gRTbS?-878G6G_+;<
zzPtP0erQjUJCn}j=6^HR?fdyW&+mEOci(-q8sGG$;052{vse3kn|$o^?YE!#^6NhT
z%*=x)9{BmA*9?AxR{8DqU+cQ|j;FtyxMBL(grpJSl&q9QP1sLIH#PZg5d_+|iT)dA
zW6Vz<{SNQ~{nqERmAx*Td_$9WZ=fwr;TKu^b>aUCzu5L<$Mvm&wu_;6v^*0W4-|v#
z%}Ueb{`SuEUQ_)4)h%DQDHQ4H@n71diL*sAsT7E!8b7Z{WRmf0Qpm;+O(cb=Q5hBb
zJK6;LG0LezR7j<>$-~Kvke<v6>6wWMAu*Yr&Sv7YUWiVO=lH;>OzLPnb5a;jp4@HD
zkx+=JkwR7~k*JVOo}d$$lkgrhDp8maqmj<e8%9Y{I!ly=2{|unl3dPB&@Zi8pc7HG
zCv;8f_m#_YYjutn3JOtGhlQ4WyNzSq#+*4O$Cb0qF*cb=rVgi>^+JDiWrrA5dn}nr
zrW46&A!-h!w4+pkSVvoI>E>`K(%b95a9DR#R<2Z}@|?=QH#wcft1Wjq?5N`@Yn07b
zLVPAWnM%|7k0#Sujx;S=F0-garxYpgb|q8(T&J%5a$Hw_x<c}jSXB9U*r`0PzC7iv
zQEMuHNK}cJrrfwuqUIH;!otcU@=_&nj?5@Uk0uutYWZ?+dnht6;J^2bZut~lU6M*e
z{;(pJHPuz@aB^_9S~$kZ0vBG#lPiYWm~bl-MTwL(YjL?&UP3Ob)sk~@+B~f<T?%NG
zwL2<mqDxOMdv(Ie^A$<aS2Z7Q6Ff~9C6#OGZEvg2-bL~@n`~{_g^EXHzP2M6IX2+;
zN#z1LubwH=8$(X4YO-F=xiIF2T@{@d4s8rY4j%Mh?9$zvmNn^=WNb*&)!AAUsdXFL
zoi4B2&vJgfF6&v~^~S1E!4@FiD?VP;<~`gowQuCcf>(q03R$tA(=~G8NNXt4-R-}q
z>JVvktL$H!6Ai1fC|K^VvjU9nHmi8(#fx*YB5Cs_Zj3wbjeAm^*41K~hWnHvYcv3f
z$8C|zPpKzH_8v$O#S9f1l<qqy?@D2DHEe-=ob4fOXL1jtD0j65Bd_kR7tV}HZkYYt
zc;W6)DAL#Gzt`B2N6A^baVO*gQEitkP7l~xEJrYhvT<C|I__|c_3+ACn-O!$%e32A
zs<~|7Zdkb;xkBc0w<PMQk(OX2)mP6^mP*uLwnFR0;s)Jq_ifXcN?fg^iN;)@+Af1m
zx7k`Ox2?H;9HTrO7SHGDMm#1;MN&w})v~rS9yvdHC&^b8g_QFP)0$YSaLl%tPL}9I
z_3G*PQ<6e&MfF9{Q{ZX2swK<p5WAj!UPsC_dmt!Ei=<Fb9jgap?z-D^bEiaAJtr%L
zBckfHFHX(NWs<IzW{Kiqu&s3+W=|6eR?_NX&7PCT#JnaeYl88xhec^{wJ5cPNN(6x
z2rb>-tVijx-xj4Axk$_?)h`2HQL49Gc9fc<Jfd_Rp;yO?maAPI7?!}=Sah8@7QMh8
z30v5c-BeSM9SKkBaLhA@O3qa20wJzqvjdW=vA;|Y;k)U`*o6UqD6(~{|Kgwl+<0^`
zA0nC@bJ!j&%!jb`92{!TBR0m~$Akn8M;_O%ZE`{?li^j`_VG5`#$bo<nr=#_=Y^uj
zy@xNv44KpKlg6_n1%Fk9{^;tYKiG4AEniSf5BWaV{$f`Lt29yx><S+c009sH0T2KI
z5C8!X009sH0T2Lz#w5_p%;N76eBs64YbyQu<fF(7G^Vp*6$pR;2!H?xfB*=900@8p
z2!H?xxCrQf1HkhFyZ-E<iyyvcYy^1$7bO%y00ck)1V8`;KmY_l00ck)1VErM39!HE
zsJ$=n^pAewd;g>HAGWbd{2c+KfDZ_O00@8p2!H?xfB*=900@8p2sAQ*ATy4?FYs{e
z{%7~y`oKH!zCa_p9JYY~2!H?xfB*=900@8p2!H?xfIy8vh+Xl#z=j)s@cwr_{IO5s
zeSsPuTz~)wfB*=900@8p2!H?xfB*=9KqC{-|6d567r6A^;}1UH^R79(FVM&?hixDL
z0w4eaAOHd&00JNY0w4eaAW$RF%C2}`;7dOyZ@Bcf9U|TrsPVxC2!H?xfB*=900@8p
z2!H?xfB*<IG66jW!1Dql|9<=Hv}3P%0q+Ymvddu`2!H?xfB*=900@8p2!H?xfB*>8
z2yA3mJTLJ2Ti*Gp&i8&XiuVO-d~g8*AOHd&00JNY0w4eaAOHd&00NCnpq&}V^8#D<
z{mW}^_}ttA-WO<Om%}y?009sH0T2KI5C8!X009sH0T8GW&{F_BFYvrH@o%AzH9v>E
zK#dPBKmY_l00ck)1V8`;KmY_l00cmwkqLA%<9J@+jZb}lOYCH15r0R}$S#L%AOHd&
z00JNY0w4eaAOHd&00JOTBM@d+JTLH4^zYuV?YXg!<9&e|A6$R{2!H?xfB*=900@8p
z2!H?xfIuS?*u;$Ed4c=h_t<Bi_|<I}kr!xWm%}y?009sH0T2KI5C8!X009sH0T8GW
zxPo2ryg>N#{dc~*@*f{UUZBPY7a#xvAOHd&00JNY0w4eaAOHd&(8vU?WXAElz%{>k
zWY+hlzI%`tXk?eeHV^;-5C8!X009sH0T2KI5C8!Xs1fL5S3EE9&ZV)>KC$7$109{`
zeVxsUuk)Wf-`pW~#@n9kxV|;eb}{shmS=+FfrkUdW~J$Ie>?5g@So1}O{XF~J^o9(
zG;y{_CY1tFRO9CriA*w{O$yogp^2mrH7cV*e@B}@KSnuKhzhB6HhDOi5z>=cAw4rO
zAtWZ#)7ea%)(g?8@f;sGl}R0qXHE*^$&<UyIT8vHHB!h*B@z{~$rE$}a}wTTMkNXp
zVl>j(dBZ3vN@t0(Fd^qfO_IyG3Hqf~3v?o?_JpoU{l0Q}ZmrJoLO~&_>afs~Z?|!b
z+n6)Q<hXLSImRY4$<*OAvtH<ruIvz_YL6u|$#fz)Ekw<Mly;OV5bJ1*E!`XrMS6Sv
z7Y^%=%F30BRGw4$_a>*ac(vs&haGi1WsS1=N{G*7CsS!U|IuVR%aNu<%Vido=#(Pm
z-L7QHpX=0>Uykd_Pgh7@5{oMT4m*|S)t9HdHEK=e4~Z)A(v%xFO4Pg}RajVgL|&>S
z&XF0V=+We&LM?x7M=)}1!0(gF1#(_JQ<OB46RVo6mvd8eu}Laj0f!Z_tf{$SS4HP?
zZ+j>*FyO!Uj1JD#>?(FRF}hkUn&V`F>s}`iRt&Wv<&Y9ZiIg>KZMqh2LN2S-l5=g_
z0!3f>l<z7_e^k^&m!4eq>JCbtuSkl%De&Po!P9h2Q@NJj_O|NmT_kU_$<~%#sCWeS
zg+m)dk%I^Q7rS)-q-9MyB^evibal2CMQYuKcBjwk_OrZKugiKCc)hV|RIqv2d&S4A
z+PnwPseL0i7Q7m~SICO}oUV}zM_NOX?r#4@RfkB!Q)U0!oM>2;MZxl4oe(y<+pOZT
z6EDumiloh#xH0a)HSS4uT2~878n07|tkDP}9=Am<Kc$`+*?S;C6f;z4RJre<yeoyp
z)v!h4akgo&oyk3nqTJOMjJ&$L-gd*7<c8VLjTi0?g(7`@{(Frbd6b-`8+Sr35Y=|s
z;`D&6#c~95C>zHWt>X^ISP!qPwVN=fyiD7LrJBnI?uM27i7R9-cTb^?8fgheQhoIt
zWvN8{Wh=B^EN;-<cHcIAsl?SvnrO@gs_io9bepZka@(5g$1%#oVex#P?xbU)R3wFj
zTrF!W<B{{Dw}O0CQAjzzFs+HD3dd}V>12scRIi?nKP4&jUQ%BKJq4bYt6H+m4zcU$
z=XIn^%SuTsN{ggWPaUfVWA3`!b91LeRXrywg(ITswJ%Q1%Vm<TmS&0KVX&=r9cE7x
z3RcqUV$GhD$HcrQD{F%Bu!luyaJ4A4g-CALRtPQK-mFLIvfmb^8M#QzDAg|mUQw#I
zTy~V2qdcN?9idmpi<YZh9T=9t+E{d*I2OIIfj&&Oum{SirXV}hoz&r&XF`>nsnP{P
zT*YPwBv)g9nI6J-(~+?Y1O8BC>sJ58K?At)=wd!ZG&$z5JzAI#Ve2_K)SgFdjJ=Nu
z2^x+(u3g*Ygj6QOtF-OoZMKcU4&OE1luXYHMUQ(AUx*npr{5<X50=z@)CE^DKk&T3
z7pw9Q0<(Yc-HxWbuhsXIFP!LjPs^U*p9Ve|Jl*tAV8QoP`#{GF8$Yt~K-=SO!>y0`
z?qs7c|3jyr-QMS4YSj<_`W};Fj|H}+v%~aNDm|J!Aw;b{QDHJo9}BJho-UH86{E(6
z6<fYG5{e8C`tOx(3y&@BtbCf3ZTASHyu}q6wb_kkYaOyFR@^Z-<_URDD$|3{S&8Nj
zxC>prTE&gW#bUK~dayiif54_m1j}-+n>`Zyqo#(tg{V^<TA|C1ncCW?rO)l|X>Ap1
zj$7?~bT?~V&+9dG?2M{EvonW{CMS|KgOZ3(C*q??8hSK%;?slmZu={=vF)mc*;|)0
z-TDLJrQ2K{*0&gI0=;;3J^$*h>vS*cThI4)nhqzK0_yq5oO4a5=+l@!F|N&#g3~8_
zK4%U^_lZ8NzE9Q)3qz{K^<{~Q*KS@dNni;#l(7YcUeU9>w@Y93myCx{tG~V!Y^&ZV
zZ>|>=Mza+b&XweypX2MEK2+3M`n<=eq*jXJf_*2jRy$w6o<izI8CTdDW=^%~2Ea97
zI<6UV#+)zrK5+1=U}Qb}fT@km<wi|p*>|O})9-if1Bs$2m25sY%H8#RZZumyU)N!v
zw%PH~b_aN-3-yln6pGFDdRv{lz`EnYv6mZaz1%)r_Fb{k1#Cqc;*Di!m9O-2fz|wf
zae;mG%jW_nWj!~5nhPwoUe>K!Kgl)!=-_~VsaHQyrB2vf&XiDdhVIsmsMq$Ho-hwt
zb%(jnT>4;kD=}t`#+LlsLXr5Oe`)(l`R2+sP79U-Ms;)*4IBgADwxBm4*VFh<iEDA
z4(2*=>tIxGUquJUK(`J?BjdnzDE5XTyXe7otB!%uVY|HTY^#$KOo21$)UlZ)&0gt8
zTt{!aD18i*Vx4l0liZU38c&Pa08?>xnJTzf;I=vzuNdf7!?M_zI7%NOn!gd*xzm4X
zQr~{3q{T(i{OyVTy4RFw{tC_BWUY6-)@$G82W)fVRl2zDkWM-FouNO<rP2GMHE*4}
zqJ5s6UQmrMri$|f#;0{2i;XeNiF8D4<%!t)^yLt%E4h5#rVxHh$$q)YV`Akm5Uq5u
z)y*CkbbB^_6N}$cdj0Ot$P09{r+S_jxc$T@-tpC!p8hKSj^Ofh9T))uAOHd&00JNY
z0w4eaAOHd&00OT-0-Kr6JTK7pjlX`+AKje!F!BPgKu<zt5C8!X009sH0T2KI5C8!X
z009uVd;$?Rgy#kB>3{CmFZ}$%N7`7W{y!M93w%HT1V8`;KmY_l00ck)1V8`;KmY_9
zl)%-@E}j?I|2u#DC!6os`$4=f(4gLiSs(xcAOHd&00JNY0w4eaAOHd&;3Uw)iaamy
z{3m|;_Tv3puEzTUPDm($00@8p2!H?xfB*=900@8p2!KF?64=7*;(39GIs)%L>$@j{
z_XQf%+b|0RKmY_l00ck)1V8`;KmY_l00f)_wz4A63mo~5_Nlk-dtSu*0!~OMfdB}A
z00@8p2!H?xfB*=900@9UgA%xg*~Rk$7r%4$_dfcnhez?gK!bW4W`O_*fB*=900@8p
z2!H?xfB*=9fRjKkEAqU+5C699(OX_~uZp~Y6B0@w00JNY0w4eaAOHd&00JNY0wB<!
z1g>Rv@w~tbZ(X?ZN5}r>5&RuNgL)fgfdB}A00@8p2!H?xfB*=900@A9lfX7s<avRA
z694h|_y@)wKwiKJ2_+B!0T2KI5C8!X009sH0T2KI5NJ>W0<(+f1$zJcTb~;G;7bRP
z7ids#!z>U00T2KI5C8!X009sH0T2KI5O5OM&Wb!QaR0@>xo5WNo8!m}I3b|~0w4ea
zAOHd&00JNY0w4eaAOHdlN+8PY;(38vDhHqa;xE7cedGli)Y~u%1V8`;KmY_l00ck)
z1V8`;KmY`s1o~K!=LNp|%hv0Db+GLt$O||jp#%aT00JNY0w4eaAOHd&00JNY0u4%F
z2eXUk1quh-e(UJc$3Bj{K!bW4W`O_*fB*=900@8p2!H?xfB*=9fRn&ZR^)ks_9yO4
z-_i8shmaR=LP7}yKmY_l00ck)1V8`;KmY_l00bJ8z;(<no)_>1zVcXm+mX9FXx--K
zHedL!I-YCq+xU}>r`rCrO>2F=^-OEH<$Wz%LLUen4}L3nWW%R7GzShh|D^d6?Tily
zG#r7&!BFJjPXAJ`R4$P7sS~*=X>n1^%9V;#p39lvse-+BIFU)lvq>S99!;JQqIJha
zg~_xKwU3Mn{n6T#(b(+nP-K6Pe`$k5wwjx+kh~-oO{wZ$Z+W(UHc2XzQJWwdyKNvC
z+0)~{+a+RBDG-GV*i%n{*~>jWuZ}GpxIPrg5BQhP)TSqjDybSN99G1#MpdlN-bM0S
zs*sx|sw&B4dX-(MkSS-sp_LjqJJg-X)XmvjXTT*#cMH*)a8_XQqp_tMW1)yhbuX>0
zd!i_jGBd(M^})+f-7(MlH0MKXinsQMB8REsgY^_op07xXs8QN3%)8gr)f!q?JzJO9
zQg~M=GEQ|Fsi#XqF00iNDP*OR+vx*qYGWT<S06{G*y44eNP@1Zom?S3Sk>GpDN1LF
zvJfv66dH-Cf>D3{3LWb8H{=_wEWTDu7>ym?8I1IG`w164P8QVMj7r#dY=t1+YD~;Z
zY+Bkq8e7;wH>Ez?rZh^<N_moy3q;LX{B5=UE2g(K+J+dyY;8=YH6vXXzCJ_t0Jp-{
znNs9>SXb&UQ}#?cb!^7IE!z6nMtZ7Xb&bX<(NJU;wZ2c+fC5p{Vu_^K{v1~;X`-<z
zb*HCPM{h%tZ45IuEh{ClC@qo#?;DNXxjhuwP9?VL5|brSD!Rq(a00gatRY127>(U6
zP^xsD)NV7DRvEcSy~=*33a;8dr%-yQadj|<xpmN|WX2k^Qm^{Ag(C4m|I&8dLdQfC
z@|;xG<CNYItoe=V=qegG2D()+hZ_-1CuTZaTUUofQItw6bug;8ucCuvpj!u{(Ogx!
z4#i$0w6^LP7#&w=>Er}cpfjKyz3rm(G0xCpvoedX@wAu?FcoK)oVr!Lt&YW34-dy%
zjdsu9v^5wR-|6@12CHX^l16f3Rg?9y^RP2)KdM~2Jhmki*}2nyX;Kqsi^Se$zwR|v
z&BhN+Bv+hvI@$#KG0s3V2I!F~n>?J%2<geJke->C*ll*O4n_64Bqr0-*-V^HK&Kmb
zC>|B2GO45S%t>K9d6EX4t{#=fZuQ1Fj)k8o%0ADSa~@+-)%arCj!kBgsl#d4v@s!*
z97|@B=|pncG)>>RnGkm38%<6m>FF>LpH9R_lj{&`DydqhO}A*984lrmBy+g8_>Q*N
z@>EYK($nL=^hV2(s?JEg#>08c7Sk(?f!kw(9UylE9b<Pvd?q`YO4GTICevB&V*SqP
zH6!mZP50!L@@lR8OkB5%T`}%iHD}(=Yto%Q<<(A~8e<q#tNn5uTRWN8E|}d;$+jc9
z!=+~ZDiK9pdhqICWO}gPqPF(%tbCf#t$o;Cvz0!^?P8B|JTK7o<40b6?CGHo;C+FH
zd%%T3AOHd&00JNY0w4eaAOHd&00JQ3MWCNm^1ML)#Kzxv@S$(shrECnD%61h2!H?x
zfB*=900@8p2!H?xfI!0$h%t+JUf>@-`_#3w4}akq<OLee&oBrCKmY_l00ck)1V8`;
zKmY_l00g`UT+b?bUf{;DuV47tSK1y&Ucd_#>OcSlKmY_l00ck)1V8`;KmY_lpy3D%
zFpGFz;DO<veg5trp8N~s1scxJFbD)d00ck)1V8`;KmY_l00ck)1iT3BW|cfI@RdVv
zyZ(Kj5&g&uc%eca2!H?xfB*=900@8p2!H?xfB*<I9DzY*5zh-eH~EX7O+NC6`;ixD
zI6uQ65C8!X009sH0T2KI5C8!X009v2A~3`%d0yc7r8Ai~=lmt)1-ww94g^2|1V8`;
zKmY_l00ck)1V8`;8jipoW)aT|eE;YZ@4n$JU6aTQG@PGd5D0((2!H?xfB*=900@8p
z2!H?xcoEpkDtTUD$Jzd01s4}zLSDcN73x3$1V8`;KmY_l00ck)1V8`;K%n6W3{#7S
zd0ybyjwe4eG4iF2$O|-_pJ5OPfB*=900@8p2!H?xfB*=900?*yXl9i>FYuSI`_~7)
z{odc4>7aE@;qUpvKc_$N0Ra#I0T2KI5C8!X009sH0T2KI5O~EBXm4un^=IWuMJms!
zo7?@gG+iNiNi3=@)Tl5sjOPXJKXS6=w`cG9GRq6Jbd31IzaO6H{6VMExwYfjj^Cvf
z_<#TifB*=900@8p2!H?xfB*>ie0Q`2eckfG?FWVq9LOqSLDD3-EEa{7CKe^JEL5b$
zMNv2>Y4d_6mqbk_svwpN!mOxDMX5BmNAIBSDT&J5JW(V~9J;GAceGX-57GI@M`FXn
zLnA3|mnsyc(?n3kqFC51%vLo)E(@X|#WtJX&L%oe=H?_KjFO@>H?Q3k4EiE__V*6&
z9ojc?>pUq7QdyXg%LTbSG&E!zKT8#1!?W{5I7F{!Hc%~Yef0p<VsA<l=0#N~Rn>V#
zmP_i8kW$OLG(npesW!7`CAq2|w9Umk>UNofsL-=SQI$Z*7g_2W85rI-bkoRmManM-
z`FSaSnv{17^Rh<mtmcWqt4OM}jS!XW7Urs=B9=8m3KXhvPE<<5f?O4<6}wm>Y70!}
zq3WqqVo~N37n+&FUb}}fFo0^*M#D>NjyZ*#qZ8>KGXNhdii`9qn(4FMHh+awDnyaX
z5|fcAimEE*g<9q7n<(k{$Q}ypzyXt3@^~_HQaCM9@5`rX0OaXlD**IzjX7(i!J<fu
zvU18#H9mLKFbgp~1au4wI+g-;Y@QJx5^kMe5YEZfVu3k>nR1RIqTxa8&M*k-SZDy|
zg@jI2m|{^%m-8n2ul9EYAKi8IJHvnf#1zX5Z0`8AFZ|Q+*TSC;KNNmjxDviCJQ2P*
z+#l}he5vzmolkZ?*!h;uO6P3nSm*VfSJKY-fB*=900@8p2!H?xfB*=900_Lo2wb^2
z;Opx;RIC#7@q6FU$mZ^VZ=lQdU_COlcgs})-+tP+_P}gD5UV!~?c37D+NL!ko)-E`
zq##vGgNmq-*sF#{+OG`wB3*}AN`$64x~~ZMVqIejQLUT_t&VI8_y)V;iYDdfWtsz-
zC!(UM`-g7m2~%x)rnRavM`$)AFP@b|Wq9u}O(|^dq*HZI$g`?O6qYK{<jRdV42|sQ
z2>9YX(?mH-QwVwng^H#b387LHHQIIG$X@!eeRX@lx2NkkDN8EtQ=$olS+Q7DDS)nx
z0pHH9(Q5uQOHrue9N9m#Z&O>qx2<c6=LKl0WK%1vIm$C7w5Fpa;Ops{EYl>BN{d|~
zHqRkaEOJt`vL_hu4IB0k&Wfk0hAPbl5DIZ5vVk$k5>bEn&nwkZg=i`zzd67RO^9Wh
wfudO_J(;kNn$X=G@a^hmDIAH?tW|GrV%_5<nsCb7yLb7SKFRZ%B3j=5Utx(JdjJ3c

diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/pizza.db-shm b/save-points/06-authentication-and-authorization/BlazingPizza.Server/pizza.db-shm
deleted file mode 100644
index d52f63d35bfa01e9d93f7f13ebc85edc02a39305..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeI*xk{u#6vgp!Us~;U8EyA{9d{jlfr-S-(9EYW@tI7`O^wCaWbhFLLC?`q%;pM0
zPZj?IhYy<S{)%7T_tx(>lGCC#rBplAb4R_oxO<#`+`7GbIH|1nAN@Z6b9{RFbaq|;
z;(7hlYy7*<pYr$PkB8o!npNMURc%w-)ef~&?NYndirS<0s(orzt*QO$fI6rSsXx?V
zbwsVJqw1JCu1=_v>XbUI&Zx8MoI0;AsEg{7x~#6KtLmEiQ(afBwyAEZ+p5ic_xJm}
z-__qE2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfB*srlq2AO-jj%c=N^!VfTvF65zm|;5dly9
zAQ1u2TgfADGivg<Yh!QeSvMpi(2{l|$Nqyeo-;%u0-o|jA_AVVl}9{bi$nxG-;6{A
zJY6o2c(xpg2zas|i3oVEVjl5SMG_J4OiL0G@I+BkmVl?Zl8At3>5{SpJja+s1UyBW
zlqKK^-XtQ>oqk1*aV8^ynT+n**sE63L1Qn#+rM4FTN_A3z&kTYSpwcyLLvg*7DLJs
z@TMLT5%8WQQkH;sRFQ~4HSI-?aV8@HZ)YPBfm+&+9OFzz0^UnVA_CqDNy-xNMotnD
r@IF*hmVkHBl8Ase0h6)>R+INglYa|%2R127!28EZM8MnMNkrfU7x*+)

diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/pizza.db-wal b/save-points/06-authentication-and-authorization/BlazingPizza.Server/pizza.db-wal
deleted file mode 100644
index ea6103d0290efd8b8d8a6a324c31bf3485cb3e72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 226632
zcmeI54UijYdFLg2JY$bNGrQ}xwO+5WJYKIoYs=QhNHb!y7=5&6H2VG?4F^g~YDq1%
z)KYg#8cniCyf&L~)K%avNhJ^pvg|>nNFA4}qsSFWLGe*s71SjcLXIR9<hTnQgbU#a
zADe^Z-fpQ!Em^X?RJf|0`>Q;oe!rggd4A9HzWw$i&F<QpXP?)ZzWSI>_mED0{oXec
z$FDuS<^9Xoe(SSe;=b^kq)M-?|7SgM#`ogC`*9)`WF^K};)Oab8Es_rp+maY8;zvz
zA@XC9#|&N<$@`32An%GiO?lGgA>H-Jb4N(ap{4K3?N2TJpQZ25e{|vLV>9!2=H7nv
zFJ=QX-0X?N!l4iAPb}_E67m18?)Fm;%^A*|(Z6t6qVpUR5sHi;_J2R@iBqm5WlXx<
zLCUz?uUs}>S(rDHSHJ8pE*t&fB(*`sjp0br7)}L)Mo%Q1NXA{H-nbkM<kW%DxIg5I
zXN>_Wdu<>iB{G66B1vuc$Epn;fuSX)m}KjW+B%S~_V6+s+hK&Bt5_5mQ5;c(C^6nG
z$QNjd<r}#md6U{jB9>SeR1}`xmv5A(bk^GFQ*F!*l*vs{&KHSO{*AC~z46NO-5pkl
zK0Yc=g*{ZlxI7R<XfG4XRu<-0ZoPJC&T#IW{`n2XQAxhpWE*8seSc`wS!(srT_b>|
zcxpIG<13>pm5lhqM1F`0CskHqdgvJq?x?^P#yuu0-(6IczwJ_#Pc)eVOLL<7zBH=5
zTK&qDACCG-m3Px3GsyteW-lWa1hy%Mks6d5)BSb2%%lWP(?l%4eeT4Z;p$cWTUv_c
zQL?&Nkwo@}KsO|Dthg}BVXSqCBf#|3S*CdMuAv$xsyWGCbKF&GQ=*-(G6iYk(oB%m
zMhHx7^KdNF&<wk4&E5;3vgV28dn|ftx5*01I#%u1IKaa<#CCmj)6g_~X^B=x4fG=Z
zd3Ise5WA|^v5g|LE4DatW605MiC4<GF^oCOSjFP=?&EWYn>Y1$PAcvV^AcNP`#TL`
zxNogEwc*65%cu4mI)7T12U+0L#)`{EO@K^Z@l*He(U@05C~CDkiWL>O#t*Kxq^%}C
zcz*NPoZ-|d{T)$(NTOSmf96Ng$W=oM!|<E30{Y!GR;h}m<s~Su;PLyG+F@|-QB@y{
zVS+(z(Hg~-d4ZKGb+v75lwaJoo1Gp;7{mvWF>QJ|PNM=Zk@d$+xVx%aP7deG^RtF$
zPE8AEnMuwf|33cwb8~Zsix>58>F>y1rb9Mv4_{<N&E?Ti4`^D3j*!Db9yezA_#t3q
z>;$h2+s6c{_P%<yq%qe|c9i|-tigYAnxlp^h`%(2V|TbCire0LURf$Gu^DD0*#)BJ
za(2{hnwFv4?z?_QMon;-Jn57}Kv+IlbL<{dyhkUhPP5v3rRwM5;AuUSda~J<Sb^;J
z(-%^d7R4?v6gO#6yWyx4C742+EZJT{qU%jH=rl{3%s@H_OrtQhOSHl_m~gwEXM_m?
zG_4PyZL-Vz=z_!xR6{<9-@`6)l&$e?iE2zbIPW*!M~JIXAop<}@c~ox@a=|lH%GEF
z+h^|;rJ4}QSu};YTW>t9MCon4CQ9Qx#|)xWxty64rAo^yj?%%X2~m3A2%Xa59?qAs
z%-kP~qLYe6Daen6N98BG=%HEpNSIaN49*-P(`u7YW5$YyM<9(gUTKg+_%$+e<@u}n
zIm6kr`a7mR@cuK=;34ABhz!l6#o!_AK@JZ4&m$VflaC2npkq5>kZmv)b)igXv#M>{
zRY+E-T0J%-&XhGL@v+7zPYx5D_QpiOKWZSqPA-yP@^k)vz994)J74?3yZ>IdAXoNN
z3Gx+QAOHd&00JNY0w4eaAOHd&00JNY0tb`8Vc9J8djyZh{`!~x==(ohLSEotIvZAj
z00@8p2!H?xfB*=900@8p2!OyC0p)K1)V#nGkN^4nmtXX~6M2C#N+^N=2!H?xfB*=9
z00@8p2!H?xfWW~dApcFr{`Uo*{h8#~VxRRI=jBTL9f3>%FAx9$5C8!X009sH0T2KI
z5C8!XILHKMW#iQE3;e<N9{VM4Yx6_+zQ93tIcx&~5C8!X009sH0T2KI5C8!X0D*l1
zbMlp%7qI@>7mA<c-g*q*7ue^63lIPS5C8!X009sH0T2KI5C8!XILHK)|1X4^7kF{E
z{I&QqKm2)oU*I6S9JYY~2!H?xfB*=900@8p2!H?xfWSV1WAc@n7x+(q_PXak^7W6;
z<NE^pd~g8*AOHd&00JNY0w4eaAOHd&00IY@fRX}G^8z!UY`v8H?x$S%zQ93tIcx&~
z5C8!X009sH0T2KI5C8!X0D*l1$K@+EFL2|TZ+u+(@<RoDUtpgPE<gYTKmY_l00ck)
z1V8`;KmY_l;2;w?AseUW1&Z%AxR2cW%h%!i0teaUunh!200ck)1V8`;KmY_l00ck)
z1ojCiDF8JuaJC)tzK;5vBghNv^T7oOfB*=900@8p2!H?xfB*=900<mp0*kV7YF^;<
z5#jZ3%75<%_&b7w>~h!!0w4eaAOHd&00JNY0w4eaAOHgU1eWA0H81e~<gdK=U!Sae
z72g-w=YtCn009sH0T2KI5C8!X009sH0T4LI1Rj!&Q}Y6gzkKP=A^TfjMqc0`yBxNG
z00@8p2!H?xfB*=900@8p2!OyofrsTQH7~I6C$F1*?x}ZNLtbE?4=z9e1V8`;KmY_l
z00ck)1V8`;K;R$~ctkc%%?rHzIePQGpNL;YUf>|R9JYY~2!H?xfB*=900@8p2!H?x
zfWSV1lk%0C7x=uX`rY%t__dXV#a-RvVL`X}$BVzPKrg!HKf3Vrv6=Zhb8kQT7qfwx
z56*Chg+m|KpCH{1{A+RdP|0xSjQ)ko5}oImh)`q%vH$yFPn>ckDPz**4pPSDe&w?9
z%EG*ny!vH-aoOk(C#el8ZVX3~#&9YaG<qW8L^AFo^~U9BAg2zD#{D5zJZlV4*=qwC
zDUlIm5lL#hKUQt<2n;PT#Uxv2)YgG?wTGAC*bXD~T*acmh~kJMM2YckLB2psEZ@il
z$(z(J60yX(prY{fzI>xRrL)#XpK4=npiFLpa=u8M@^6G?>y1~I@9wZd^zl(~D(s;W
z#^r$^LVKB5wz4q4a_hBAbB1&0^v`c7j!N>)Cfg{B>ia{Z&Qhy~?iv9!#Z$vk8ebV*
zsbs_-Ch|j6IH|G<(?ic_a7P8UFzzu~`R<~k{B4(_e4@z|Seg^n_oY$g)#_KK{BYDy
zs=S*PnMnqyHhUSdAh1n2jMSjinC`FBWhNzXnkHiTvkS9^*j2rbZ4{YZvBj|xlcU=b
zuat99ve;OW1p0<RHzYA<8LL>leeT4Z;p$cWTUrXZvF5Sj!YIbE)*;OR(^Hk45(sw<
z)gV=ABzw(qPpeIdcD~9Kq=_p#K^7|kII+#cu}niV?5-t$FaFAwK_uT}&!Bdjte|WI
zs{I=OdH9Cdu8;0Hnr1I8(dwvyUc|l6yN}NqZr;@2IjQ(3%u8&E?e8=M!oIrV)P@tI
zKAYNa=)GxO9%O+}8!IjwH6EV4;-~J_qcN|>K-6k?6e}t*4M<m8(pJk5H;>I3PMy-<
z5fz9eJVp6ueiV&dHKZ_%pD7{S@2;^*RV*#9Ie7(--?!8bgL{vv`dAPW3~GzkD6Y&4
ztW>G1ZDXVS;<nxF^f1C8K8TEI)60Pt6?lm(AZEhdRn>BGJYJrkH9T`_+IAx|$ywyz
z$De<0Zq9J=qW&%Y9ofrt$j0sAi;SqbJUZ$DP0P>`a#+aY#ta`n1dNQG;FV$fm>|{O
zSI?d@=K9HwvLBr__%BX#)Q|@8m!@#+4tGRx+gr~oOT{HN!;B=mK-65$j=D|LGIZO0
z*U!kP2@aDdopJ~W^Fp2G*gd9rk4{vbX0`W9)z8Dh(|RcNWVbG{0@<#oFQh0fid|kP
zZqlN5!%-(nFoiZ*vb}^v*PCk4X_hpZfpid<Mqz4~XoYVu;dVXG2onToS|32$WS95R
z1&J4^hI|mehh5|-TjSdj)tGc}-fz5*5Lcl<Zp1#~1E%QV+YRY%j$~)H&)zFaH6fC-
zXbN+;-gsDv(%X7Xl*W0E8APdaIWs9rm6lf=rGrruqV&EII;F!soG)XUxjz;~Cl!lQ
zI6@vKkID~}(L=NHnJ%lq8Jr14rqw2)#*7sYk3br0ywV_t@M~n`%JWzCbB42L^><8t
z;QeQ!!9&EM5gD3Ci@`(KgB%?8pGP!|Cm$2EK*x5%AlqOp>Oz^&W>wp?tB|ZvwR&tw
zoGEKg;$w|bo*X8)2{$I<KH`E$Wk0BSf#;t7=sQXme)oL~hYGr5x=-kqJPYqUdSmu?
zW`1wBcIc&<p6(MTt}guD@edq#&VP8`a_ryhepVj+%3nl${=!B5tz*jJU)jd|@?(K!
z={z~`l|SsIwvEffKFh{Pm^>B^_j|HPmdE$XmD{f|%o$83{abj=!jm`QBwu41ntMdQ
z{P<X8>`U)A57(hA;;uV}x{(I?GTR_0mJUmD2UC1?kElq~TzmiYF!a3k0h=TdhL)?k
zX(RE<@<79D#^q6UNQE-@%0OGKSn}LHE>=?^=2WXkAKeGFW6$gR=;Sl1^2{zf%u59+
zl0osf5+0YABB4iu$CWTmyY1hljb>Nvn|=0n{FL%Q_`(~;JgjUnLjg+hv1$HQS|8B8
za^Gpb*U}tu(qMvVJ{ripuTvB;1E2J-2P2K6K2hb3=1>%$D8r`v<bGk%pLNLfrxF#<
zp1xO-U^sbS8BI_q6=!anPb#bah5ke6u)netG^@T}K0Pfe`pv_z7+pz&B;EKvJ6QMR
zp<>F?S9b<4D>ga0r`-vLt6g2c6DOG(WvarXVK%BZ*#J}xWF7Ata($UU?S0_pqqBww
z*#`#NXk6Z}G2GTY(%<QAWBY)IquIK~=l$}jX+G~a4}JbXhk^agP93dvz{GT+x|Q}5
zy<;(?NYSQ~G;yJ{J-{tuWH0Zl_0#s@ZQa9nyFgx%{ptJ5a9Dn1k_(2-KZy&pqwnhi
zx%0GreEFZ$1w*xds#~{mk~{oAZ(h~kI;Whd{M#Cr%Swp3zR|-SQK`K+@WkMdHFend
znM)Zg-%9#Ymsf7-&(9fLCjG4och5gqx&6Q&D$uW9zJ~@Q1IJYu3@19M$B<k4*G$!6
zunxv`=vQC3hYlkH$93p8${bW3xN~!c%j95tR>2_Ck#~8`*;XNE988!B`(r7J<iC_7
z?nrO#RLU56mf<P4f0DbUe`2D=@_>Qj@}<8xz5>rrvG}fm<7x~o?h9Tfj}V8yV7PQi
z|3XCBexvN(9zFQ<M0<U1Fyr7OG;Pyxy${As+IiI@wleS@9mejEqw{EYhAYdeC~{vM
zPCVtVsFjmb3S$3FR%P@ArivXs7Wc=<P9!5%?miJuK7EZ$t0;N<sfXt9DP{k2SM{UA
z;U}8-l#+a=I`P;s<*+&FL%x1q;FSDSujU0lc;%hn7FV84<L?Mwd9DK^KmY_l00ck)
z1V8`;KmY_l00cnbRY>5pth1UIc=G+GbF-Ew+Q<vM3OxyxK>!3m00ck)1V8`;KmY_l
z00cnbl@l<?L)5&$TdStjyZ_-+ADfpemH&gGe1R7TfB*=900@8p2!H?xfB*=900@A<
z0VVL5Y?qoBIP{&*e6srRA3cxn3mi~y!z>U00T2KI5C8!X009sH0T2KI5EvzJMlPy(
zfu{}cde{0NG9SnH1x6vE1Ogxc0w4eaAOHd&00JNY0w4ea2b93$vR!Ik;9bA|kH;kL
z#2mgaa6r8cvp@g@KmY_l00ck)1V8`;KmY_lV3fdFxv1s^wtnrmT;`wo%x~cP0;7;n
z0s#;J0T2KI5C8!X009sH0T2Lz14`ft*)BCN@U8fN=704Wn-|{~IH2B!Ss(xcAOHd&
z00JNY0w4eaAOHd&FiPN@TvYP{e|O=j`pYL?_YCp^qmWPn0T2KI5C8!X009sH0T2KI
z5CDM#O5ioJU20z7JFj=PPf>6F1N<Gq0rfV_0s#;J0T2KI5C8!X009sH0T2LzQ3B`X
zqM8@DlYeR9V{iKxUq@bG6cS1x00JNY0w4eaAOHd&00JNY0w8ce2^eL&)VzTC^1uG@
zzxooJMPA^5dK+ee00@8p2!H?xfB*=900@8p2!OySfeUg`%?o_^vtRyS+n>8+LtbDM
z5=tNd0w4eaAOHd&00JNY0w4eaAaFnlEX#JOd4Vr}$Yg)YeD)Ob0teLFFbf1g00ck)
z1V8`;KmY_l00ck)1V#y5l#6O!;2UQ@w2=94tLKpy7=?rq2!H?xfB*=900@8p2!H?x
zfB*;_Py$cNcBy#*$D9A^dk>dC@Ezm@4yd<b76^a<2!H?xfB*=900@8p2!H?xj1ssc
z7uCGLr`<oQcQ2Pdh`hikB$Pk^1V8`;KmY_l00ck)1V8`;K;VE9cuKZQ%?oV)DD|G0
z^Sd8dAa$n?&+C>xw(zYJ7mt7QcxnEJ^U|@uJ=Qw5boAXvAD?^ATzdA;XE%@h{*l8o
z8;8Gn_yy7#FAz9z1oljGhMSl4x6ZMRBD3q?&PCb1JvzxZn{1<;8@&6A+FFYzPPvkl
z(I56w+s5UoW0sAPuyI*Ca@lxgd0*u6O8(lM!FEP}>&VF5VlL5S3M|bHW);no=hO7l
z%p}Tl><d_4dBfFN!;Lfg=f<Xp2t`IvC%7?ff<dow@oM$TE$7p7hQd|-t=7JHMi5z1
zVu~9A-H?ci?R=FfNd96j!H6QuH^^18*JPrj{jT4w!Dxr6f(E*c_Es3EGcR8=F7Hn+
z7v%YuS8h30<_t8^y?%e)Jsit4WFsc1Zh8f(kH~p2&D9|q#gAQ?Gi(sWP16*ocAKm~
zON90q=4<!WbvSgYdYUdPx0Wu?83IHX`!roVd_!#4nPQTyk30S9eYMdJo~qACr<J{@
z<_sRPrY@-pDZwh{ybQ;77@_AX76lTC{$juW>AQ58*1tc0zg3Q}y96$;Y+RZ(Ts);`
z)TskZPt2u6Mt)zpYa+F^FIX<gVoCSqmEMzNQ@W_xl)OxbEifLw$cVWie@*R`yTof6
zHADK7Y1-sDhZ4!M&|U1$eO0wW)0t3I^%!1>mj`pF!v0uFyDe(^Xhu#{Vc2zfrMWz3
zxJ<0SsAxcd2w}R;_~rfCB{sv1Bv*--CeAw2yFZg=jBIR}7wR;}?lDER@AAseUYIjn
zATu6QW~Ayg%Z*R><S5`_pZiRrbX;C}&Pb?|b+Uh(8EO^hIpS6Mx4$@6dvSD9a;F*V
zFc>zjgCbHkwl9@<ReyfY;4<lNT~I6>5ftRhY(t4tazhx(?^iG1LxYil<0=e>_amAJ
zmUVc|R2@7V&DQVMp<jLB9y*K+9M_@WI9OGR4&1qZXq{Cs$aKa+OCe_*OgI|QBfYg#
zDPu-MOO`5I{KQ0y<pBf5<x7?Nu=@NIi-$cXIDXiu_59k|SwrBGUZ)r=wm4Q|a&%kb
zmGbCe$D%!|yymv=@j1h#OZpcg5}oH5ZJYM`+(6Z&%N?ZdI_)gX8_7#^<{^isB(*`s
zjp0br7)}L)*9Kh_nIuf6b?`*OiDcYGhLcGGBZ@B@qj7)870((2RF(vsDoVc9_s?;1
z_zfn~%JGfL=?fM6Z?Y=BNSyL-gvZ3L7~_<Wic?_^l^7VT?A-Ds@`=w&1u1em^tcip
zmzR2gX$MM*!_(&Y)EYBJCRazw4xc>z!u-nZ=$SdgnKSwqes1VUQDG!LF~NDVEd!s(
z495Ls)B;o;LB?oZ;7TPU{xFdpqQXhl!OER;l0>z`@X&hKr2AdSwtcrs_dqP>2DkJ5
z*++e<R*(9$KSqW+Y=0$=-9MS{U&wZk&OEesbnZd@JtB&@^yXu;hJ<O_q8{$yNxsIA
zt=%$SbCx{DU6vo^)V#n<=g7_cC;y`#-xoM=54bQ01V8`;KmY_l00ck)1V8`;KmY_L
z5x62(s(FEb^Od(Rz4U|I3FHMPp+X%9fB*=900@8p2!H?xfB*=900<m70xPmbYF;4x
zx9?i|4}WupL0;g%`56X*00@8p2!H?xfB*=900@8p2!OyO0#D18YF@zk&(k*--~8?O
zATKZp73x3$1V8`;KmY_l00ck)1V8`;K;Xa;xGGzu<^?|er$7Im!;Qy&3weP9=VurM
z0w4eaAOHd&00JNY0w4eaAOHfB2wamZ)x5wrKXB*96Wd>T8}b5^P@xV4KmY_l00ck)
z1V8`;KmY_l00a&k0h4TzniqKgFZ}r1@A#eH{xR|b2hPth2n0X?1V8`;KmY_l00ck)
z1V8`;CK0$USE_k|UpsW^D?j%pw*h&9NvKc<0w4eaAOHd&00JNY0w4eaAOHdfj=&As
zA~i4Y%WE(GWA77JddLeLI6uQ65C8!X009sH0T2KI5C8!X009t~M8GUps(FD=ztoL<
z@#~8o<OL?7LLCTz00@8p2!H?xfB*=900@8p2pl*97GjY_%?o_fbp8+j_-Vr_<OL3#
zpJ5OPfB*=900@8p2!H?xfB*=900>MXa9FNX^8)XV{mXAfqJRIf1yXlt>3`^!{x|uB
z7YKj=2!H?xfB*=900@8p2!H?xfWWJkz==bL&*_tVv&lBf;^`B5Qc5(L0!wq^QDW4R
zY?zuCc=o^C`OH6@mp&rr1&%J*bxXg#6kPn;qOf>&;j0V3N-FRI0T2KI5C8!X009sH
z0T2KI5YXw~baYmC;S_%}L<{8#Bd`+fyzX=+1-i&eEZ?9xqhF#qmTnlE?A{)2?6OkD
zDDib#;u+CMH;TqQEwUV2FW*o)h&Sr{lCD>q<-pvmZsk<Ko@UBrmN9x6jxARti{-lA
zFI^Um99v_IBF)joYsP$AGV%>0-JeM#QE8Wjt<BEr&KYjlk`>12Cc0Y8*RA$Ug=rYs
zhB3%DihSex_3N6EdD2N9m^w16yLu|~OsFkZ1fH*x&K*V&i5h0VWUSDlu|8-KuN(bh
z<FaIwDl}0i-(mT-cvB-%?I?>CX6AHP4Yy9(-R)9|=6GYF!WL>w!(zR@W=}NPLQk!^
zW~}fMF|=J^`p`J0P1+bnWUd*@ZCaok62lY;S!0(L>c$@5HnyAEX&GAT$#WJD&+2ZR
z;-B?!v?#I#W0Pq%8G&!G1V*2!MCkOLB}*v_OqYmK9M@;;=IA~0SS@RGK{La?AbFOp
zLu3|%%dU{73nUOEUSRilfgp1_2h6B670()LEC~X>MB;#S)5ufGvaFJRR%bcYU2~H_
zDHuJ9(Z;A8O>(FyVW5!cDP)QyLJBhU>&8r_XYBHAt|<FMwxvrbkq}|D{^&!L=ON4a
zA@Z~TcLeO=fBU|VT>Z^Ik@Etl7yd!F^w&$DU;6!}mzLhP)LeSQQgG?DOIMaoF220@
z`NfYezIX8#7n_UuMc?Ani;s}bc!2;2fB*=900@8p2!H?xfB*=*$_PAidPaBgq?>Cq
zgXeAQb^Ga4GrFrM#~#}4*UgVVI-|3ZzWdL|gQsh8^}6-(lX6=^V(6OjN}VaP?Yc>z
z1!iUay8Xl>Gdjab`T3S3iH%ba&*)Z8`UFNCW=cr4;h`Cw>7+}L*g}OTS&s@s3zBHN
zzItYfXmchZwS_W6@*f4d!_tDqY#}*>(~CsZsUV*hB}R~wBNE?qtX{W2xiF)1ok=i4
zhvW>DoC%qlWHgLTj+RJQtKCc<tsgrvqq}i3%`{k%^r@2!LZ0S0kpMV(d`5Taq_<tD
z$vFv;E;F|4)`#Y2bmvb-_wxzY%?}-uYt*EPNU|jhM`v_rPDUCeH6#~L&dGAz49BUY
zNadN?8J(qXzbQ}Gh=wA`3@`+u-Ec%^kYs4(QNJLx>rF-y3Hj4AvY{TjLGn%{*QDeQ
zti*&<hi7z`PszC+meAa<K7B~;?y8f7RYBYRq+ZsC+LZ))=xq|P%702g{k}l#gP-}U
zPkrjp=j6PA{>YDX<R4xj00JNY0{@>7_!Yf=K6K1;)^POL`|B3F!)9}>+stmC&9c5~
zUpG^0)>R)xIh-!?+iW#kttPY0WOf>@=GWRRuU%cc?l9Y}wpFXhmK!9O9#2^94o}Iu
zwH|5u*E;QTs9D*lmE7TtSjfYKv(;+e(@sg%z-l4AR*dl37`<)|ZPE3DZ&UEt1M8)7
zD89aG?Id_{$LV%%<hZtbtx+<SH-y&umcy6JZ^e_2OeP-A#yYipBPz0$N;OoZ!^yNO
zy+_5U9aESR0-2H{=h=?B)?$h6CT)(^cQc8wtr!SO8Rv#APz?*hI=8uAPC95|yS(m;
z)2&w6mWT*VTRX&Wy5qi7)3#o8xIDZy<E^^=(L$z_+==h>Vz#)ykl%E7-EJ<P=t=H|
zw;VNfn)%Y|YSp^lNv5dHXt9)&%Igl7f30F?9f4xFv`1$W@k*)KV?)_ccD0eCQ=PS5
z!rHCxR6=P_#pDyCRwlCJ&NdSpIcwS<-dM}kwpKmvNY?MH7M<Zz*P6~+ccRUj<lagY
z3K_a8#&&(?J&!w)5JlSJNJw5$@J1a?Up*-J#ge}p@&+^2X0+Ceme{m!!yT%$8-?|t
z*<R@ugO);Xebo{3?=-^OetT@kWi_SR#b%mj@;2I;*!Fn>8(CYjYtPgZ!AwhVBqEhu
z#+34<s_u9&KzB;bHUC~cLR;f?SI3g~@r_MipqsB`lHo#)O4XCKj7M;nd&SNgyBX)a
z-K|W-?b&SlSnqn<>0XU(u6i;tz7S4r?+Q+~>hk7%j-=EGt!6#Jwk^d8J!`ew&h6xF
z*&x5?+X@M->XzTSwr#KPxLA)fV(B(&dC_hcy5*cL*0V;EY;m=`owjDpxh*$ONvj@v
zr@OOT=*EgYsnDwNy`q_I=Xa#gdN7~f^*gBUE}i0YrkE?fM@LHSmOm6>oZV!(P*}@K
zt?k}w#Gh}j*)1ifwQk!IsIGfAo?0#OOxn@Ph!xtDu?E6b&-%8_Un|5Kg>6$$q{8dI
z-Rf4YTS(ID)ve85u(KKRZLY5SvZiu-Bc0Ei?adfn=~~OBR<D!hqf|Y{72FiJW~Iws
zcPx^qv+L#XX4kZx+1_4lHjBKi*4_$mUOu1Tnj8V^-|(2k*j8>cw3clLc8VTvwjAGc
zREvSNRiC}O$97%eb!nrtm!#dbMj==7Ih*UQ?R-14V-2*bVRvzzORw#$_11*dWI5(o
z^M-}&ddpj`t=HC^>CjfmTyAw@?QS3!_Q#}5x)E`+)nKRONvC%M!B{rUTB8mt?VxI%
z_HMNvGX*WFW^LEIvsQ{1w^IUFvuu>JQ7@O;_L$4fL^sz8x|`KnVncK|_Oi6S5^`AL
zVcy|0hm)1=rd{MaLdMdft=&>PD|tgEI@NZR;u}mPvKO*&!9XNP)0NE)+HLW2`Cv7i
zsjORfsGX`WmGrw(I~8|v*U|2!)@*)@n_Jr}G+W_a8?{^S<%1$)&UW?+F?XRF2#Ie0
z-mb@zt9M+kbkyq4mNtB;il<6;yv%O5$8vkNkiFDuyLnsC>(7}TYcAhLbu&XbVwqGu
zmuq(Y)k53P`W$)2ZQ`~!H$z>UKkRHc(xD6;UiW9+&6bIcM%$%OVmF*Jb34@t<u;{C
zHhadt%6S5{u-{TmBz@+9!x`}=TjfSaqB2s;pU+je9MkI*3d{~=t|aNKueW8bMESHk
zu}jr+&J9a`*SnoJZ5Dd5YPk_EvF`0cF_CkWcLmYr*!4#`1unx1tkahB6x;DytjWh(
zHAl4CSe59OEi7eAyPeg|olS4DBm~QCv(Rg1)-x7!c4sX~RnwHkVhfflRHW)jG|ZK?
zXgAJg=yE<*<eKa8me^(5kzzIEHm{{CEh=JiR4dLcvpH3;WF7e+(@K<VR3g6>v=^Hu
zUndt$JCjAS=ec5ZU^TGbrSnlIpV<hyvs|yV<8G|6U2&t3mttA7w~$SC%bt8C6yGtY
zwrr(@b<0;vo1%%D&l@wlBdtiNN$tdvT&WaDH}ZC}BL@<jjX*wbO<04REnbfM0z0*4
zz_HtH=QFn8rqg9B^jsOLBBX2KT*KOHZqSt-zo}soO3poVb+6r^==4^`-LRTFQj6hI
z!AvA;cZq8epUbnAFDDCSSFBsCCZZL4ySVOb2c>wK7VGT|CLOaCQ>L`Fy>2pPx3*fn
zmL=k{g#(?9T(DQ>f=<io9-Sz=yv=&7&a?K-NQ7?q&33P)waMoS8)9pFr^vaZHMeJP
z$7zX{6RuWh%kH2m8IQEnFh|0!QX-qmZe-%Uw42K3Z1vqB#jU2BUTd&oaX5u7YopoQ
z4pj1G=U&>Dw$$t0j?25gzL)gI;sFN}+VbS2J#Ke5kaBFh+ulkw8(lA0wu@Xg==SV5
zcl`-_M=BM9fmD=yzMu2iHnzlc&{^wrI8%4aVXMU~jc#t!5sd}u64@e{PO`)0y$x|s
z+LSuQY;Y}^-rT8HQ&OkRw4GF>&epc}%3`3DOgWmCnytFsZ8d8pinkYbB94u8an)7v
zc8f7fcs(CWW<!Nur@SVbeJyvA_3t*<Em=#-Q{Su84Np0nH5YsykA2T$-{pOR)D&8&
zV3MuSiKs+n{gQ=q2I>w|T6ECFcE+CFw6?wORg2pu<eXtH*4#2@By+EmWHYf&R}9CZ
zu0&_EP;m)mSE#fp+RcF`6ZY6QlAFm)DrJioi~h7%T#p5|-6@C1AMn|7*(lHX8{55}
z)Uj{To)SgTbgWd!de%i}V7pdo?(U?vD64fh8%%85OTC7v8?dswk|;Rs;;xN+VT9YO
zJ9cu}$Oe^+*_iESc#jr^OskW~Q%pR~#^O}SY>G7Pb@!g%oNJeA-W@7Xt+>LO&3vZV
z^L8EXZY)}Bml7S9lr5}UJ(W&+yIIe-d9k;XBF3>amD%0fUayz8>t;sik%eDlYdL<4
z_jWkCVzTqGuD@8{Dkr6?Yo{4cu5CH9EsMpoM+-tR6iAVy?s56JtL6nB`R~8`z8By4
z=x@u(0{zmLbmSjiAOHd&00JNY0w4eaAOHd&00JNY0<S^>7Y~Py-S6WbV%7@z+5bC&
zm%sSj=l=A@%NP53f$!;-zV|9L94dnV2!H?xfB*=900@8p2!H?xfB*<gCoq5b?6JX@
GJpV5k>nXJW

diff --git a/save-points/08-templated-components/BlazingPizza.Server/pizza.db-shm b/save-points/08-templated-components/BlazingPizza.Server/pizza.db-shm
deleted file mode 100644
index 7b8f383c3b8a7ccffba7f5c3993270d890352888..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeI*H%>!A6oug-XE51BlcULL4^*s*9Z=9w&{Duw*a0;ywK<0*IxZ5DnbCiwqbFHo
zztPwG-s;m%a@y3ElqzR>9;o%<<>$-V&Ba5bwsL=aae8$=|2TH{a$Wu9dHvK|{JV{B
z`S|$jp?9ZN)%R#uJJe3KOYK&B)Lyku?N<lXL3K#2sKe@rI;xJT<LZPusaDk~by}TK
zXVp1%UahGM>Y}=&E~_i*s=B7Gs~hU3x}|Qbb=7LS>Ylo<+RS(VywB%d{XK#J0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@
z2q1s}0tg_000IagfB*srAb>zQ0{-Vci3oV^0f`8B>O>y#%n1?^@Wc-i5%9c~Jn}xH
zCXc%|_m-Y@Lm~og=`eEaADr==ArcYrlqV7q@QkfI;t5+MBH;OEBqHGHa(TqF<w!)p
zll@3Uz;hMzh^H!&h=6BWl8AsOijuMfJk6Cv1UyTZlqKLf#v~%(Dbl1Y0Z;HI5rN)x
z5;?}1j06@kx@&W<+Lun7dja15=K|i^Kq3O(nL)}D@V*if5%9JcQkH->^^k~w_au?B
z1iYh)L<EM?QREnBG7|81HWCr2q~pjj&SWIuy@Vtp;H{9PECFxiBoP7cLnUPico!{+
h2zV1PDNA58d5<*tS-?B6Nm&BkKTaY7-u_M^0<Xy4Fg*YO

diff --git a/save-points/08-templated-components/BlazingPizza.Server/pizza.db-wal b/save-points/08-templated-components/BlazingPizza.Server/pizza.db-wal
deleted file mode 100644
index 3e603ddef0a04c305121dd7b1db8ad9cb4045441..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 226632
zcmeI*3ve6xeIIZ_;t>)hl6R+*V4bWJ1f5ReNs#a$K;j%%#$y5E{UizU#(@{W0$5^!
z1$Gx8!1K*TkCPK$>anLzn>v%)Gj`)~>Kl*UUel?a)Nzx#NvCcdw{BynZf(c0W5;Ri
z`aJe{-1ff<EU^FqNtc=H%&}k2iQN6~|M~g-_w^@eFTXHzYs&nMH%(1FJSBg9>i?X3
z@{=D)IDe`?^oQTR@xmFBq|>I)y#2+sW54l7|1zD7uo7b|@j{K3jCNA`(4ncf8I2_G
zA@a{Em+609AU~(o9r9DDPqRO6^U&0_`122uBZn4#EFXVr;b#j!p8fRP(?_Rg@95uq
z<f}8`X>R8DVd2m#y5sYmaaH`kOS}El!+OK%)4IEtBs$MAaiPcvV(<GS-W27|P{xeg
z6QPWzUZTl(d2ZH7zIyw?qRAMHWvBp^GREQ=V{9!FF?!>%bSC8{=|)o`oKp)XQo*P@
zwP_4fn^*gFcm;-*m|}*lF(zY%%90BDm8dz^L`IMs=^Z4ss|S1x$F>=v8{rGI#PaoA
zg#3_NMN$#zc0}pP<h*>ne80@@Vo_j3acG2t_O)a5t7FXd%jDF~Y3lIDQ&cbzlSgm7
zY}%h;k#yTnrKp&fN*hi6f<)UyI<Po5yLj`N1-;?yS>3IG5~vK{Xt4FNsQ!F-I9O`(
zAY4P^m=LK!DNU@5?zK!j7$fyZsaQrOjnRXU4OC1Cfh~-NQttfDywdsGZl&|-22)^Z
zPE>y`40m2ler=r}l)7){J+#P->!~_8A0rk7wjoceF*7e%qsz>iz>PUHqC!S~`|NSO
z;mQ@=i%n(Z337I^BAN05fv!v9$nM;*!^qJAN0{lVjZcW=zM>ivb(CI?W$M!4<Qh5i
zynJ13)rL<_O{A4mmjK=4-1X5CJ<?CL?RyJTodzo?XSG^f({P%cl%(B3zqQ9&`E914
z8I$H%rrQ`ZGv7KlV@O`nO|kVN(-E5-xiRGEmc%Rjxe>;kbtGZ_mgkt>aN~yV&Iu*F
zF<xRzZ0~}UZsqr8kvQ?d@!^n9%r^-Bq%03|f=?<dnv9wWGX9Krx1`FLa3pLFXK~zt
z@n^`s>p3|`Zmk~G8&00o-4PW;GP_0j-|R4roHS4vgnz;r(95nFl{)p@T$vYGsZvu1
zGdk~k_oN9&?=`2%bWaGpL?$3J=C-J|9~83=i_6Oh{i#AG<>(z$%}TJ;ZfGX*x_k|h
zuS}!G2<4^O8N*vnPMXfLNzN*NKX&VRz20!)g6_rM71_tM$%Wg?7a38rd1N>Onj?ci
z$N`nhsU4jVj-j$+qH@2BksOrQ>1s3R+Q=BxFzmk^jZB%>dPyRIavYg41TRbq)Sycw
zUYebwcesa?u>Hz8<y3KtjTj@zArLj2Gs9ui92tb|zUR+SsWAa_7YgJ;?5A0dDSG)<
zUD`h%RX=hkDYOKEsTaCwiLNzNX3d<YYNVn`>7;y#709h<aueh!u*$b2sxCjoK1jZC
zkCZX_g@9vsnc}4G406ckBX@gsxCvSmcX*+=N{i#Ji-`(fXJV~do)N|jSab9NhMi^z
zEGtc9&Ft`gx*+kwePPCoN1mlK_nM`eDU!2lcJw#jeps2Mw{@CXn&LU8KTDO(>2b4E
zIr5rkX}{E%S^5A|Z$cCYp&rQ~vrONgMd_2uqU^}8gh%8zyTqXx`H^r_!RbG9h)lCZ
zP7r2f_wW$X$id5X@(_NNlw7=ZMW;8MIitH{?t%ASUHUH(hlc9Vyjt{M!XD(oVefrJ
zV?6#b!Aqv2I<H4AlM%MgSnqMnrXJH=7_|5!)g^fHyugjQ_oydgiYY7i$=<sofq%?E
zzMYsS-{klFz4d}${w@9(%fIBBlM{PO3Gx=cAOHafKmY;|fB*y_009U<00Iy=m;#68
zVX2=ZD7D^|{CMT5|AcjcgBfg$3IY&-00bZa0SG_<0uX=z1RyXXp!^Mhx-Rgx_ZQyv
z1^cHyjdg($CG0`~0uX=z1Rwwb2tWV=5P$##4yJ(oHywMQ7s&rOT>dZr?s@a9oQS_8
zkQML+0SG_<0uX=z1Rwwb2tWV=5ID#JGxFfn&kH==`TgH~=X<~Q6MSCaAcq`dg8&2|
z009U<00Izz00bZa0SN2~=;bYSUEtgAdilS7{z&K_;qwA}KG=W&1Rwwb2tWV=5P$##
zAOHaf9Ap9I{})1C7kK7<-}%z79{FuEJ}+>PLyoaQ00Izz00bZa0SG_<0uX=z1oi}u
z%3JEXz?m!m#(wr!^JRQqV9y5|5P$##AOHafKmY;|fB*y_0D*%npezBX>jEEr=Q}?3
zgQu51fX@pY<d9=*5P$##AOHafKmY;|fB*y_0D(P$WAc`|F5rK``<LJO<gfi(d|qJB
z2OAK800bZa0SG_<0uX=z1Rwx`gDh}d9-O)^;Q7;)4}SAYKY9V57dXfv$JihM0SG_<
z0uX=z1Rwwb2tWV=djiT5fVwWguin16xsdu4)&=%_umJ%GKmY;|fB*y_009U<00Iy=
z$O7~7;M8@2`Ln<5IQ;Ur-hsa(ILIN#*dPD_2tWV=5P$##AOHafKmY=J0t@n%x-Rg(
zkNo53rjLjQd|qJB2OAK800bZa0SG_<0uX=z1Rwx`gDmi{JUDe-;Gcc^ZOP}}UHfCK
z3moK-V{8zB00bZa0SG_<0uX=z1Rwx`J%LB$Ep=VsgRxH-K6>{2BGv`=e6Rrl2tWV=
z5P$##AOHafKmY;|ILHEz%7ata1zuu4VcuDDd<5$P2RY;z8w4N#0SG_<0uX=z1Rwwb
z2tZ&@;Do%Tt_v7G{0INx_#dB3&dqnG<_`-~^M5k`OLO$Rd-l_FPamD0y`z8ck+05#
zr~k<`cUU;|itaeccHqC}JBLb!)2DTJFG+NsW8y-Q5yam2N4zP@ouP~ww<kgwO}#{u
z@$%fPk$m;`gGG}u7|T!rDrJntGsf6jBx3Z&W9dxFP122~L^!7wOr(NQcWToZrZ%tk
z>+lK;EiuImTVqVd43#An^ea(wtci>uH_|&uYF7{V7>;c-LN~$}Xo=<Pxd{0owTh%7
z((Q=SlgWAcdij2t-NmB7h~m%)2kmRe=vT*>>zB!?ozv9ekEf_$ASRFAc-gc+!y@Un
zpGr|NFO@c$`UQ!$iF9CbZg%nJGYfjd*|WM^0VPlwzR_UoWl{b4@Nlry<UzQG#xWsM
zgHoDU8Qp7{crZrlk5aLWN*bdFAseWe5&~No4W-=qoq476x7|wT(+#G;(wwONTo~@W
zn*7>2KPYwI&U<K)8P`*Fa6U#X2y8>1R%2#futt}eHGvy*XhemK{H=2{hU6996k9Jc
z9kI!=5|g7_60hv%669oKMREoN1iCJXIqOKm{Oz;H^@b}~bT2j)xRJvnyK}>gBS#0C
zVWzA0eZoZ8S5!l)B6&HMsY`=%bL7PJ@^!IQ8$P!+6Gb`miSIp5eIG5+BmGp{zITAA
zPJ<Pci-KBQ({P%c)1=)&zqQ9&`E9148I$H%rrQ`Zv2S^f=?yn-=<b|Q;uGT~w#4=>
zNa<F7Zx)FY4;&wk*~EN<=uOJ<ASd{wvZBeTiSYO{-rbTaV>}Z!hqE~D!1yy{-}RiF
zBezzM>J2AP>h6dNBAK3|{BL%cMot<i4B|Io3iq;WMy1XjH&^BbR;tw0!HiDa-aTo;
z(R)owGG7w{FOeC<jJYkU?FYrI!{YKXLVv1|Sv7hGRkIQ-wHun5xGrBb<SWx?F+zE1
zcE<3QlanqtvPsS=e?NBXdA;6n;ezhP-WA!$w8@3r%NH3@vw37V0-7U(K*#}=%c&im
z5RRd;W1@1utBD+x*XeRG=-S8_)G+M7o{UVH*LqDMfpQ#~F$6D63e=!WBwm`Gqj$K6
zl(7BEIptJwi;Wl~$srImn=`{<(;OLu?Y`&FP^mEia~BHaO6sRsjwyQiR$baZA5}kc
zD=4%CfvFd|X^E~iRA$YbrfQ_3N$I3~i51AbWO5VaDX_}7B&sey#6C#AagUTSUZ~L=
zyUP?Ob!U)6HXpg$tHVvuqPW8g#Z_7ycU??W_&O77)$)umX26=G4>0UBLtt5HB5P)c
z_tOQ57w!u)W<2sNow?U6)l89`RkNeN`S!!gEWNGM%+eIkG5uMpY)+4xrOJ`lJWKnf
z#>~<On0gbUI0*Gf2AO60{wzwLR2F6DA@VYLM1G-69Ga1z={6Od{xhM-G+X2ZVMcZj
z4<U^lyj&*_;a5q?#amZ&dc&DBx;y3`c<<Gv{}OR%s1D7mMgJx2K^`3T-bXaX;~x{e
zWIC$zdgL-0Ve5?b9>;9zG0lZRi$79bf+x=l+?achdLpKnvT~msda)$oBO!Q9j)S@`
z@E*fMAN$vzd4ZifRG2zC^|`49@7xEDT%Y;)^uL&?9{R|1cj|M;ugv}E*hi1KW?z}L
z9{tqRJLJ-@{fkteKYu}Y^QiLhuUun-@@s+S)OoTWt6<DWWsRmm9+NR1Bd>*n>peM1
zOoKVvyI?Kee!`$Pn9aHudCiF@pV}F|%G5RYh~EC=BQs;K_TJ&ac_>%0?~b7|NBA;Z
zCl5YtmaHA9AsmU-J;Jz7bFICnhe71EFW6)eVK8#FZ`zr7+0^ghRikORJ0wAAd$HeJ
zZMEdReY9Flf|yfBJ^bq4PaSz*-=mYCQI&UgIbc32LXi~|uRHB^`zSK?$mDUS&695X
z`+B3fs`iF`=633&@<Mp`*^vk<mzY5X%I=#c#aB7{fZ>(%PKv!&b0|pt1}4R*U*~;;
zqEyq5NpHJf(l{IwwZ7ps6eT7~vB@#H-?ZqpI&ghmX2n}i-D{Cx(0H#inn|G~oW5;2
zp`7)1doQ7b{K~1IIqQ4-rzXvc-r>Qt7(SE6ug|IHJ$b2^aO$f$e5}~u=&trkFgV-Q
z^LK0`6K9#);o)gE+--6JP<tTv@xD{8SLf?}9k}t>jNw791O47;Lf%U;+@5;0ccr(F
zTnD@y&DJzA@9m$Q6!YHULChcMVPNlKr<T?RVC-_Cl2N;aq6xinY{FgOf#=20wY=A@
z*E@!{rykiK0{M*WHQzf82m6nX3&G&<-zEgw(yw0#<W?T!2Cx@`LAPGlOSkeQclbLu
zuIO%_Ri3DVSxw00PKdc)-v?JjCG|o-68(p)iN!{rxs<~4t)y40Y4N7+oZjFz>u#Rk
z-+uqh?L93FI?zit-J=IX1xLHkFHZWPK8D=XJu$Hl{qtb75545`_vph=!O=eS4$2N{
zAGou6!zJ=ydq!c9b>yqO=Gj(}Gxi%?iv^Qw6j{Ae9&v|qYnxKa$gK>Xa(hp5H+63w
zJ7T#&zvJ>|usC`Ko|`b@eFaCmF&J^LViS3VIQ*Xt7cc7W#+A!&g5BMv`@cQWZlCS9
z*#8xp_R!#bS5n7achv{%e#Q65GIEC;Zby4%xNK5eBlpEYy%X+=+In)zj@bJlcV+kq
zOs#hKvA9=84k9VBxc`ZG{L|M^vq~p#KlQL4zonFaxvI{I{l7pQEC&y=Y3BvGJokPR
zi{Da?``uq}UErkrR<EuL<iGOD?=<c<AH&}fy!N#Ylz;#PAOHafKmY;|fB*y_009WR
z0R>LUeOA{6e(<d?o_yP>jbm6BcmqZfU4{SzAOHafKmY;|fB*y_009WRb^(K2L|qs7
z*4>wX{%2Qy@^@$DMCJd%P~N~71Rwwb2tWV=5P$##AOHafKmY;<RNzhWxYTulFMj!@
z-}pQAoeDlLa6qGtVL<=_5P$##AOHafKmY;|fB*!B1y0Mm>bk&Rq<j~C(ab-A&kGDA
zVGjZjfB*y_009U<00Izz00ba#Km{I`$EB_dJQn}#?_YUm{&(?tfdd+C3=0AffB*y_
z009U<00Izz00bZ~EO18NRo4ZWpM*d5;rf5n<MRT;NZ5k_1Rwwb2tWV=5P$##AOHaf
z98iHb%i~hl1>RGe*8kp}^C5g*;DAOO!-4<=AOHafKmY;|fB*y_009UL3!IgA)pdct
z|0CZk@0LF7!n(jP680bf0SG_<0uX=z1Rwwb2tWV=2UOq*d0gtcz`I{+d_ViczxjLk
zJAwlmZ43(n5P$##AOHafKmY;|fB*y_Ff4FR-c{EHLN9;T@n3KL?yFcA7)HV#1Rwwb
z2tWV=5P$##AOHafK;VE180B%P>jIy({ja%?zVqWRU|ryVMjOL|00bZa0SG_<0uX=z
z1Rwwb2n-9Hmv_~50srpfuYT{sOJBsgz%UZ_AOHafKmY;|fB*y_009U<00IY8z$A}L
zT^Hzl?T5AJeZFH@7dW8N#;_m&0SG_<0uX=z1Rwwb2tWV=!vYuNU3FdHe~P|W#eb;(
z_gEJgM#3HhAOHafKmY;|fB*y_009U<;D8D|DUVBC7x?q}Z_hb?>93cuE^t7jjbT9m
z0uX=z1Rwwb2tWV=5P$##h6OIlyXv~Y#vlEjqxJ0j{}Ss0!${bJ00bZa0SG_<0uX=z
z1Rwwb2pmv>r{r;|>jHoMvyXj0`QN|(%{h{G>hSE;!oQmPtK%1refL;t_9wH_(Z4y`
zJi2h?H;+87|Db+-<|{L+4}IpL!_$Go-#vVnWX2Z+4xGTQS#P*;QFrq!TQ4%5U^bUv
zcX#Ow-)OM)a<2a~Sk$Iky(!9_p^U+pkIEWN6U&&4@tD!1Eom}dHtkhuTFhV78|<fb
zHy;{mTg;^!Oo64jeygHoe0!RFnwCVljlBv?i_cz}F<d{bdw!&exKLySwSnuC8tCU5
ztzJ!Dyy<#cZzx>R-E8hv&j=zbN=z{z&~=G)v6bIu3R19`OEaR#@^!M6={A_eaK3B%
zdoY|~VnzMF4d+%2)Rs+Gji$ZE<sG?w)8b9%qTWE0zSr*GcQ3~>b$JkDx^8|AT_39F
z!FsM1(RBRiWxXLlI&PlSajMf`1zIB7Bg|Lt+t)$SiQUs=S-iP$NpA>~zBnfJ#mm>l
zR*flU*xG2&uiUpc+QJk2Gn8p@_bI)>OU|i_YKN4`D&~9)$F>=v>n;`rG82QvUi#Df
z`Y<Vful?Rpd4BDy(6ku1IAgeQQpc!GhncRJTN4@i=i<JG)T6zM<vqDtlHIh}eUe<1
zE@&=FKBmnU7%yLB#N5DNlX`hy^_qj4BE7~m$K*B#HIma}>O!yWE9xjTnTev>kHMCB
zso(ZmESOx=UKTZZG$qG&VUX3d*f8l0m&oWZC_Nw`LX564LHYXZ78@}}l9R-XV_O}{
z-D^oxMjmX87iu)e?lMI+uW9ie=k<p3q{X93i&TwfxzXmH90nfbxlbcXM$_W+Mxsj2
zlfB!_pjRoLBT<#V2a6-A7ls=pcbbt5{bHkiP^y#%+pCpCRd-HraGP~E&nqJwswl#j
z*}5`M$qivpe=pf|j~)ya9PL8CcyC6Nise2$F|iL`j%I87`_M~1e~&&46&&qD?_mF|
zQu@H1?M<yS3WKaOGPM*rW52=S2|bis+mupfcxuVD$|HXB*b&PG`W=@yRrNvgxd|g4
z<QNn9!9i{0m(R=?!WVT@%7Dct$4X3&Zb`hdKm4#`)jp~`aohj6-f;1v?rvP7^Bki+
zrrkc<?`p>FiBS8VcIIY{<g51#MCJf_WXezhDrJntGsf6jByzQ%Ven8iDT_BAOJ`DU
zQUR$hJk)WMF_8*J-KkAunA#*0PU#+LO}^Flp5x@{*KbN&kAJwHUZrC1hum9#JVgZq
zv5{&QjVa1crKp&fO81ART)E{&<R?BK6`{z}q1T=Ex_#6GG~4f_IC$C|ZCW#op~lsc
za=^zoKR3I0J8@cXIDJ}o_qjnJMa4*b^O)etW9dglHW-bVQ46RBf|SvQz`d4<2V<n}
zC>6`7Ay)33<7!khq{%gTe|vjJ)o0>~S+pHfBP-_mxAVQ$hhwTH5684uMn)YRe=ULC
zdothKkjFjTvgQ$eD5U-Ld(0>j(i?A@F{I6tPU^umJi}KRa%s1Yrko+KahK#*Idxs&
zpC9}6SHAFE?nQiF;K04$Vn7gp00bZa0SG_<0uX=z1Rwx`aRQg+M0H&t_=SHu_sM6k
z$FVLjjtXfIfB*y_009U<00Izz00bZafdeP7D33^87ufp5=USh=_1M?3E^y%Di~&Ia
z0uX=z1Rwwb2tWV=5P$###tA$vC#vfLD_?fiKJequJd1UKaa2fy00bZa0SG_<0uX=z
z1Rwwb2pl+pEAoicb%D>v&$OQMU41*&1rA)CF(3#)00Izz00bZa0SG_<0uX?}IDxBj
zqPi|%|AW@tpT7JdJ=O)rQ6UWi5P$##AOHafKmY;|fB*y_aNq>Y@`%)Rfm`qS<}087
zVdbY-7dUWn#(*FI0SG_<0uX=z1Rwwb2tWV=;{>kBiR!w*A2Kh0|0~-+O=DeP92L?a
z009U<00Izz00bZa0SG_<0tZgux;!FvUEmwS_Z(mS@hh)jUEsjQ83Td<1Rwwb2tWV=
z5P$##AOHafj1#cPiR!w*3%~sfbMv83+`ziPI4Yz;00Izz00bZa0SG_<0uX=z1P+{l
zm5j)$t_$dN?|aqyvv0i*>jDQZ&KM8`AOHafKmY;|fB*y_009U<V4T2VIZ<5~Fnq%D
zmEsRBKQ~9x4lVro)WQ$RH+(?=0uX=z1Rwwb2tWV=5P$##An=A2IDY8xSzU&2G}wAs
zJat@0_R<Zez|x#}gbZpy9+<i=@H@YB>mU5w_q89$>jFpS98(Lwz7U!Ji+N%G%-lET
zevKsH3jz>;00bZa0SG_<0uX=z1g55b@yN{7N&d!p*EN?bBhW=wV);7F8G{ndv2@+o
zV0U+E;|?oTj1pg?C7uzDbiHWI(;~~Uweoc(gLu703*`zUuo8W3yHSqr?S=KE{;*@w
zYQ5$NN|!_<$5t7mNON@YsxjY^jC|cl_gc}^rW}_mT4%~-mNEJmjxATD<(Zi&!*%;v
ztL2)_u~A{_Mz(H@@bw~Jzjp1KrhJ}sL@u7GFh&pAUVDi2V&g4WNG~iw$ylL9W344t
z1fH*n*Nj22en~P)6`J%W-)8xictcZ{no${7zYuA(%?P3}t)DX7JmI)vwOw0wq#JCZ
zYb;dQLY1jsHCA|ujI&i>dR`pUBF7j;WUd;^En1-K62lY;s&R)FYQ`?#GPWApW*J)Q
z%58dDr4r5YYQ@FFa=_ktofz~$B{Ifdl;k?f0<%LZQX<v^_Hgtrd5f0&b6!(_gK0Dv
zfv>Z28(xkUMYdqvOAH+%(r(9f0_Jk{#i(^EwP~!fB>H@bOn?F@JeUB={+_vfkW3bV
z-Q|Unj`VnE*(y&lWeO+^U4^Ac0$Y&9uNgNgUE>bl;)-%G<e}^kA~HP~Z7_O*3JaNl
z1*2CHH74X)N>1m8$-lk7Bgnt+>lgmybCxg5>jJ0d{`b_v_ZGgi@R@~=EWEVPSa^0J
zvhd8p<%JXTKb`;5{HNzXH2<#o#(aL>KmYXnqa-uFAOHafKmY;|fB*y_009U<;0-45
z=&9+c3nx5Wi|N09+palIot&P!a$@Ag+HuYD_+!&kc9M7Rg}MJiEG}KMJ$^zymX;X0
zYP?)yifpT97HEN4T)E~r{^<0S;e<zC5+TbRCm)%fT0G$w7;&&>LXr&+PfwXoxCMzV
zRCuxmQekL867AQPPA`z&oK8zEq0ErgkOJLiX~Al-k|l*x^Q5Yi5k4<Uj36(SNPNS&
zbj|VP-1L<Dbea*`WC=l8K_N|(6$xX5qa~8n=CF{L?Kd5tp1OWwovE`T$x|Z>3VE92
zL;`T)*!0xJ6TViVDlbupbeXYVvpqaJJ$3FxLR}XiOC=8<l~bbXN(o7sJ2E|W`b4}=
z7Kuc%dqOYQ<6$^Xl_H6!XQrpDz44p#bd~f_B&z`oL39`%k_|Ept-SmfgjTJ=NFtFx
zH7yU+OV`N?6j^mr787h_2qzCuPhC1GFX6C6b1(VSAvwFdMi!h3+UzHEa(}3fB+!Fs
zlL@Q*PYI}>7x;zun!lU=)Dz#5*9CMB{d|i2hc5^~00I#B|3%>aQ@Yux!Tnpcqesph
zwXN9PzGZ6JX7RaJ+{;T#7O!o^y5jV>mX@4L4qGa1b2x1lo6T&on=LM*&GL-H@r=!R
zZOLVI*;l+JUuY%X2rjo<<!GZ4sFpmjKr-rOV)<l!joN4x;t8LvR_?kgotP`e3j(_y
z+*yimRYERriz>4Atd&`>1X@dldcd6PMt8S;=CWfexng71edVfu)w3ehw_DvxVO<EU
ziEB~2zg}B)ICocEc|RXXtgo$_gH)Z5uV=a)$=wZG-I4HiB_w5dpEIzXc6B2em#@%H
z+BR36p=Ddk!Un>rk|SG56<59Hwt3m=*>PF&X&2Mo^6v=Ir5fLfc(QHx`euPjIl5GA
zCG4dNORaz{Wo8pzhlg!ML&;2WD`4BqC$sIXM4{5~aofpiVr99Vu(z6V#}Zq%a8#Ts
zC!3<JvE{Qzmm0-vCD7d5P1P#lR&guVvAU&5EEr?M9bYja6ddb}-=D13+df-B2sRrH
zhm<df(b^ibU8ZfEKN()mo2%uzx4M-xuPsy2SiO*}^98Py*bUZ~JArPI;w|aT6`$MN
zSliBu*@n+mUQODA8SlE_uy*Xr;nm8{X3^zLx09iC)|pPPr5riYAIqi%U%8mF(+Qs0
zX;-`Ac7ZQ7qLuXkB{nn3Qn|ov7FMD~cWS$4-pLoYBkR7-S~6qzS{mKxs@>fzHd8#^
zN+df%W7`q6TI0^(wv&&oNFm3TGgykJ+O=rb)r?97#^3D(A}fOE<ChC=Yo_7~C5rVn
z&qvxj)eP@WMXDB-4TZLZHE+>uZpFK-%U7<syQ^k4vs0+FJ>1G#zRY_04TpDaW4YPP
z@YRB}<EVGqT$%FL%JzJKuld`X^^H!RDt0!PTA^@-D|nnjhiY3q;lLW-vBdmMUzYQ4
ztVFxZrE<jAc1xAr$_DQdvuUnti^L=5)o^D$Wu}@d-e}TMsw7Jrg{?$9<qLQ!KAU$X
zC#C|CW{pp-$Csi3+g8RZ#du4AiZw#%Mz$W@$Vg60y%Mzf(}}FPTg(fVr9j=>$VH<b
zDZL?VB!yful?{n@^Qur0%Xznu3R<_=U?mdERir>$jF(*wUpSezH##+eaa0nUqH{ap
z-u8rC%gtP9Ih60ZDLP)*?5?NF)o_vP?$*RDDUuB=S1j&iuuajD5Z$yUY7v_?kfPGz
zPBOf;!!`>IkDJZ;GMQvGQnuHUIe*gL2nJS!be)cuGKusmovQeA8K<M-@w=BA@p9Tr
z)nin3Cs#I$oIBXgmDcmDvs`O7r1kVpxE)x@vOAVeV{O;lbg$XM*+$*GUXHoq)&P|X
ztOR0?HBY^ptqZ#z|9WeQ3JcCqyir<dG{lWnYr_`Xv~N{Jvv)1g@<!<7X2orBRf25Z
zxg86LW~-Q4s?t)x&$t*%xSd{I+AdbvLdnnC6M<dtCcENjIpXPUOU7q*Sa?gDFBYQ0
z?s8|dyc8;j%TZ^u#jVt>L2I!P2(9LFMK<dWZRILULASNc@%7crb}ML4O4(qu8Sb!l
zZmlTngdCNaKW_J@cO!9Twb+fjBJ4`szgh0qR=ADirq5G$Cp}w%N>_+&c@x%Hu_=(l
z+eyJ+iLOVsc}LtGOveK|S<Cv`uFuTvavRy!dcbezEK;JB-Pqy6K6A$0iQ9H!US}vD
zl3botxZvOLJ9n%3ZN9*6#5sP;&sNhS)nrS}Eiao|a&57xR;=BLH*<~jMxwFY4&|Dq
zT{c|K=4?eeNw=3`p+qHR59AuPLeN$UB$CxuF_X4#Fj4E$y0_jAIhvj53KMT<s;*>5
z+ANt@t?9(Fb2mXtsnuG$Kvz9dg!9Csop>_ZE*6<Wbh%vR!q)nh#apOa{i{wliTLWa
z+t!WSme>##*mf~HQP)PdEYt&B$6rgVrHYmUlWh3os~u05jyfG#Y9|m{OXkC3d?#vN
z*=n(?bxWM5GP{YQGuKE}H)DA}*QthhubEFcGR2L0C&jHgwxbrI72Tra*&U~aV;dc|
z7PE^i-QJ;+T#07GJ5hT%lg-k}3fmM{Y|*ZlcTt_-=B_1T*_7hBZepGC*g}cOR>ihr
z5Bei^k6CnVZCWf;utJrbCA!hhIy<3g!@1s(Y}R7JQniHI!A{cNu`PKwZL88oR&>{@
zD_hG^pJT~FuEnt(cO<Z~ZQk10*tBg1%i=22c2)wFb(@$G&3<9oX3Hc}>{4=tv)J32
zU5YD|b1sX2s~hXmwXIyK$WujUCc2zWx4rQw6VGM*?M|~BaBaoS3BFP9xF`n`-bqWo
zoINabGh5|CC%Z&fnqjv&BxJMoT##ybTS8&8wcD|Uy2<WVr{t-wZniv;G?@XLHSdP4
z$ojb5Zn0XZP~k4SzER40{MM~_EwB`BOKY_n%P+eUop>d^(M+@Lk`Ugl)M<OO>yh$F
zjuDnUR(G=Gv+a<3)^3}2m*c6zDpTBbIm>aIrxXa)7%sxD2bf~QWvL{JnQFvS5<4Zk
ztKDLnjAxCuIXkiDQpsA4EayGDN!Lc(=iHH2z3zfNkl)DEqJgllCY7C4hts>BZWiKg
zPi}X2Da?77OVMSA-)g1v=}g{TD=$Zz^m5h1+Ff<V;S8;E_EyoK4q7_(wmnxBiy^+0
zU)|VV_QtwFYga1!<FwQXx9m-+ZY>pRR&RoegaXlM))`wW_?)ROXBC&EWx8FZwm03I
zzLlbb+*NZsF4snLJ-WI|Te^Z!a4kEd-R+Pskta985L+s(N%ak`$x9_F%6CGAx@U7O
z<rdO`pmW6>*tV8;=uTlvqH2|ZnA{+9&|+b2fo02X$G7IA))Qe{gpG1^cx|PV2rmov
zWYn5p&srUu@oXWv)!d=-mVDj36$$J{+Yuid%Y>r&vRm59(L9&WvF-IjFj@0f-RXFn
zPPX!yf;HyM1_M-*4Rp=9<x;0mwp!K;KB4Mo<H6-<wbiMW1P2vhTPv$w#wW7nI{8Ed
zdDJ~7KklmQ0_MBybGcUFf5?jkx`jWRBLCqF0uX=z1Rwwb2tWV=5P$##AOL|kpumO0
z(fj_khYV|x{M-9Gg1@@($koJ$&fV>;3%okD@ah|I;OH_0AOHafKmY;|fB*y_009U<
R00NT*W)Gh^+W)-3{{=7jX*K`=


From 06ba5ef6590798513edcdbf8c33e2bf0dddd8574 Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Fritz" <csharpfritz@users.noreply.github.com>
Date: Wed, 16 Mar 2022 13:37:00 -0400
Subject: [PATCH 17/20] Added segment about JSON codegen

---
 docs/06-authentication-and-authorization.md | 44 +++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/docs/06-authentication-and-authorization.md b/docs/06-authentication-and-authorization.md
index 3bea9069..906d59c4 100644
--- a/docs/06-authentication-and-authorization.md
+++ b/docs/06-authentication-and-authorization.md
@@ -263,6 +263,50 @@ builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new
     .AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
 ```
 
+### Optional:  Optimize JSON interactions with .NET 6 JSON CodeGeneration
+
+Starting with .NET 6, the System.Text.Json.JsonSerializer supports working with optimized code generated for serializing and deserializing JSON payloads.  Code is generated at build time, resulting in a significant performance improvement for the serialization and deserialization of JSON data.  This is configured by taking the following steps:
+
+1. Create a partial Context class that inherits from `System.Text.Json.Serialization.JsonSerializerContext`
+2. Decorate the class with the `System.Text.Json.JsonSourceGenerationOptions` attribute
+3. Add `JsonSerializable` attributes to the class definition for each type that you would like to have code generated
+
+We have already written this context for you and it is located in the `BlazingPizza.Shared.Order.cs" file
+
+```csharp
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+[JsonSerializable(typeof(Order))]
+[JsonSerializable(typeof(OrderWithStatus))]
+[JsonSerializable(typeof(List<OrderWithStatus>))]
+[JsonSerializable(typeof(Pizza))]
+[JsonSerializable(typeof(List<PizzaSpecial>))]
+[JsonSerializable(typeof(List<Topping>))]
+[JsonSerializable(typeof(Topping))]
+public partial class OrderContext : JsonSerializerContext {}
+```
+
+You can now optimize the calls to the HttpClient in the `OrdersClient` class by passing an `OrderContext.Default` parameter pointing to the type sought as the second parameter.  Updating the methods in the `OrdersClient` class should look like the following:
+
+```csharp
+	public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
+			await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
+
+
+	public async Task<OrderWithStatus> GetOrder(int orderId) =>
+			await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
+
+
+	public async Task<int> PlaceOrder(Order order)
+	{
+		var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
+		response.EnsureSuccessStatusCode();
+		var orderId = await response.Content.ReadFromJsonAsync<int>();
+		return orderId;
+	}
+```
+
+### Deploy OrdersClient to pages
+
 Update each page where an `HttpClient` is used to manage orders to use the new typed `OrdersClient`. Inject an `OrdersClient` instead of an `HttpClient` and use the new client to make the API call. Wrap each call in a `try-catch` that handles exceptions of type `AccessTokenNotAvailableException` by calling the provided `Redirect()` method.
 
 *Checkout.razor*

From dd8749cd0d02ed7f80658a1a04dd3062761e6431 Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Fritz" <csharpfritz@users.noreply.github.com>
Date: Wed, 16 Mar 2022 13:38:00 -0400
Subject: [PATCH 18/20] Removed tabs in code sample

---
 docs/06-authentication-and-authorization.md | 24 ++++++++++-----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/docs/06-authentication-and-authorization.md b/docs/06-authentication-and-authorization.md
index 906d59c4..a3e2f238 100644
--- a/docs/06-authentication-and-authorization.md
+++ b/docs/06-authentication-and-authorization.md
@@ -288,21 +288,19 @@ public partial class OrderContext : JsonSerializerContext {}
 You can now optimize the calls to the HttpClient in the `OrdersClient` class by passing an `OrderContext.Default` parameter pointing to the type sought as the second parameter.  Updating the methods in the `OrdersClient` class should look like the following:
 
 ```csharp
-	public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
-			await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
+public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
+  await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
 
+public async Task<OrderWithStatus> GetOrder(int orderId) =>
+  await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
 
-	public async Task<OrderWithStatus> GetOrder(int orderId) =>
-			await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
-
-
-	public async Task<int> PlaceOrder(Order order)
-	{
-		var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
-		response.EnsureSuccessStatusCode();
-		var orderId = await response.Content.ReadFromJsonAsync<int>();
-		return orderId;
-	}
+public async Task<int> PlaceOrder(Order order)
+{
+  var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
+  response.EnsureSuccessStatusCode();
+  var orderId = await response.Content.ReadFromJsonAsync<int>();
+  return orderId;
+}
 ```
 
 ### Deploy OrdersClient to pages

From 245ddcc243124b884dbbbcab2560b4c91a2d311d Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Fritz" <csharpfritz@users.noreply.github.com>
Date: Mon, 28 Mar 2022 12:30:18 -0400
Subject: [PATCH 19/20] Fixed whiespace issues

---
 Directory.Build.props                                |  2 +-
 .../BlazingPizza.Client/BlazingPizza.Client.csproj   |  2 +-
 .../BlazingPizza.ComponentsLibrary.csproj            |  2 +-
 .../BlazingPizza.ComponentsLibrary/LocalStorage.cs   | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index a8b3d094..8a52c1ed 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
         <AspNetCoreVersion>6.0.0</AspNetCoreVersion>
         <BlazorVersion>6.0.0</BlazorVersion>
         <EntityFrameworkVersion>6.0.0</EntityFrameworkVersion>
-				<TargetFrameworkVersion>net6.0</TargetFrameworkVersion>
+        <TargetFrameworkVersion>net6.0</TargetFrameworkVersion>
         <SystemNetHttpJsonVersion>6.0.0</SystemNetHttpJsonVersion>
     </PropertyGroup>
 </Project>
diff --git a/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj
index 86250f68..08e409ff 100644
--- a/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
-		<ImplicitUsings>true</ImplicitUsings>
+    <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
index cb996b1b..b50155b9 100644
--- a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
-		<ImplicitUsings>true</ImplicitUsings>
+    <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index 1b91cef9..9f391bea 100644
--- a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -4,12 +4,12 @@ namespace BlazingPizza.ComponentsLibrary;
 
 public static class LocalStorage
 {
-	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+  public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+      => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+  public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+    => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+  public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+    => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
 }

From 6a9598be37cd69f904bbf4f9a8d2c85b6b0c0ee9 Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Fritz" <csharpfritz@users.noreply.github.com>
Date: Mon, 28 Mar 2022 13:41:02 -0400
Subject: [PATCH 20/20] Formatted all code with .NET format and new
 editorconfig

---
 .editorconfig                                 | 189 +++++++++
 .../LocalStorage.cs                           |  12 +-
 .../Map/Marker.cs                             |   8 +-
 .../Map/Point.cs                              |   4 +-
 .../OidcConfigurationController.cs            |  22 +-
 .../BlazingPizza.Server/OrdersController.cs   | 194 ++++-----
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  71 ++--
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  42 +-
 .../BlazingPizza.Server/Program.cs            |  28 +-
 .../BlazingPizza.Server/SeedData.cs           | 370 +++++++++---------
 .../BlazingPizza.Shared/Address.cs            |  26 +-
 .../BlazingPizza.Shared/LatLong.cs            |  34 +-
 .../NotificationSubscription.cs               |  10 +-
 .../BlazingPizza.Shared/Order.cs              |  18 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 118 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  44 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  12 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |   8 +-
 .../BlazingPizza.Shared/Topping.cs            |  10 +-
 .../BlazingPizza.Shared/UserInfo.cs           |   6 +-
 .../LocalStorage.cs                           |  12 +-
 .../Map/Marker.cs                             |   8 +-
 .../Map/Point.cs                              |   4 +-
 .../OidcConfigurationController.cs            |  22 +-
 .../BlazingPizza.Server/OrdersController.cs   | 194 ++++-----
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  71 ++--
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  40 +-
 .../BlazingPizza.Server/Program.cs            |  30 +-
 .../BlazingPizza.Server/SeedData.cs           | 370 +++++++++---------
 .../BlazingPizza.Shared/Address.cs            |  26 +-
 .../BlazingPizza.Shared/LatLong.cs            |  34 +-
 .../NotificationSubscription.cs               |  10 +-
 .../BlazingPizza.Shared/Order.cs              |  18 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 118 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  44 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  12 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |   8 +-
 .../BlazingPizza.Shared/Topping.cs            |  10 +-
 .../BlazingPizza.Shared/UserInfo.cs           |   6 +-
 .../LocalStorage.cs                           |  14 +-
 .../OidcConfigurationController.cs            |  22 +-
 .../BlazingPizza.Server/OrdersController.cs   | 194 ++++-----
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  71 ++--
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  42 +-
 .../BlazingPizza.Server/Program.cs            |  30 +-
 .../BlazingPizza.Server/SeedData.cs           | 370 +++++++++---------
 .../BlazingPizza.Server/Startup.cs            |   5 +-
 .../BlazingPizza.Shared/Address.cs            |  26 +-
 .../BlazingPizza.Shared/LatLong.cs            |  34 +-
 .../NotificationSubscription.cs               |  10 +-
 .../BlazingPizza.Shared/Order.cs              |  18 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 118 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  44 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  12 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |   8 +-
 .../BlazingPizza.Shared/Topping.cs            |  10 +-
 .../BlazingPizza.Shared/UserInfo.cs           |   6 +-
 .../LocalStorage.cs                           |  12 +-
 .../Map/Marker.cs                             |   8 +-
 .../Map/Point.cs                              |   4 +-
 .../OidcConfigurationController.cs            |  22 +-
 .../BlazingPizza.Server/OrdersController.cs   | 194 ++++-----
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  71 ++--
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  42 +-
 .../BlazingPizza.Server/Program.cs            |  30 +-
 .../BlazingPizza.Server/SeedData.cs           | 370 +++++++++---------
 .../BlazingPizza.Shared/Address.cs            |  26 +-
 .../BlazingPizza.Shared/LatLong.cs            |  34 +-
 .../NotificationSubscription.cs               |  10 +-
 .../BlazingPizza.Shared/Order.cs              |  18 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 118 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  44 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  12 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |   8 +-
 .../BlazingPizza.Shared/Topping.cs            |  10 +-
 .../BlazingPizza.Shared/UserInfo.cs           |   6 +-
 .../BlazingPizza.Client/OrderState.cs         |  84 ++--
 .../BlazingPizza.Client/Program.cs            |   2 +-
 .../LocalStorage.cs                           |  12 +-
 .../Map/Marker.cs                             |   8 +-
 .../Map/Point.cs                              |   4 +-
 .../OidcConfigurationController.cs            |  22 +-
 .../BlazingPizza.Server/OrdersController.cs   | 230 +++++------
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  71 ++--
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  42 +-
 .../BlazingPizza.Server/Program.cs            |  30 +-
 .../BlazingPizza.Server/SeedData.cs           | 370 +++++++++---------
 .../BlazingPizza.Shared/Address.cs            |  26 +-
 .../BlazingPizza.Shared/LatLong.cs            |  34 +-
 .../NotificationSubscription.cs               |  10 +-
 .../BlazingPizza.Shared/Order.cs              |  18 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 118 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  44 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  12 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |   8 +-
 .../BlazingPizza.Shared/Topping.cs            |  10 +-
 .../BlazingPizza.Shared/UserInfo.cs           |   6 +-
 .../BlazingPizza.Client.csproj                |   1 -
 .../BlazingPizza.Client/OrderState.cs         |  94 ++---
 .../BlazingPizza.Client/Program.cs            |   4 +-
 .../LocalStorage.cs                           |  12 +-
 .../Map/Marker.cs                             |   8 +-
 .../Map/Point.cs                              |   4 +-
 .../Models/AddressEntityType.cs               |  92 +++++
 .../Models/DeviceFlowCodesEntityType.cs       | 114 ++++++
 .../IdentityRoleClaimstringEntityType.cs      |  85 ++++
 .../Models/IdentityRoleEntityType.cs          |  78 ++++
 .../IdentityUserClaimstringEntityType.cs      |  85 ++++
 .../IdentityUserLoginstringEntityType.cs      |  86 ++++
 .../IdentityUserRolestringEntityType.cs       |  82 ++++
 .../IdentityUserTokenstringEntityType.cs      |  84 ++++
 .../Models/KeyEntityType.cs                   |  96 +++++
 .../Models/LatLongEntityType.cs               |  80 ++++
 .../NotificationSubscriptionEntityType.cs     |  77 ++++
 .../Models/OrderEntityType.cs                 |  86 ++++
 .../Models/PersistedGrantEntityType.cs        | 127 ++++++
 .../Models/PizzaEntityType.cs                 | 111 ++++++
 .../Models/PizzaSpecialEntityType.cs          |  76 ++++
 .../Models/PizzaStoreContextModel.cs          |  28 ++
 .../Models/PizzaStoreContextModelBuilder.cs   |  69 ++++
 .../Models/PizzaStoreUserEntityType.cs        | 156 ++++++++
 .../Models/PizzaToppingEntityType.cs          |  96 +++++
 .../Models/ToppingEntityType.cs               |  62 +++
 .../OidcConfigurationController.cs            |  22 +-
 .../BlazingPizza.Server/OrdersController.cs   | 230 +++++------
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  71 ++--
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  42 +-
 .../BlazingPizza.Server/Program.cs            |  30 +-
 .../BlazingPizza.Server/SeedData.cs           | 370 +++++++++---------
 .../BlazingPizza.Shared/Address.cs            |  26 +-
 .../BlazingPizza.Shared/LatLong.cs            |  34 +-
 .../NotificationSubscription.cs               |  10 +-
 .../BlazingPizza.Shared/Order.cs              |  18 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 118 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  44 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  12 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |   8 +-
 .../BlazingPizza.Shared/Topping.cs            |  10 +-
 .../BlazingPizza.Shared/UserInfo.cs           |   6 +-
 .../BlazingPizza.Client.csproj                |   1 -
 .../BlazingPizza.Client/OrderState.cs         |  94 ++---
 .../BlazingPizza.Client/OrdersClient.cs       |  32 +-
 .../PizzaAuthenticationState.cs               |   2 +-
 .../BlazingPizza.Client/Program.cs            |  13 +-
 .../LocalStorage.cs                           |  12 +-
 .../Map/Marker.cs                             |   8 +-
 .../Map/Point.cs                              |   4 +-
 .../BlazingPizza.Server.csproj                |   1 +
 .../OidcConfigurationController.cs            |   8 +-
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  57 +++
 .../BlazingPizza.Server/PizzaStoreContext.cs  |   2 +-
 .../BlazingPizza.Server/PizzasController.cs   |  16 -
 .../BlazingPizza.Server/Program.cs            |  90 +++--
 .../BlazingPizza.Server/SeedData.cs           | 370 +++++++++---------
 .../BlazingPizza.Shared/Address.cs            |  26 +-
 .../BlazingPizza.Shared/LatLong.cs            |  34 +-
 .../NotificationSubscription.cs               |  10 +-
 .../BlazingPizza.Shared/Order.cs              |  18 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 118 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  44 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  12 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |   8 +-
 .../BlazingPizza.Shared/Topping.cs            |  10 +-
 .../BlazingPizza.Shared/UserInfo.cs           |   6 +-
 .../BlazingPizza.Client.csproj                |   1 -
 .../JSRuntimeExtensions.cs                    |   8 +-
 .../BlazingPizza.Client/OrderState.cs         |  94 ++---
 .../BlazingPizza.Client/OrdersClient.cs       |  42 +-
 .../PizzaAuthenticationState.cs               |   2 +-
 .../BlazingPizza.Client/Program.cs            |  13 +-
 .../LocalStorage.cs                           |  12 +-
 .../Map/Marker.cs                             |   8 +-
 .../Map/Point.cs                              |   4 +-
 .../OidcConfigurationController.cs            |  22 +-
 .../BlazingPizza.Server/OrdersController.cs   | 230 +++++------
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  71 ++--
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  42 +-
 .../BlazingPizza.Server/Program.cs            |  30 +-
 .../BlazingPizza.Server/SeedData.cs           | 370 +++++++++---------
 .../BlazingPizza.Shared/Address.cs            |  26 +-
 .../BlazingPizza.Shared/LatLong.cs            |  34 +-
 .../NotificationSubscription.cs               |  10 +-
 .../BlazingPizza.Shared/Order.cs              |  18 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 118 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  44 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  12 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |   8 +-
 .../BlazingPizza.Shared/Topping.cs            |  10 +-
 .../BlazingPizza.Shared/UserInfo.cs           |   6 +-
 .../JSRuntimeExtensions.cs                    |   8 +-
 .../BlazingPizza.Client/OrderState.cs         |  94 ++---
 .../BlazingPizza.Client/OrdersClient.cs       |  42 +-
 .../PizzaAuthenticationState.cs               |   2 +-
 .../BlazingPizza.Client/Program.cs            |  13 +-
 .../LocalStorage.cs                           |  12 +-
 .../Map/Marker.cs                             |   8 +-
 .../Map/Point.cs                              |   4 +-
 .../OidcConfigurationController.cs            |  22 +-
 .../BlazingPizza.Server/OrdersController.cs   | 230 +++++------
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  71 ++--
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  42 +-
 .../BlazingPizza.Server/Program.cs            |  30 +-
 .../BlazingPizza.Server/SeedData.cs           | 370 +++++++++---------
 .../BlazingPizza.Shared/Address.cs            |  26 +-
 .../BlazingPizza.Shared/LatLong.cs            |  34 +-
 .../NotificationSubscription.cs               |  10 +-
 .../BlazingPizza.Shared/Order.cs              |  18 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 118 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  44 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  12 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |   8 +-
 .../BlazingPizza.Shared/Topping.cs            |  10 +-
 .../BlazingPizza.Shared/UserInfo.cs           |   6 +-
 .../JSRuntimeExtensions.cs                    |   8 +-
 .../BlazingPizza.Client/OrderState.cs         |  94 ++---
 .../BlazingPizza.Client/OrdersClient.cs       |  42 +-
 .../PizzaAuthenticationState.cs               |   2 +-
 .../BlazingPizza.Client/Program.cs            |  13 +-
 .../LocalStorage.cs                           |  12 +-
 .../OidcConfigurationController.cs            |  22 +-
 .../BlazingPizza.Server/OrdersController.cs   | 230 +++++------
 .../BlazingPizza.Server/PizzaApiExtensions.cs |  71 ++--
 .../BlazingPizza.Server/PizzaStoreContext.cs  |  40 +-
 .../BlazingPizza.Server/Program.cs            |  30 +-
 .../BlazingPizza.Server/SeedData.cs           | 370 +++++++++---------
 .../BlazingPizza.Shared/Address.cs            |  26 +-
 .../BlazingPizza.Shared/LatLong.cs            |  34 +-
 .../NotificationSubscription.cs               |  10 +-
 .../BlazingPizza.Shared/Order.cs              |  18 +-
 .../BlazingPizza.Shared/OrderWithStatus.cs    | 118 +++---
 .../BlazingPizza.Shared/Pizza.cs              |  44 +--
 .../BlazingPizza.Shared/PizzaSpecial.cs       |  12 +-
 .../BlazingPizza.Shared/PizzaTopping.cs       |   8 +-
 .../BlazingPizza.Shared/Topping.cs            |  10 +-
 .../BlazingPizza.Shared/UserInfo.cs           |   6 +-
 .../JSRuntimeExtensions.cs                    |   8 +-
 src/BlazingPizza.Client/OrderState.cs         |  94 ++---
 src/BlazingPizza.Client/OrdersClient.cs       |  42 +-
 .../PizzaAuthenticationState.cs               |   2 +-
 src/BlazingPizza.Client/Program.cs            |  13 +-
 .../LocalStorage.cs                           |  12 +-
 .../Map/Marker.cs                             |   8 +-
 .../Map/Point.cs                              |   4 +-
 .../OidcConfigurationController.cs            |  22 +-
 src/BlazingPizza.Server/OrdersController.cs   | 230 +++++------
 src/BlazingPizza.Server/PizzaApiExtensions.cs |  71 ++--
 src/BlazingPizza.Server/PizzaStoreContext.cs  |  40 +-
 src/BlazingPizza.Server/Program.cs            |  30 +-
 src/BlazingPizza.Server/SeedData.cs           | 370 +++++++++---------
 src/BlazingPizza.Shared/Address.cs            |  26 +-
 src/BlazingPizza.Shared/LatLong.cs            |  34 +-
 .../NotificationSubscription.cs               |  10 +-
 src/BlazingPizza.Shared/Order.cs              |  18 +-
 src/BlazingPizza.Shared/OrderWithStatus.cs    | 118 +++---
 src/BlazingPizza.Shared/Pizza.cs              |  44 +--
 src/BlazingPizza.Shared/PizzaSpecial.cs       |  12 +-
 src/BlazingPizza.Shared/PizzaTopping.cs       |   8 +-
 src/BlazingPizza.Shared/Topping.cs            |  10 +-
 src/BlazingPizza.Shared/UserInfo.cs           |   6 +-
 src/BlazingPizza.sln                          |  11 +-
 260 files changed, 8185 insertions(+), 6184 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/AddressEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/KeyEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/LatLongEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/OrderEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
 create mode 100644 save-points/05-checkout-with-validation/BlazingPizza.Server/Models/ToppingEntityType.cs
 create mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzaApiExtensions.cs
 delete mode 100644 save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzasController.cs

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..3413bda9
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,189 @@
+# Rules in this file were initially inferred by Visual Studio IntelliCode from the C:\dev\dnp\blazor-workshop\src codebase based on best match to current usage at 3/28/2022
+# You can modify the rules from these initially generated values to suit your own policies
+# You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
+[*.cs]
+
+
+#Formatting - new line options
+
+#place catch statements on a new line
+csharp_new_line_before_catch = true
+#place else statements on a new line
+csharp_new_line_before_else = true
+#require members of anonymous types to be on separate lines
+csharp_new_line_before_members_in_anonymous_types = true
+#require members of object intializers to be on separate lines
+csharp_new_line_before_members_in_object_initializers = true
+#require braces to be on a new line for methods, control_blocks, types, object_collection_array_initializers, and anonymous_types (also known as "Allman" style)
+csharp_new_line_before_open_brace = methods, control_blocks, types, object_collection_array_initializers, anonymous_types
+
+#Formatting - organize using options
+
+#sort System.* using directives alphabetically, and place them before other usings
+dotnet_sort_system_directives_first = true
+
+#Formatting - spacing options
+
+#require NO space between a cast and the value
+csharp_space_after_cast = false
+#require a space before the colon for bases or interfaces in a type declaration
+csharp_space_after_colon_in_inheritance_clause = true
+#require a space after a keyword in a control flow statement such as a for loop
+csharp_space_after_keywords_in_control_flow_statements = true
+#require a space before the colon for bases or interfaces in a type declaration
+csharp_space_before_colon_in_inheritance_clause = true
+#remove space within empty argument list parentheses
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+#remove space between method call name and opening parenthesis
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+#do not place space characters after the opening parenthesis and before the closing parenthesis of a method call
+csharp_space_between_method_call_parameter_list_parentheses = false
+#remove space within empty parameter list parentheses for a method declaration
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+#place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+#Formatting - wrapping options
+
+#leave code block on single line
+csharp_preserve_single_line_blocks = true
+
+#Style - Code block preferences
+
+#prefer curly braces even for one line of code
+csharp_prefer_braces = true:suggestion
+
+#Style - expression bodied member options
+
+#prefer block bodies for constructors
+csharp_style_expression_bodied_constructors = false:suggestion
+#prefer block bodies for methods
+csharp_style_expression_bodied_methods = false:suggestion
+#prefer expression-bodied members for properties
+csharp_style_expression_bodied_properties = true:suggestion
+
+#Style - expression level options
+
+#prefer ItemX properties to tuple names
+dotnet_style_explicit_tuple_names = false:suggestion
+#prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+#Style - Expression-level  preferences
+
+#prefer objects to be initialized using object initializers when possible
+dotnet_style_object_initializer = true:suggestion
+#prefer inferred anonymous type member names
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+#prefer inferred tuple element names
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+
+#Style - implicit and explicit types
+
+#prefer var over explicit type in all cases, unless overridden by another code style rule
+csharp_style_var_elsewhere = true:suggestion
+#prefer var is used to declare variables with built-in system types such as int
+csharp_style_var_for_built_in_types = true:suggestion
+#prefer var when the type is already mentioned on the right-hand side of a declaration expression
+csharp_style_var_when_type_is_apparent = true:suggestion
+
+#Style - language keyword and framework type options
+
+#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+
+#Style - modifier options
+
+#prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods.
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
+
+#Style - Modifier preferences
+
+#when this rule is set to a list of modifiers, prefer the specified ordering.
+csharp_preferred_modifier_order = public,private,protected,static,async,readonly,override:suggestion
+
+#Style - qualification options
+
+#prefer fields not to be prefaced with this. or Me. in Visual Basic
+dotnet_style_qualification_for_field = false:suggestion
+#prefer methods not to be prefaced with this. or Me. in Visual Basic
+dotnet_style_qualification_for_method = false:suggestion
+#prefer properties not to be prefaced with this. or Me. in Visual Basic
+dotnet_style_qualification_for_property = false:suggestion
+csharp_using_directive_placement = outside_namespace:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_indent_labels = one_less_than_current
+
+[*.{cs,vb}]
+#### Naming styles ####
+
+# Naming rules
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# Symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# Naming styles
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_explicit_tuple_names = false:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+indent_style = space
+tab_width = 4
+indent_size = 4
+end_of_line = crlf
+dotnet_style_prefer_simplified_interpolation = true:suggestion
diff --git a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index 9f391bea..25567243 100644
--- a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -4,12 +4,12 @@ namespace BlazingPizza.ComponentsLibrary;
 
 public static class LocalStorage
 {
-  public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-      => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+    public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+        => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-  public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-    => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+    public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+      => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-  public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-    => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+    public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+      => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
 }
diff --git a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index 7be5cafb..cae70a4e 100644
--- a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -2,11 +2,11 @@
 
 public class Marker
 {
-		public string Description { get; set; }
+    public string Description { get; set; }
 
-		public double X { get; set; }
+    public double X { get; set; }
 
-		public double Y { get; set; }
+    public double Y { get; set; }
 
-		public bool ShowPopup { get; set; }
+    public bool ShowPopup { get; set; }
 }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Point.cs
index a1040c38..34194163 100644
--- a/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/00-get-started/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -2,7 +2,7 @@
 
 public class Point
 {
-		public double X { get; set; }
+    public double X { get; set; }
 
-		public double Y { get; set; }
+    public double Y { get; set; }
 }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/00-get-started/BlazingPizza.Server/OidcConfigurationController.cs
index b7654075..3d385048 100644
--- a/save-points/00-get-started/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/00-get-started/BlazingPizza.Server/OidcConfigurationController.cs
@@ -5,17 +5,17 @@ namespace BlazingPizza.Server;
 
 public class OidcConfigurationController : Controller
 {
-	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-	{
-		ClientRequestParametersProvider = clientRequestParametersProvider;
-	}
+    public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+    {
+        ClientRequestParametersProvider = clientRequestParametersProvider;
+    }
 
-	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+    public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-	[HttpGet("_configuration/{clientId}")]
-	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
-	{
-		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-		return Ok(parameters);
-	}
+    [HttpGet("_configuration/{clientId}")]
+    public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+    {
+        var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+        return Ok(parameters);
+    }
 }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Server/OrdersController.cs b/save-points/00-get-started/BlazingPizza.Server/OrdersController.cs
index 54ff6114..37e37cc5 100644
--- a/save-points/00-get-started/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/00-get-started/BlazingPizza.Server/OrdersController.cs
@@ -9,101 +9,101 @@ namespace BlazingPizza.Server;
 // [Authorize]
 public class OrdersController : Controller
 {
-	private readonly PizzaStoreContext _db;
-
-	public OrdersController(PizzaStoreContext db)
-	{
-		_db = db;
-	}
-
-	[HttpGet]
-	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-	{
-		var orders = await _db.Orders
-				// .Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.OrderByDescending(o => o.CreatedTime)
-				.ToListAsync();
-
-		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-	}
-
-	[HttpGet("{orderId}")]
-	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-	{
-		var order = await _db.Orders
-				.Where(o => o.OrderId == orderId)
-				// .Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.SingleOrDefaultAsync();
-
-		if (order == null)
-		{
-			return NotFound();
-		}
-
-		return OrderWithStatus.FromOrder(order);
-	}
-
-	[HttpPost]
-	public async Task<ActionResult<int>> PlaceOrder(Order order)
-	{
-		order.CreatedTime = DateTime.Now;
-		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-		// order.UserId = GetUserId();
-
-		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
-		// in the database - prevent the submitter from making up
-		// new specials and toppings
-		foreach (var pizza in order.Pizzas)
-		{
-			pizza.SpecialId = pizza.Special.Id;
-			pizza.Special = null;
-
-			foreach (var topping in pizza.Toppings)
-			{
-				topping.ToppingId = topping.Topping.Id;
-				topping.Topping = null;
-			}
-		}
-
-		_db.Orders.Attach(order);
-		await _db.SaveChangesAsync();
-
-		// In the background, send push notifications if possible
-		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-		if (subscription != null)
-		{
-			_ = TrackAndSendNotificationsAsync(order, subscription);
-		}
-
-		return order.OrderId;
-	}
-
-	private string GetUserId()
-	{
-		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
-
-	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-	{
-		// In a realistic case, some other backend process would track
-		// order delivery progress and send us notifications when it
-		// changes. Since we don't have any such process here, fake it.
-		await Task.Delay(OrderWithStatus.PreparationDuration);
-		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-		await Task.Delay(OrderWithStatus.DeliveryDuration);
-		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-	}
-
-	private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-	{
-		// This will be implemented later
-		return Task.CompletedTask;
-	}
+    private readonly PizzaStoreContext _db;
+
+    public OrdersController(PizzaStoreContext db)
+    {
+        _db = db;
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+    {
+        var orders = await _db.Orders
+                // .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .OrderByDescending(o => o.CreatedTime)
+                .ToListAsync();
+
+        return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+    }
+
+    [HttpGet("{orderId}")]
+    public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+    {
+        var order = await _db.Orders
+                .Where(o => o.OrderId == orderId)
+                // .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .SingleOrDefaultAsync();
+
+        if (order == null)
+        {
+            return NotFound();
+        }
+
+        return OrderWithStatus.FromOrder(order);
+    }
+
+    [HttpPost]
+    public async Task<ActionResult<int>> PlaceOrder(Order order)
+    {
+        order.CreatedTime = DateTime.Now;
+        order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+        // order.UserId = GetUserId();
+
+        // Enforce existence of Pizza.SpecialId and Topping.ToppingId
+        // in the database - prevent the submitter from making up
+        // new specials and toppings
+        foreach (var pizza in order.Pizzas)
+        {
+            pizza.SpecialId = pizza.Special.Id;
+            pizza.Special = null;
+
+            foreach (var topping in pizza.Toppings)
+            {
+                topping.ToppingId = topping.Topping.Id;
+                topping.Topping = null;
+            }
+        }
+
+        _db.Orders.Attach(order);
+        await _db.SaveChangesAsync();
+
+        // In the background, send push notifications if possible
+        var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+        if (subscription != null)
+        {
+            _ = TrackAndSendNotificationsAsync(order, subscription);
+        }
+
+        return order.OrderId;
+    }
+
+    private string GetUserId()
+    {
+        return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
+
+    private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+    {
+        // In a realistic case, some other backend process would track
+        // order delivery progress and send us notifications when it
+        // changes. Since we don't have any such process here, fake it.
+        await Task.Delay(OrderWithStatus.PreparationDuration);
+        await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+        await Task.Delay(OrderWithStatus.DeliveryDuration);
+        await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+    }
+
+    private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+    {
+        // This will be implemented later
+        return Task.CompletedTask;
+    }
 }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/00-get-started/BlazingPizza.Server/PizzaApiExtensions.cs
index bf6b7bde..524ca759 100644
--- a/save-points/00-get-started/BlazingPizza.Server/PizzaApiExtensions.cs
+++ b/save-points/00-get-started/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -7,54 +7,51 @@ namespace BlazingPizza.Server;
 public static class PizzaApiExtensions
 {
 
-	public static WebApplication MapPizzaApi(this WebApplication app)
-	{
+    public static WebApplication MapPizzaApi(this WebApplication app)
+    {
 
-		// Subscribe to notifications
-		app.MapPut("/notifications/subscribe", [Authorize] async (
-			HttpContext context,
-			PizzaStoreContext db,
-			NotificationSubscription subscription) =>
-		{
+        // Subscribe to notifications
+        app.MapPut("/notifications/subscribe", [Authorize] async (
+            HttpContext context,
+            PizzaStoreContext db,
+            NotificationSubscription subscription) => {
 
-			// We're storing at most one subscription per user, so delete old ones.
-			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-			var userId = GetUserId(context);
-			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
-			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+                // We're storing at most one subscription per user, so delete old ones.
+                // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+                var userId = GetUserId(context);
+                var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+                db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
 
-			// Store new subscription
-			subscription.UserId = userId;
-			db.NotificationSubscriptions.Attach(subscription);
+                // Store new subscription
+                subscription.UserId = userId;
+                db.NotificationSubscriptions.Attach(subscription);
 
-			await db.SaveChangesAsync();
-			return Results.Ok(subscription);
+                await db.SaveChangesAsync();
+                return Results.Ok(subscription);
 
-		});
+            });
 
-		// Specials
-		app.MapGet("/specials", async (PizzaStoreContext db) =>
-		{
+        // Specials
+        app.MapGet("/specials", async (PizzaStoreContext db) => {
 
-			var specials = await db.Specials.ToListAsync();
-			return Results.Ok(specials);
+            var specials = await db.Specials.ToListAsync();
+            return Results.Ok(specials);
 
-		});
+        });
 
-		// Toppings
-		app.MapGet("/toppings", async (PizzaStoreContext db) =>
-		{
-			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
-			return Results.Ok(toppings);
-		});
+        // Toppings
+        app.MapGet("/toppings", async (PizzaStoreContext db) => {
+            var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+            return Results.Ok(toppings);
+        });
 
-		return app;
+        return app;
 
-	}
+    }
 
-	private static string GetUserId(HttpContext context)
-	{
-		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
+    private static string GetUserId(HttpContext context)
+    {
+        return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
 
 }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/00-get-started/BlazingPizza.Server/PizzaStoreContext.cs
index 921b2824..1505c7af 100644
--- a/save-points/00-get-started/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/00-get-started/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using Duende.IdentityServer.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
@@ -7,32 +7,32 @@ namespace BlazingPizza.Server;
 
 public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-	public PizzaStoreContext(
-			DbContextOptions options,
-			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-	{
-	}
+    public PizzaStoreContext(
+            DbContextOptions options,
+            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+    {
+    }
 
-	public DbSet<Order> Orders { get; set; }
+    public DbSet<Order> Orders { get; set; }
 
-	public DbSet<Pizza> Pizzas { get; set; }
+    public DbSet<Pizza> Pizzas { get; set; }
 
-	public DbSet<PizzaSpecial> Specials { get; set; }
+    public DbSet<PizzaSpecial> Specials { get; set; }
 
-	public DbSet<Topping> Toppings { get; set; }
+    public DbSet<Topping> Toppings { get; set; }
 
-	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+    public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
-	{
-		base.OnModelCreating(modelBuilder);
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
 
-		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
-		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+        // Configuring a many-to-many special -> topping relationship that is friendly for serialization
+        modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+        modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+        modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-		// Inline the Lat-Long pairs in Order rather than having a FK to another table
-		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-	}
+        // Inline the Lat-Long pairs in Order rather than having a FK to another table
+        modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+    }
 }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Server/Program.cs b/save-points/00-get-started/BlazingPizza.Server/Program.cs
index 3fe5d78f..e185db50 100644
--- a/save-points/00-get-started/BlazingPizza.Server/Program.cs
+++ b/save-points/00-get-started/BlazingPizza.Server/Program.cs
@@ -1,26 +1,26 @@
-using Microsoft.AspNetCore.Authentication;
+using BlazingPizza.Server;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.EntityFrameworkCore;
-using BlazingPizza.Server;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllersWithViews()
-	.AddJsonOptions(options =>  {
-		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
-	});
+    .AddJsonOptions(options => {
+        options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+    });
 builder.Services.AddRazorPages();
 
 builder.Services.AddDbContext<PizzaStoreContext>(options =>
-		options.UseSqlite("Data Source=pizza.db"));
+        options.UseSqlite("Data Source=pizza.db"));
 
 builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-		.AddEntityFrameworkStores<PizzaStoreContext>();
+        .AddEntityFrameworkStores<PizzaStoreContext>();
 
 builder.Services.AddIdentityServer()
-		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+        .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
 
 builder.Services.AddAuthentication()
-		.AddIdentityServerJwt();
+        .AddIdentityServerJwt();
 
 var app = builder.Build();
 
@@ -28,11 +28,11 @@
 var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
 using (var scope = scopeFactory.CreateScope())
 {
-	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-	if (db.Database.EnsureCreated())
-	{
-		SeedData.Initialize(db);
-	}
+    var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+    if (db.Database.EnsureCreated())
+    {
+        SeedData.Initialize(db);
+    }
 }
 
 // Configure the HTTP request pipeline.
diff --git a/save-points/00-get-started/BlazingPizza.Server/SeedData.cs b/save-points/00-get-started/BlazingPizza.Server/SeedData.cs
index a1e47973..f02e2b77 100644
--- a/save-points/00-get-started/BlazingPizza.Server/SeedData.cs
+++ b/save-points/00-get-started/BlazingPizza.Server/SeedData.cs
@@ -2,191 +2,191 @@
 
 public static class SeedData
 {
-	public static void Initialize(PizzaStoreContext db)
-	{
-		var toppings = new Topping[]
-		{
-			new Topping()
-			{
-					Name = "Extra cheese",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "American bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "British bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Canadian bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Tea and crumpets",
-					Price = 5.00m
-			},
-			new Topping()
-			{
-					Name = "Fresh-baked scones",
-					Price = 4.50m,
-			},
-			new Topping()
-			{
-					Name = "Bell peppers",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Onions",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Mushrooms",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Pepperoni",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Duck sausage",
-					Price = 3.20m,
-			},
-			new Topping()
-			{
-					Name = "Venison meatballs",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "Served on a silver platter",
-					Price = 250.99m,
-			},
-			new Topping()
-			{
-					Name = "Lobster on top",
-					Price = 64.50m,
-			},
-			new Topping()
-			{
-					Name = "Sturgeon caviar",
-					Price = 101.75m,
-			},
-			new Topping()
-			{
-					Name = "Artichoke hearts",
-					Price = 3.40m,
-			},
-			new Topping()
-			{
-					Name = "Fresh tomatoes",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Basil",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Steak (medium-rare)",
-					Price = 8.50m,
-			},
-			new Topping()
-			{
-					Name = "Blazing hot peppers",
-					Price = 4.20m,
-			},
-			new Topping()
-			{
-					Name = "Buffalo chicken",
-					Price = 5.00m,
-			},
-			new Topping()
-			{
-					Name = "Blue cheese",
-					Price = 2.50m,
-			},
-		};
+    public static void Initialize(PizzaStoreContext db)
+    {
+        var toppings = new Topping[]
+        {
+            new Topping()
+            {
+                    Name = "Extra cheese",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "American bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "British bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Canadian bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Tea and crumpets",
+                    Price = 5.00m
+            },
+            new Topping()
+            {
+                    Name = "Fresh-baked scones",
+                    Price = 4.50m,
+            },
+            new Topping()
+            {
+                    Name = "Bell peppers",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Onions",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Mushrooms",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Pepperoni",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Duck sausage",
+                    Price = 3.20m,
+            },
+            new Topping()
+            {
+                    Name = "Venison meatballs",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "Served on a silver platter",
+                    Price = 250.99m,
+            },
+            new Topping()
+            {
+                    Name = "Lobster on top",
+                    Price = 64.50m,
+            },
+            new Topping()
+            {
+                    Name = "Sturgeon caviar",
+                    Price = 101.75m,
+            },
+            new Topping()
+            {
+                    Name = "Artichoke hearts",
+                    Price = 3.40m,
+            },
+            new Topping()
+            {
+                    Name = "Fresh tomatoes",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Basil",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Steak (medium-rare)",
+                    Price = 8.50m,
+            },
+            new Topping()
+            {
+                    Name = "Blazing hot peppers",
+                    Price = 4.20m,
+            },
+            new Topping()
+            {
+                    Name = "Buffalo chicken",
+                    Price = 5.00m,
+            },
+            new Topping()
+            {
+                    Name = "Blue cheese",
+                    Price = 2.50m,
+            },
+        };
 
-		var specials = new PizzaSpecial[]
-		{
-			new PizzaSpecial()
-			{
-					Name = "Basic Cheese Pizza",
-					Description = "It's cheesy and delicious. Why wouldn't you want one?",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/cheese.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 2,
-					Name = "The Baconatorizor",
-					Description = "It has EVERY kind of bacon",
-					BasePrice = 11.99m,
-					ImageUrl = "img/pizzas/bacon.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 3,
-					Name = "Classic pepperoni",
-					Description = "It's the pizza you grew up with, but Blazing hot!",
-					BasePrice = 10.50m,
-					ImageUrl = "img/pizzas/pepperoni.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 4,
-					Name = "Buffalo chicken",
-					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-					BasePrice = 12.75m,
-					ImageUrl = "img/pizzas/meaty.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 5,
-					Name = "Mushroom Lovers",
-					Description = "It has mushrooms. Isn't that obvious?",
-					BasePrice = 11.00m,
-					ImageUrl = "img/pizzas/mushroom.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 6,
-					Name = "The Brit",
-					Description = "When in London...",
-					BasePrice = 10.25m,
-					ImageUrl = "img/pizzas/brit.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 7,
-					Name = "Veggie Delight",
-					Description = "It's like salad, but on a pizza",
-					BasePrice = 11.50m,
-					ImageUrl = "img/pizzas/salad.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 8,
-					Name = "Margherita",
-					Description = "Traditional Italian pizza with tomatoes and basil",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/margherita.jpg",
-			},
-		};
+        var specials = new PizzaSpecial[]
+        {
+            new PizzaSpecial()
+            {
+                    Name = "Basic Cheese Pizza",
+                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/cheese.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 2,
+                    Name = "The Baconatorizor",
+                    Description = "It has EVERY kind of bacon",
+                    BasePrice = 11.99m,
+                    ImageUrl = "img/pizzas/bacon.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 3,
+                    Name = "Classic pepperoni",
+                    Description = "It's the pizza you grew up with, but Blazing hot!",
+                    BasePrice = 10.50m,
+                    ImageUrl = "img/pizzas/pepperoni.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 4,
+                    Name = "Buffalo chicken",
+                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+                    BasePrice = 12.75m,
+                    ImageUrl = "img/pizzas/meaty.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 5,
+                    Name = "Mushroom Lovers",
+                    Description = "It has mushrooms. Isn't that obvious?",
+                    BasePrice = 11.00m,
+                    ImageUrl = "img/pizzas/mushroom.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 6,
+                    Name = "The Brit",
+                    Description = "When in London...",
+                    BasePrice = 10.25m,
+                    ImageUrl = "img/pizzas/brit.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 7,
+                    Name = "Veggie Delight",
+                    Description = "It's like salad, but on a pizza",
+                    BasePrice = 11.50m,
+                    ImageUrl = "img/pizzas/salad.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 8,
+                    Name = "Margherita",
+                    Description = "Traditional Italian pizza with tomatoes and basil",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/margherita.jpg",
+            },
+        };
 
-		db.Toppings.AddRange(toppings);
-		db.Specials.AddRange(specials);
-		db.SaveChanges();
-	}
+        db.Toppings.AddRange(toppings);
+        db.Specials.AddRange(specials);
+        db.SaveChanges();
+    }
 }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/Address.cs b/save-points/00-get-started/BlazingPizza.Shared/Address.cs
index 79be9c5b..a671359a 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/Address.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/Address.cs
@@ -2,23 +2,23 @@
 
 public class Address
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Name { get; set; }
+    [Required, MaxLength(100)]
+    public string Name { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Line1 { get; set; }
+    [Required, MaxLength(100)]
+    public string Line1 { get; set; }
 
-	[MaxLength(100)]
-	public string Line2 { get; set; }
+    [MaxLength(100)]
+    public string Line2 { get; set; }
 
-	[Required, MaxLength(50)]
-	public string City { get; set; }
+    [Required, MaxLength(50)]
+    public string City { get; set; }
 
-	[Required, MaxLength(20)]
-	public string Region { get; set; }
+    [Required, MaxLength(20)]
+    public string Region { get; set; }
 
-	[Required, MaxLength(20)]
-	public string PostalCode { get; set; }
+    [Required, MaxLength(20)]
+    public string PostalCode { get; set; }
 }
diff --git a/save-points/00-get-started/BlazingPizza.Shared/LatLong.cs b/save-points/00-get-started/BlazingPizza.Shared/LatLong.cs
index 14a94c26..a65971f8 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/LatLong.cs
@@ -2,25 +2,25 @@
 
 public class LatLong
 {
-	public LatLong()
-	{
-	}
+    public LatLong()
+    {
+    }
 
-	public LatLong(double latitude, double longitude) : this()
-	{
-		Latitude = latitude;
-		Longitude = longitude;
-	}
+    public LatLong(double latitude, double longitude) : this()
+    {
+        Latitude = latitude;
+        Longitude = longitude;
+    }
 
-	public double Latitude { get; set; }
+    public double Latitude { get; set; }
 
-	public double Longitude { get; set; }
+    public double Longitude { get; set; }
 
-	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-	{
-		// The Earth is flat, right? So no need for spherical interpolation.
-		return new LatLong(
-				start.Latitude + (end.Latitude - start.Latitude) * proportion,
-				start.Longitude + (end.Longitude - start.Longitude) * proportion);
-	}
+    public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+    {
+        // The Earth is flat, right? So no need for spherical interpolation.
+        return new LatLong(
+                start.Latitude + (end.Latitude - start.Latitude) * proportion,
+                start.Longitude + (end.Longitude - start.Longitude) * proportion);
+    }
 }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/00-get-started/BlazingPizza.Shared/NotificationSubscription.cs
index 9109ff57..5c99e3f4 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/NotificationSubscription.cs
@@ -2,13 +2,13 @@
 
 public class NotificationSubscription
 {
-	public int NotificationSubscriptionId { get; set; }
+    public int NotificationSubscriptionId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public string Url { get; set; }
+    public string Url { get; set; }
 
-	public string P256dh { get; set; }
+    public string P256dh { get; set; }
 
-	public string Auth { get; set; }
+    public string Auth { get; set; }
 }
diff --git a/save-points/00-get-started/BlazingPizza.Shared/Order.cs b/save-points/00-get-started/BlazingPizza.Shared/Order.cs
index aca04ca1..b47efad0 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/Order.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/Order.cs
@@ -4,21 +4,21 @@ namespace BlazingPizza;
 
 public class Order
 {
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public DateTime CreatedTime { get; set; }
+    public DateTime CreatedTime { get; set; }
 
-	public Address DeliveryAddress { get; set; } = new Address();
+    public Address DeliveryAddress { get; set; } = new Address();
 
-	public LatLong DeliveryLocation { get; set; }
+    public LatLong DeliveryLocation { get; set; }
 
-	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+    public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+    public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
+    public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
@@ -29,4 +29,4 @@ public class Order
 [JsonSerializable(typeof(List<PizzaSpecial>))]
 [JsonSerializable(typeof(List<Topping>))]
 [JsonSerializable(typeof(Topping))]
-public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class OrderContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/00-get-started/BlazingPizza.Shared/OrderWithStatus.cs
index f5f153b6..fbfac7af 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/OrderWithStatus.cs
@@ -6,73 +6,73 @@ namespace BlazingPizza;
 
 public class OrderWithStatus
 {
-	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+    public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+    public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 
-	public string StatusText { get; set; }
+    public string StatusText { get; set; }
 
-	public bool IsDelivered => StatusText == "Delivered";
+    public bool IsDelivered => StatusText == "Delivered";
 
-	public List<Marker> MapMarkers { get; set; }
+    public List<Marker> MapMarkers { get; set; }
 
-	public static OrderWithStatus FromOrder(Order order)
-	{
-		// To simulate a real backend process, we fake status updates based on the amount
-		// of time since the order was placed
-		string statusText;
-		List<Marker> mapMarkers;
-		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+    public static OrderWithStatus FromOrder(Order order)
+    {
+        // To simulate a real backend process, we fake status updates based on the amount
+        // of time since the order was placed
+        string statusText;
+        List<Marker> mapMarkers;
+        var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-		if (DateTime.Now < dispatchTime)
-		{
-			statusText = "Preparing";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-								};
-		}
-		else if (DateTime.Now < dispatchTime + DeliveryDuration)
-		{
-			statusText = "Out for delivery";
+        if (DateTime.Now < dispatchTime)
+        {
+            statusText = "Preparing";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+                                };
+        }
+        else if (DateTime.Now < dispatchTime + DeliveryDuration)
+        {
+            statusText = "Out for delivery";
 
-			var startPosition = ComputeStartPosition(order);
-			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation),
-										ToMapMarker("Driver", driverPosition, showPopup: true),
-								};
-		}
-		else
-		{
-			statusText = "Delivered";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-								};
-		}
+            var startPosition = ComputeStartPosition(order);
+            var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+            var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation),
+                                        ToMapMarker("Driver", driverPosition, showPopup: true),
+                                };
+        }
+        else
+        {
+            statusText = "Delivered";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+                                };
+        }
 
-		return new OrderWithStatus
-		{
-			Order = order,
-			StatusText = statusText,
-			MapMarkers = mapMarkers,
-		};
-	}
+        return new OrderWithStatus
+        {
+            Order = order,
+            StatusText = statusText,
+            MapMarkers = mapMarkers,
+        };
+    }
 
-	private static LatLong ComputeStartPosition(Order order)
-	{
-		// Random but deterministic based on order ID
-		var rng = new Random(order.OrderId);
-		var distance = 0.01 + rng.NextDouble() * 0.02;
-		var angle = rng.NextDouble() * Math.PI * 2;
-		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-	}
+    private static LatLong ComputeStartPosition(Order order)
+    {
+        // Random but deterministic based on order ID
+        var rng = new Random(order.OrderId);
+        var distance = 0.01 + rng.NextDouble() * 0.02;
+        var angle = rng.NextDouble() * Math.PI * 2;
+        var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+        return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+    }
 
-	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+    static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
 }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/Pizza.cs b/save-points/00-get-started/BlazingPizza.Shared/Pizza.cs
index 459298f4..2a7a1c29 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/Pizza.cs
@@ -7,38 +7,38 @@ namespace BlazingPizza;
 /// </summary>
 public class Pizza
 {
-	public const int DefaultSize = 12;
-	public const int MinimumSize = 9;
-	public const int MaximumSize = 17;
+    public const int DefaultSize = 12;
+    public const int MinimumSize = 9;
+    public const int MaximumSize = 17;
 
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public PizzaSpecial Special { get; set; }
+    public PizzaSpecial Special { get; set; }
 
-	public int SpecialId { get; set; }
+    public int SpecialId { get; set; }
 
-	public int Size { get; set; }
+    public int Size { get; set; }
 
-	public List<PizzaTopping> Toppings { get; set; }
+    public List<PizzaTopping> Toppings { get; set; }
 
-	public decimal GetBasePrice()
-	{
-		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-	}
+    public decimal GetBasePrice()
+    {
+        return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+    }
 
-	public decimal GetTotalPrice()
-	{
-		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-	}
+    public decimal GetTotalPrice()
+    {
+        return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+    }
 
-	public string GetFormattedTotalPrice()
-	{
-		return GetTotalPrice().ToString("0.00");
-	}
+    public string GetFormattedTotalPrice()
+    {
+        return GetTotalPrice().ToString("0.00");
+    }
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
 [JsonSerializable(typeof(Pizza))]
-public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class PizzaContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/00-get-started/BlazingPizza.Shared/PizzaSpecial.cs
index 9653300c..1fd9006a 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/PizzaSpecial.cs
@@ -5,15 +5,15 @@
 /// </summary>
 public class PizzaSpecial
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal BasePrice { get; set; }
+    public decimal BasePrice { get; set; }
 
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public string ImageUrl { get; set; }
+    public string ImageUrl { get; set; }
 
-	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+    public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
 }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/PizzaTopping.cs b/save-points/00-get-started/BlazingPizza.Shared/PizzaTopping.cs
index 0a711647..1c062732 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/PizzaTopping.cs
@@ -2,10 +2,10 @@
 
 public class PizzaTopping
 {
-	public Topping Topping { get; set; }
+    public Topping Topping { get; set; }
 
-	public int ToppingId { get; set; }
+    public int ToppingId { get; set; }
+
+    public int PizzaId { get; set; }
 
-	public int PizzaId { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/Topping.cs b/save-points/00-get-started/BlazingPizza.Shared/Topping.cs
index 376c311a..4eb67ae9 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/Topping.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/Topping.cs
@@ -2,12 +2,12 @@
 
 public class Topping
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal Price { get; set; }
+    public decimal Price { get; set; }
+
+    public string GetFormattedPrice() => Price.ToString("0.00");
 
-	public string GetFormattedPrice() => Price.ToString("0.00");
-	
 }
\ No newline at end of file
diff --git a/save-points/00-get-started/BlazingPizza.Shared/UserInfo.cs b/save-points/00-get-started/BlazingPizza.Shared/UserInfo.cs
index 362f8f8e..babb4315 100644
--- a/save-points/00-get-started/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/00-get-started/BlazingPizza.Shared/UserInfo.cs
@@ -2,8 +2,8 @@
 
 public class UserInfo
 {
-	public bool IsAuthenticated { get; set; }
+    public bool IsAuthenticated { get; set; }
+
+    public string Name { get; set; }
 
-	public string Name { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index bb84f13c..be8226ec 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -4,12 +4,12 @@ namespace BlazingPizza.ComponentsLibrary;
 
 public static class LocalStorage
 {
-	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+    public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+    public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+    public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
 }
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index da486e7c..4761dcd6 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -1,11 +1,11 @@
 namespace BlazingPizza.ComponentsLibrary.Map;
 public class Marker
 {
-		public string Description { get; set; }
+    public string Description { get; set; }
 
-		public double X { get; set; }
+    public double X { get; set; }
 
-		public double Y { get; set; }
+    public double Y { get; set; }
 
-		public bool ShowPopup { get; set; }
+    public bool ShowPopup { get; set; }
 }
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 01f420f3..054e56ec 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -2,8 +2,8 @@
 
 public class Point
 {
-		public double X { get; set; }
+    public double X { get; set; }
 
-		public double Y { get; set; }
+    public double Y { get; set; }
 }
 // Compare this snippet from save-points\01-Components-and-layout\BlazingPizza.ComponentsLibrary\Map\Marker.cs:
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/OidcConfigurationController.cs
index b7654075..3d385048 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/OidcConfigurationController.cs
@@ -5,17 +5,17 @@ namespace BlazingPizza.Server;
 
 public class OidcConfigurationController : Controller
 {
-	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-	{
-		ClientRequestParametersProvider = clientRequestParametersProvider;
-	}
+    public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+    {
+        ClientRequestParametersProvider = clientRequestParametersProvider;
+    }
 
-	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+    public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-	[HttpGet("_configuration/{clientId}")]
-	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
-	{
-		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-		return Ok(parameters);
-	}
+    [HttpGet("_configuration/{clientId}")]
+    public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+    {
+        var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+        return Ok(parameters);
+    }
 }
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/OrdersController.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/OrdersController.cs
index 54ff6114..37e37cc5 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/OrdersController.cs
@@ -9,101 +9,101 @@ namespace BlazingPizza.Server;
 // [Authorize]
 public class OrdersController : Controller
 {
-	private readonly PizzaStoreContext _db;
-
-	public OrdersController(PizzaStoreContext db)
-	{
-		_db = db;
-	}
-
-	[HttpGet]
-	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-	{
-		var orders = await _db.Orders
-				// .Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.OrderByDescending(o => o.CreatedTime)
-				.ToListAsync();
-
-		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-	}
-
-	[HttpGet("{orderId}")]
-	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-	{
-		var order = await _db.Orders
-				.Where(o => o.OrderId == orderId)
-				// .Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.SingleOrDefaultAsync();
-
-		if (order == null)
-		{
-			return NotFound();
-		}
-
-		return OrderWithStatus.FromOrder(order);
-	}
-
-	[HttpPost]
-	public async Task<ActionResult<int>> PlaceOrder(Order order)
-	{
-		order.CreatedTime = DateTime.Now;
-		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-		// order.UserId = GetUserId();
-
-		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
-		// in the database - prevent the submitter from making up
-		// new specials and toppings
-		foreach (var pizza in order.Pizzas)
-		{
-			pizza.SpecialId = pizza.Special.Id;
-			pizza.Special = null;
-
-			foreach (var topping in pizza.Toppings)
-			{
-				topping.ToppingId = topping.Topping.Id;
-				topping.Topping = null;
-			}
-		}
-
-		_db.Orders.Attach(order);
-		await _db.SaveChangesAsync();
-
-		// In the background, send push notifications if possible
-		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-		if (subscription != null)
-		{
-			_ = TrackAndSendNotificationsAsync(order, subscription);
-		}
-
-		return order.OrderId;
-	}
-
-	private string GetUserId()
-	{
-		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
-
-	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-	{
-		// In a realistic case, some other backend process would track
-		// order delivery progress and send us notifications when it
-		// changes. Since we don't have any such process here, fake it.
-		await Task.Delay(OrderWithStatus.PreparationDuration);
-		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-		await Task.Delay(OrderWithStatus.DeliveryDuration);
-		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-	}
-
-	private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-	{
-		// This will be implemented later
-		return Task.CompletedTask;
-	}
+    private readonly PizzaStoreContext _db;
+
+    public OrdersController(PizzaStoreContext db)
+    {
+        _db = db;
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+    {
+        var orders = await _db.Orders
+                // .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .OrderByDescending(o => o.CreatedTime)
+                .ToListAsync();
+
+        return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+    }
+
+    [HttpGet("{orderId}")]
+    public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+    {
+        var order = await _db.Orders
+                .Where(o => o.OrderId == orderId)
+                // .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .SingleOrDefaultAsync();
+
+        if (order == null)
+        {
+            return NotFound();
+        }
+
+        return OrderWithStatus.FromOrder(order);
+    }
+
+    [HttpPost]
+    public async Task<ActionResult<int>> PlaceOrder(Order order)
+    {
+        order.CreatedTime = DateTime.Now;
+        order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+        // order.UserId = GetUserId();
+
+        // Enforce existence of Pizza.SpecialId and Topping.ToppingId
+        // in the database - prevent the submitter from making up
+        // new specials and toppings
+        foreach (var pizza in order.Pizzas)
+        {
+            pizza.SpecialId = pizza.Special.Id;
+            pizza.Special = null;
+
+            foreach (var topping in pizza.Toppings)
+            {
+                topping.ToppingId = topping.Topping.Id;
+                topping.Topping = null;
+            }
+        }
+
+        _db.Orders.Attach(order);
+        await _db.SaveChangesAsync();
+
+        // In the background, send push notifications if possible
+        var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+        if (subscription != null)
+        {
+            _ = TrackAndSendNotificationsAsync(order, subscription);
+        }
+
+        return order.OrderId;
+    }
+
+    private string GetUserId()
+    {
+        return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
+
+    private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+    {
+        // In a realistic case, some other backend process would track
+        // order delivery progress and send us notifications when it
+        // changes. Since we don't have any such process here, fake it.
+        await Task.Delay(OrderWithStatus.PreparationDuration);
+        await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+        await Task.Delay(OrderWithStatus.DeliveryDuration);
+        await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+    }
+
+    private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+    {
+        // This will be implemented later
+        return Task.CompletedTask;
+    }
 }
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaApiExtensions.cs
index bf6b7bde..524ca759 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaApiExtensions.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -7,54 +7,51 @@ namespace BlazingPizza.Server;
 public static class PizzaApiExtensions
 {
 
-	public static WebApplication MapPizzaApi(this WebApplication app)
-	{
+    public static WebApplication MapPizzaApi(this WebApplication app)
+    {
 
-		// Subscribe to notifications
-		app.MapPut("/notifications/subscribe", [Authorize] async (
-			HttpContext context,
-			PizzaStoreContext db,
-			NotificationSubscription subscription) =>
-		{
+        // Subscribe to notifications
+        app.MapPut("/notifications/subscribe", [Authorize] async (
+            HttpContext context,
+            PizzaStoreContext db,
+            NotificationSubscription subscription) => {
 
-			// We're storing at most one subscription per user, so delete old ones.
-			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-			var userId = GetUserId(context);
-			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
-			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+                // We're storing at most one subscription per user, so delete old ones.
+                // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+                var userId = GetUserId(context);
+                var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+                db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
 
-			// Store new subscription
-			subscription.UserId = userId;
-			db.NotificationSubscriptions.Attach(subscription);
+                // Store new subscription
+                subscription.UserId = userId;
+                db.NotificationSubscriptions.Attach(subscription);
 
-			await db.SaveChangesAsync();
-			return Results.Ok(subscription);
+                await db.SaveChangesAsync();
+                return Results.Ok(subscription);
 
-		});
+            });
 
-		// Specials
-		app.MapGet("/specials", async (PizzaStoreContext db) =>
-		{
+        // Specials
+        app.MapGet("/specials", async (PizzaStoreContext db) => {
 
-			var specials = await db.Specials.ToListAsync();
-			return Results.Ok(specials);
+            var specials = await db.Specials.ToListAsync();
+            return Results.Ok(specials);
 
-		});
+        });
 
-		// Toppings
-		app.MapGet("/toppings", async (PizzaStoreContext db) =>
-		{
-			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
-			return Results.Ok(toppings);
-		});
+        // Toppings
+        app.MapGet("/toppings", async (PizzaStoreContext db) => {
+            var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+            return Results.Ok(toppings);
+        });
 
-		return app;
+        return app;
 
-	}
+    }
 
-	private static string GetUserId(HttpContext context)
-	{
-		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
+    private static string GetUserId(HttpContext context)
+    {
+        return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
 
 }
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreContext.cs
index 992baa19..50ac87e4 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/PizzaStoreContext.cs
@@ -7,32 +7,32 @@ namespace BlazingPizza.Server;
 
 public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-	public PizzaStoreContext(
-			DbContextOptions options,
-			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-	{
-	}
+    public PizzaStoreContext(
+            DbContextOptions options,
+            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+    {
+    }
 
-	public DbSet<Order> Orders { get; set; }
+    public DbSet<Order> Orders { get; set; }
 
-	public DbSet<Pizza> Pizzas { get; set; }
+    public DbSet<Pizza> Pizzas { get; set; }
 
-	public DbSet<PizzaSpecial> Specials { get; set; }
+    public DbSet<PizzaSpecial> Specials { get; set; }
 
-	public DbSet<Topping> Toppings { get; set; }
+    public DbSet<Topping> Toppings { get; set; }
 
-	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+    public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
-	{
-		base.OnModelCreating(modelBuilder);
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
 
-		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
-		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+        // Configuring a many-to-many special -> topping relationship that is friendly for serialization
+        modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+        modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+        modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-		// Inline the Lat-Long pairs in Order rather than having a FK to another table
-		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-	}
+        // Inline the Lat-Long pairs in Order rather than having a FK to another table
+        modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+    }
 }
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/Program.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/Program.cs
index 4484d8f7..b83debb4 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/Program.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/Program.cs
@@ -1,27 +1,27 @@
-using Microsoft.AspNetCore.Authentication;
+using BlazingPizza.Server;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.EntityFrameworkCore;
-using BlazingPizza.Server;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllersWithViews()
-	.AddJsonOptions(options =>  {
-		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
-	});
+    .AddJsonOptions(options => {
+        options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+    });
 builder.Services.AddRazorPages();
 
 builder.Services.AddDbContext<PizzaStoreContext>(options =>
-		options.UseSqlite("Data Source=pizza.db")
-			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+        options.UseSqlite("Data Source=pizza.db")
+            .UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
 
 builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-		.AddEntityFrameworkStores<PizzaStoreContext>();
+        .AddEntityFrameworkStores<PizzaStoreContext>();
 
 builder.Services.AddIdentityServer()
-		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+        .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
 
 builder.Services.AddAuthentication()
-		.AddIdentityServerJwt();
+        .AddIdentityServerJwt();
 
 var app = builder.Build();
 
@@ -29,11 +29,11 @@
 var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
 using (var scope = scopeFactory.CreateScope())
 {
-	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-	if (db.Database.EnsureCreated())
-	{
-		SeedData.Initialize(db);
-	}
+    var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+    if (db.Database.EnsureCreated())
+    {
+        SeedData.Initialize(db);
+    }
 }
 
 // Configure the HTTP request pipeline.
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/SeedData.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/SeedData.cs
index a1e47973..f02e2b77 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Server/SeedData.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Server/SeedData.cs
@@ -2,191 +2,191 @@
 
 public static class SeedData
 {
-	public static void Initialize(PizzaStoreContext db)
-	{
-		var toppings = new Topping[]
-		{
-			new Topping()
-			{
-					Name = "Extra cheese",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "American bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "British bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Canadian bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Tea and crumpets",
-					Price = 5.00m
-			},
-			new Topping()
-			{
-					Name = "Fresh-baked scones",
-					Price = 4.50m,
-			},
-			new Topping()
-			{
-					Name = "Bell peppers",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Onions",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Mushrooms",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Pepperoni",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Duck sausage",
-					Price = 3.20m,
-			},
-			new Topping()
-			{
-					Name = "Venison meatballs",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "Served on a silver platter",
-					Price = 250.99m,
-			},
-			new Topping()
-			{
-					Name = "Lobster on top",
-					Price = 64.50m,
-			},
-			new Topping()
-			{
-					Name = "Sturgeon caviar",
-					Price = 101.75m,
-			},
-			new Topping()
-			{
-					Name = "Artichoke hearts",
-					Price = 3.40m,
-			},
-			new Topping()
-			{
-					Name = "Fresh tomatoes",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Basil",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Steak (medium-rare)",
-					Price = 8.50m,
-			},
-			new Topping()
-			{
-					Name = "Blazing hot peppers",
-					Price = 4.20m,
-			},
-			new Topping()
-			{
-					Name = "Buffalo chicken",
-					Price = 5.00m,
-			},
-			new Topping()
-			{
-					Name = "Blue cheese",
-					Price = 2.50m,
-			},
-		};
+    public static void Initialize(PizzaStoreContext db)
+    {
+        var toppings = new Topping[]
+        {
+            new Topping()
+            {
+                    Name = "Extra cheese",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "American bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "British bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Canadian bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Tea and crumpets",
+                    Price = 5.00m
+            },
+            new Topping()
+            {
+                    Name = "Fresh-baked scones",
+                    Price = 4.50m,
+            },
+            new Topping()
+            {
+                    Name = "Bell peppers",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Onions",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Mushrooms",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Pepperoni",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Duck sausage",
+                    Price = 3.20m,
+            },
+            new Topping()
+            {
+                    Name = "Venison meatballs",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "Served on a silver platter",
+                    Price = 250.99m,
+            },
+            new Topping()
+            {
+                    Name = "Lobster on top",
+                    Price = 64.50m,
+            },
+            new Topping()
+            {
+                    Name = "Sturgeon caviar",
+                    Price = 101.75m,
+            },
+            new Topping()
+            {
+                    Name = "Artichoke hearts",
+                    Price = 3.40m,
+            },
+            new Topping()
+            {
+                    Name = "Fresh tomatoes",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Basil",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Steak (medium-rare)",
+                    Price = 8.50m,
+            },
+            new Topping()
+            {
+                    Name = "Blazing hot peppers",
+                    Price = 4.20m,
+            },
+            new Topping()
+            {
+                    Name = "Buffalo chicken",
+                    Price = 5.00m,
+            },
+            new Topping()
+            {
+                    Name = "Blue cheese",
+                    Price = 2.50m,
+            },
+        };
 
-		var specials = new PizzaSpecial[]
-		{
-			new PizzaSpecial()
-			{
-					Name = "Basic Cheese Pizza",
-					Description = "It's cheesy and delicious. Why wouldn't you want one?",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/cheese.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 2,
-					Name = "The Baconatorizor",
-					Description = "It has EVERY kind of bacon",
-					BasePrice = 11.99m,
-					ImageUrl = "img/pizzas/bacon.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 3,
-					Name = "Classic pepperoni",
-					Description = "It's the pizza you grew up with, but Blazing hot!",
-					BasePrice = 10.50m,
-					ImageUrl = "img/pizzas/pepperoni.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 4,
-					Name = "Buffalo chicken",
-					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-					BasePrice = 12.75m,
-					ImageUrl = "img/pizzas/meaty.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 5,
-					Name = "Mushroom Lovers",
-					Description = "It has mushrooms. Isn't that obvious?",
-					BasePrice = 11.00m,
-					ImageUrl = "img/pizzas/mushroom.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 6,
-					Name = "The Brit",
-					Description = "When in London...",
-					BasePrice = 10.25m,
-					ImageUrl = "img/pizzas/brit.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 7,
-					Name = "Veggie Delight",
-					Description = "It's like salad, but on a pizza",
-					BasePrice = 11.50m,
-					ImageUrl = "img/pizzas/salad.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 8,
-					Name = "Margherita",
-					Description = "Traditional Italian pizza with tomatoes and basil",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/margherita.jpg",
-			},
-		};
+        var specials = new PizzaSpecial[]
+        {
+            new PizzaSpecial()
+            {
+                    Name = "Basic Cheese Pizza",
+                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/cheese.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 2,
+                    Name = "The Baconatorizor",
+                    Description = "It has EVERY kind of bacon",
+                    BasePrice = 11.99m,
+                    ImageUrl = "img/pizzas/bacon.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 3,
+                    Name = "Classic pepperoni",
+                    Description = "It's the pizza you grew up with, but Blazing hot!",
+                    BasePrice = 10.50m,
+                    ImageUrl = "img/pizzas/pepperoni.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 4,
+                    Name = "Buffalo chicken",
+                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+                    BasePrice = 12.75m,
+                    ImageUrl = "img/pizzas/meaty.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 5,
+                    Name = "Mushroom Lovers",
+                    Description = "It has mushrooms. Isn't that obvious?",
+                    BasePrice = 11.00m,
+                    ImageUrl = "img/pizzas/mushroom.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 6,
+                    Name = "The Brit",
+                    Description = "When in London...",
+                    BasePrice = 10.25m,
+                    ImageUrl = "img/pizzas/brit.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 7,
+                    Name = "Veggie Delight",
+                    Description = "It's like salad, but on a pizza",
+                    BasePrice = 11.50m,
+                    ImageUrl = "img/pizzas/salad.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 8,
+                    Name = "Margherita",
+                    Description = "Traditional Italian pizza with tomatoes and basil",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/margherita.jpg",
+            },
+        };
 
-		db.Toppings.AddRange(toppings);
-		db.Specials.AddRange(specials);
-		db.SaveChanges();
-	}
+        db.Toppings.AddRange(toppings);
+        db.Specials.AddRange(specials);
+        db.SaveChanges();
+    }
 }
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/Address.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/Address.cs
index 79be9c5b..a671359a 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/Address.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/Address.cs
@@ -2,23 +2,23 @@
 
 public class Address
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Name { get; set; }
+    [Required, MaxLength(100)]
+    public string Name { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Line1 { get; set; }
+    [Required, MaxLength(100)]
+    public string Line1 { get; set; }
 
-	[MaxLength(100)]
-	public string Line2 { get; set; }
+    [MaxLength(100)]
+    public string Line2 { get; set; }
 
-	[Required, MaxLength(50)]
-	public string City { get; set; }
+    [Required, MaxLength(50)]
+    public string City { get; set; }
 
-	[Required, MaxLength(20)]
-	public string Region { get; set; }
+    [Required, MaxLength(20)]
+    public string Region { get; set; }
 
-	[Required, MaxLength(20)]
-	public string PostalCode { get; set; }
+    [Required, MaxLength(20)]
+    public string PostalCode { get; set; }
 }
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/LatLong.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/LatLong.cs
index 14a94c26..a65971f8 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/LatLong.cs
@@ -2,25 +2,25 @@
 
 public class LatLong
 {
-	public LatLong()
-	{
-	}
+    public LatLong()
+    {
+    }
 
-	public LatLong(double latitude, double longitude) : this()
-	{
-		Latitude = latitude;
-		Longitude = longitude;
-	}
+    public LatLong(double latitude, double longitude) : this()
+    {
+        Latitude = latitude;
+        Longitude = longitude;
+    }
 
-	public double Latitude { get; set; }
+    public double Latitude { get; set; }
 
-	public double Longitude { get; set; }
+    public double Longitude { get; set; }
 
-	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-	{
-		// The Earth is flat, right? So no need for spherical interpolation.
-		return new LatLong(
-				start.Latitude + (end.Latitude - start.Latitude) * proportion,
-				start.Longitude + (end.Longitude - start.Longitude) * proportion);
-	}
+    public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+    {
+        // The Earth is flat, right? So no need for spherical interpolation.
+        return new LatLong(
+                start.Latitude + (end.Latitude - start.Latitude) * proportion,
+                start.Longitude + (end.Longitude - start.Longitude) * proportion);
+    }
 }
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/NotificationSubscription.cs
index 9109ff57..5c99e3f4 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/NotificationSubscription.cs
@@ -2,13 +2,13 @@
 
 public class NotificationSubscription
 {
-	public int NotificationSubscriptionId { get; set; }
+    public int NotificationSubscriptionId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public string Url { get; set; }
+    public string Url { get; set; }
 
-	public string P256dh { get; set; }
+    public string P256dh { get; set; }
 
-	public string Auth { get; set; }
+    public string Auth { get; set; }
 }
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/Order.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/Order.cs
index aca04ca1..b47efad0 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/Order.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/Order.cs
@@ -4,21 +4,21 @@ namespace BlazingPizza;
 
 public class Order
 {
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public DateTime CreatedTime { get; set; }
+    public DateTime CreatedTime { get; set; }
 
-	public Address DeliveryAddress { get; set; } = new Address();
+    public Address DeliveryAddress { get; set; } = new Address();
 
-	public LatLong DeliveryLocation { get; set; }
+    public LatLong DeliveryLocation { get; set; }
 
-	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+    public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+    public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
+    public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
@@ -29,4 +29,4 @@ public class Order
 [JsonSerializable(typeof(List<PizzaSpecial>))]
 [JsonSerializable(typeof(List<Topping>))]
 [JsonSerializable(typeof(Topping))]
-public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class OrderContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/OrderWithStatus.cs
index f5f153b6..fbfac7af 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/OrderWithStatus.cs
@@ -6,73 +6,73 @@ namespace BlazingPizza;
 
 public class OrderWithStatus
 {
-	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+    public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+    public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 
-	public string StatusText { get; set; }
+    public string StatusText { get; set; }
 
-	public bool IsDelivered => StatusText == "Delivered";
+    public bool IsDelivered => StatusText == "Delivered";
 
-	public List<Marker> MapMarkers { get; set; }
+    public List<Marker> MapMarkers { get; set; }
 
-	public static OrderWithStatus FromOrder(Order order)
-	{
-		// To simulate a real backend process, we fake status updates based on the amount
-		// of time since the order was placed
-		string statusText;
-		List<Marker> mapMarkers;
-		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+    public static OrderWithStatus FromOrder(Order order)
+    {
+        // To simulate a real backend process, we fake status updates based on the amount
+        // of time since the order was placed
+        string statusText;
+        List<Marker> mapMarkers;
+        var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-		if (DateTime.Now < dispatchTime)
-		{
-			statusText = "Preparing";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-								};
-		}
-		else if (DateTime.Now < dispatchTime + DeliveryDuration)
-		{
-			statusText = "Out for delivery";
+        if (DateTime.Now < dispatchTime)
+        {
+            statusText = "Preparing";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+                                };
+        }
+        else if (DateTime.Now < dispatchTime + DeliveryDuration)
+        {
+            statusText = "Out for delivery";
 
-			var startPosition = ComputeStartPosition(order);
-			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation),
-										ToMapMarker("Driver", driverPosition, showPopup: true),
-								};
-		}
-		else
-		{
-			statusText = "Delivered";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-								};
-		}
+            var startPosition = ComputeStartPosition(order);
+            var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+            var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation),
+                                        ToMapMarker("Driver", driverPosition, showPopup: true),
+                                };
+        }
+        else
+        {
+            statusText = "Delivered";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+                                };
+        }
 
-		return new OrderWithStatus
-		{
-			Order = order,
-			StatusText = statusText,
-			MapMarkers = mapMarkers,
-		};
-	}
+        return new OrderWithStatus
+        {
+            Order = order,
+            StatusText = statusText,
+            MapMarkers = mapMarkers,
+        };
+    }
 
-	private static LatLong ComputeStartPosition(Order order)
-	{
-		// Random but deterministic based on order ID
-		var rng = new Random(order.OrderId);
-		var distance = 0.01 + rng.NextDouble() * 0.02;
-		var angle = rng.NextDouble() * Math.PI * 2;
-		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-	}
+    private static LatLong ComputeStartPosition(Order order)
+    {
+        // Random but deterministic based on order ID
+        var rng = new Random(order.OrderId);
+        var distance = 0.01 + rng.NextDouble() * 0.02;
+        var angle = rng.NextDouble() * Math.PI * 2;
+        var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+        return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+    }
 
-	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+    static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
 }
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/Pizza.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/Pizza.cs
index 459298f4..2a7a1c29 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/Pizza.cs
@@ -7,38 +7,38 @@ namespace BlazingPizza;
 /// </summary>
 public class Pizza
 {
-	public const int DefaultSize = 12;
-	public const int MinimumSize = 9;
-	public const int MaximumSize = 17;
+    public const int DefaultSize = 12;
+    public const int MinimumSize = 9;
+    public const int MaximumSize = 17;
 
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public PizzaSpecial Special { get; set; }
+    public PizzaSpecial Special { get; set; }
 
-	public int SpecialId { get; set; }
+    public int SpecialId { get; set; }
 
-	public int Size { get; set; }
+    public int Size { get; set; }
 
-	public List<PizzaTopping> Toppings { get; set; }
+    public List<PizzaTopping> Toppings { get; set; }
 
-	public decimal GetBasePrice()
-	{
-		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-	}
+    public decimal GetBasePrice()
+    {
+        return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+    }
 
-	public decimal GetTotalPrice()
-	{
-		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-	}
+    public decimal GetTotalPrice()
+    {
+        return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+    }
 
-	public string GetFormattedTotalPrice()
-	{
-		return GetTotalPrice().ToString("0.00");
-	}
+    public string GetFormattedTotalPrice()
+    {
+        return GetTotalPrice().ToString("0.00");
+    }
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
 [JsonSerializable(typeof(Pizza))]
-public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class PizzaContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaSpecial.cs
index 9653300c..1fd9006a 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaSpecial.cs
@@ -5,15 +5,15 @@
 /// </summary>
 public class PizzaSpecial
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal BasePrice { get; set; }
+    public decimal BasePrice { get; set; }
 
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public string ImageUrl { get; set; }
+    public string ImageUrl { get; set; }
 
-	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+    public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
 }
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaTopping.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaTopping.cs
index 0a711647..1c062732 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/PizzaTopping.cs
@@ -2,10 +2,10 @@
 
 public class PizzaTopping
 {
-	public Topping Topping { get; set; }
+    public Topping Topping { get; set; }
 
-	public int ToppingId { get; set; }
+    public int ToppingId { get; set; }
+
+    public int PizzaId { get; set; }
 
-	public int PizzaId { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/Topping.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/Topping.cs
index 376c311a..4eb67ae9 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/Topping.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/Topping.cs
@@ -2,12 +2,12 @@
 
 public class Topping
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal Price { get; set; }
+    public decimal Price { get; set; }
+
+    public string GetFormattedPrice() => Price.ToString("0.00");
 
-	public string GetFormattedPrice() => Price.ToString("0.00");
-	
 }
\ No newline at end of file
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Shared/UserInfo.cs b/save-points/01-Components-and-layout/BlazingPizza.Shared/UserInfo.cs
index 362f8f8e..babb4315 100644
--- a/save-points/01-Components-and-layout/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/01-Components-and-layout/BlazingPizza.Shared/UserInfo.cs
@@ -2,8 +2,8 @@
 
 public class UserInfo
 {
-	public bool IsAuthenticated { get; set; }
+    public bool IsAuthenticated { get; set; }
+
+    public string Name { get; set; }
 
-	public string Name { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index 3925ced2..8995307f 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -5,13 +5,13 @@ namespace BlazingPizza.ComponentsLibrary;
 public static class LocalStorage
 {
 
-	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+    public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+    public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+
+    public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
 
-	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
-			
 }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/OidcConfigurationController.cs
index d5822577..3d385048 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/OidcConfigurationController.cs
@@ -5,17 +5,17 @@ namespace BlazingPizza.Server;
 
 public class OidcConfigurationController : Controller
 {
-		public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-		{
-				ClientRequestParametersProvider = clientRequestParametersProvider;
-		}
+    public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+    {
+        ClientRequestParametersProvider = clientRequestParametersProvider;
+    }
 
-		public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+    public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-		[HttpGet("_configuration/{clientId}")]
-		public IActionResult GetClientRequestParameters([FromRoute]string clientId)
-		{
-				var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-				return Ok(parameters);
-		}
+    [HttpGet("_configuration/{clientId}")]
+    public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+    {
+        var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+        return Ok(parameters);
+    }
 }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/OrdersController.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/OrdersController.cs
index 54ff6114..37e37cc5 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/OrdersController.cs
@@ -9,101 +9,101 @@ namespace BlazingPizza.Server;
 // [Authorize]
 public class OrdersController : Controller
 {
-	private readonly PizzaStoreContext _db;
-
-	public OrdersController(PizzaStoreContext db)
-	{
-		_db = db;
-	}
-
-	[HttpGet]
-	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-	{
-		var orders = await _db.Orders
-				// .Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.OrderByDescending(o => o.CreatedTime)
-				.ToListAsync();
-
-		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-	}
-
-	[HttpGet("{orderId}")]
-	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-	{
-		var order = await _db.Orders
-				.Where(o => o.OrderId == orderId)
-				// .Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.SingleOrDefaultAsync();
-
-		if (order == null)
-		{
-			return NotFound();
-		}
-
-		return OrderWithStatus.FromOrder(order);
-	}
-
-	[HttpPost]
-	public async Task<ActionResult<int>> PlaceOrder(Order order)
-	{
-		order.CreatedTime = DateTime.Now;
-		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-		// order.UserId = GetUserId();
-
-		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
-		// in the database - prevent the submitter from making up
-		// new specials and toppings
-		foreach (var pizza in order.Pizzas)
-		{
-			pizza.SpecialId = pizza.Special.Id;
-			pizza.Special = null;
-
-			foreach (var topping in pizza.Toppings)
-			{
-				topping.ToppingId = topping.Topping.Id;
-				topping.Topping = null;
-			}
-		}
-
-		_db.Orders.Attach(order);
-		await _db.SaveChangesAsync();
-
-		// In the background, send push notifications if possible
-		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-		if (subscription != null)
-		{
-			_ = TrackAndSendNotificationsAsync(order, subscription);
-		}
-
-		return order.OrderId;
-	}
-
-	private string GetUserId()
-	{
-		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
-
-	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-	{
-		// In a realistic case, some other backend process would track
-		// order delivery progress and send us notifications when it
-		// changes. Since we don't have any such process here, fake it.
-		await Task.Delay(OrderWithStatus.PreparationDuration);
-		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-		await Task.Delay(OrderWithStatus.DeliveryDuration);
-		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-	}
-
-	private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-	{
-		// This will be implemented later
-		return Task.CompletedTask;
-	}
+    private readonly PizzaStoreContext _db;
+
+    public OrdersController(PizzaStoreContext db)
+    {
+        _db = db;
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+    {
+        var orders = await _db.Orders
+                // .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .OrderByDescending(o => o.CreatedTime)
+                .ToListAsync();
+
+        return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+    }
+
+    [HttpGet("{orderId}")]
+    public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+    {
+        var order = await _db.Orders
+                .Where(o => o.OrderId == orderId)
+                // .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .SingleOrDefaultAsync();
+
+        if (order == null)
+        {
+            return NotFound();
+        }
+
+        return OrderWithStatus.FromOrder(order);
+    }
+
+    [HttpPost]
+    public async Task<ActionResult<int>> PlaceOrder(Order order)
+    {
+        order.CreatedTime = DateTime.Now;
+        order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+        // order.UserId = GetUserId();
+
+        // Enforce existence of Pizza.SpecialId and Topping.ToppingId
+        // in the database - prevent the submitter from making up
+        // new specials and toppings
+        foreach (var pizza in order.Pizzas)
+        {
+            pizza.SpecialId = pizza.Special.Id;
+            pizza.Special = null;
+
+            foreach (var topping in pizza.Toppings)
+            {
+                topping.ToppingId = topping.Topping.Id;
+                topping.Topping = null;
+            }
+        }
+
+        _db.Orders.Attach(order);
+        await _db.SaveChangesAsync();
+
+        // In the background, send push notifications if possible
+        var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+        if (subscription != null)
+        {
+            _ = TrackAndSendNotificationsAsync(order, subscription);
+        }
+
+        return order.OrderId;
+    }
+
+    private string GetUserId()
+    {
+        return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
+
+    private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+    {
+        // In a realistic case, some other backend process would track
+        // order delivery progress and send us notifications when it
+        // changes. Since we don't have any such process here, fake it.
+        await Task.Delay(OrderWithStatus.PreparationDuration);
+        await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+        await Task.Delay(OrderWithStatus.DeliveryDuration);
+        await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+    }
+
+    private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+    {
+        // This will be implemented later
+        return Task.CompletedTask;
+    }
 }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaApiExtensions.cs
index bf6b7bde..524ca759 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaApiExtensions.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -7,54 +7,51 @@ namespace BlazingPizza.Server;
 public static class PizzaApiExtensions
 {
 
-	public static WebApplication MapPizzaApi(this WebApplication app)
-	{
+    public static WebApplication MapPizzaApi(this WebApplication app)
+    {
 
-		// Subscribe to notifications
-		app.MapPut("/notifications/subscribe", [Authorize] async (
-			HttpContext context,
-			PizzaStoreContext db,
-			NotificationSubscription subscription) =>
-		{
+        // Subscribe to notifications
+        app.MapPut("/notifications/subscribe", [Authorize] async (
+            HttpContext context,
+            PizzaStoreContext db,
+            NotificationSubscription subscription) => {
 
-			// We're storing at most one subscription per user, so delete old ones.
-			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-			var userId = GetUserId(context);
-			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
-			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+                // We're storing at most one subscription per user, so delete old ones.
+                // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+                var userId = GetUserId(context);
+                var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+                db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
 
-			// Store new subscription
-			subscription.UserId = userId;
-			db.NotificationSubscriptions.Attach(subscription);
+                // Store new subscription
+                subscription.UserId = userId;
+                db.NotificationSubscriptions.Attach(subscription);
 
-			await db.SaveChangesAsync();
-			return Results.Ok(subscription);
+                await db.SaveChangesAsync();
+                return Results.Ok(subscription);
 
-		});
+            });
 
-		// Specials
-		app.MapGet("/specials", async (PizzaStoreContext db) =>
-		{
+        // Specials
+        app.MapGet("/specials", async (PizzaStoreContext db) => {
 
-			var specials = await db.Specials.ToListAsync();
-			return Results.Ok(specials);
+            var specials = await db.Specials.ToListAsync();
+            return Results.Ok(specials);
 
-		});
+        });
 
-		// Toppings
-		app.MapGet("/toppings", async (PizzaStoreContext db) =>
-		{
-			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
-			return Results.Ok(toppings);
-		});
+        // Toppings
+        app.MapGet("/toppings", async (PizzaStoreContext db) => {
+            var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+            return Results.Ok(toppings);
+        });
 
-		return app;
+        return app;
 
-	}
+    }
 
-	private static string GetUserId(HttpContext context)
-	{
-		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
+    private static string GetUserId(HttpContext context)
+    {
+        return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
 
 }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreContext.cs
index 9a2e17ee..50ac87e4 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using Duende.IdentityServer.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
@@ -7,32 +7,32 @@ namespace BlazingPizza.Server;
 
 public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-	public PizzaStoreContext(
-			DbContextOptions options,
-			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-	{
-	}
+    public PizzaStoreContext(
+            DbContextOptions options,
+            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+    {
+    }
 
-	public DbSet<Order> Orders { get; set; }
+    public DbSet<Order> Orders { get; set; }
 
-	public DbSet<Pizza> Pizzas { get; set; }
+    public DbSet<Pizza> Pizzas { get; set; }
 
-	public DbSet<PizzaSpecial> Specials { get; set; }
+    public DbSet<PizzaSpecial> Specials { get; set; }
 
-	public DbSet<Topping> Toppings { get; set; }
+    public DbSet<Topping> Toppings { get; set; }
 
-	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+    public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
-	{
-		base.OnModelCreating(modelBuilder);
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
 
-		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
-		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+        // Configuring a many-to-many special -> topping relationship that is friendly for serialization
+        modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+        modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+        modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-		// Inline the Lat-Long pairs in Order rather than having a FK to another table
-		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-	}
+        // Inline the Lat-Long pairs in Order rather than having a FK to another table
+        modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+    }
 }
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Program.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Program.cs
index 4484d8f7..b83debb4 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/Program.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Program.cs
@@ -1,27 +1,27 @@
-using Microsoft.AspNetCore.Authentication;
+using BlazingPizza.Server;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.EntityFrameworkCore;
-using BlazingPizza.Server;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllersWithViews()
-	.AddJsonOptions(options =>  {
-		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
-	});
+    .AddJsonOptions(options => {
+        options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+    });
 builder.Services.AddRazorPages();
 
 builder.Services.AddDbContext<PizzaStoreContext>(options =>
-		options.UseSqlite("Data Source=pizza.db")
-			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+        options.UseSqlite("Data Source=pizza.db")
+            .UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
 
 builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-		.AddEntityFrameworkStores<PizzaStoreContext>();
+        .AddEntityFrameworkStores<PizzaStoreContext>();
 
 builder.Services.AddIdentityServer()
-		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+        .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
 
 builder.Services.AddAuthentication()
-		.AddIdentityServerJwt();
+        .AddIdentityServerJwt();
 
 var app = builder.Build();
 
@@ -29,11 +29,11 @@
 var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
 using (var scope = scopeFactory.CreateScope())
 {
-	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-	if (db.Database.EnsureCreated())
-	{
-		SeedData.Initialize(db);
-	}
+    var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+    if (db.Database.EnsureCreated())
+    {
+        SeedData.Initialize(db);
+    }
 }
 
 // Configure the HTTP request pipeline.
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/SeedData.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/SeedData.cs
index a1e47973..f02e2b77 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/SeedData.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/SeedData.cs
@@ -2,191 +2,191 @@
 
 public static class SeedData
 {
-	public static void Initialize(PizzaStoreContext db)
-	{
-		var toppings = new Topping[]
-		{
-			new Topping()
-			{
-					Name = "Extra cheese",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "American bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "British bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Canadian bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Tea and crumpets",
-					Price = 5.00m
-			},
-			new Topping()
-			{
-					Name = "Fresh-baked scones",
-					Price = 4.50m,
-			},
-			new Topping()
-			{
-					Name = "Bell peppers",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Onions",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Mushrooms",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Pepperoni",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Duck sausage",
-					Price = 3.20m,
-			},
-			new Topping()
-			{
-					Name = "Venison meatballs",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "Served on a silver platter",
-					Price = 250.99m,
-			},
-			new Topping()
-			{
-					Name = "Lobster on top",
-					Price = 64.50m,
-			},
-			new Topping()
-			{
-					Name = "Sturgeon caviar",
-					Price = 101.75m,
-			},
-			new Topping()
-			{
-					Name = "Artichoke hearts",
-					Price = 3.40m,
-			},
-			new Topping()
-			{
-					Name = "Fresh tomatoes",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Basil",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Steak (medium-rare)",
-					Price = 8.50m,
-			},
-			new Topping()
-			{
-					Name = "Blazing hot peppers",
-					Price = 4.20m,
-			},
-			new Topping()
-			{
-					Name = "Buffalo chicken",
-					Price = 5.00m,
-			},
-			new Topping()
-			{
-					Name = "Blue cheese",
-					Price = 2.50m,
-			},
-		};
+    public static void Initialize(PizzaStoreContext db)
+    {
+        var toppings = new Topping[]
+        {
+            new Topping()
+            {
+                    Name = "Extra cheese",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "American bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "British bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Canadian bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Tea and crumpets",
+                    Price = 5.00m
+            },
+            new Topping()
+            {
+                    Name = "Fresh-baked scones",
+                    Price = 4.50m,
+            },
+            new Topping()
+            {
+                    Name = "Bell peppers",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Onions",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Mushrooms",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Pepperoni",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Duck sausage",
+                    Price = 3.20m,
+            },
+            new Topping()
+            {
+                    Name = "Venison meatballs",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "Served on a silver platter",
+                    Price = 250.99m,
+            },
+            new Topping()
+            {
+                    Name = "Lobster on top",
+                    Price = 64.50m,
+            },
+            new Topping()
+            {
+                    Name = "Sturgeon caviar",
+                    Price = 101.75m,
+            },
+            new Topping()
+            {
+                    Name = "Artichoke hearts",
+                    Price = 3.40m,
+            },
+            new Topping()
+            {
+                    Name = "Fresh tomatoes",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Basil",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Steak (medium-rare)",
+                    Price = 8.50m,
+            },
+            new Topping()
+            {
+                    Name = "Blazing hot peppers",
+                    Price = 4.20m,
+            },
+            new Topping()
+            {
+                    Name = "Buffalo chicken",
+                    Price = 5.00m,
+            },
+            new Topping()
+            {
+                    Name = "Blue cheese",
+                    Price = 2.50m,
+            },
+        };
 
-		var specials = new PizzaSpecial[]
-		{
-			new PizzaSpecial()
-			{
-					Name = "Basic Cheese Pizza",
-					Description = "It's cheesy and delicious. Why wouldn't you want one?",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/cheese.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 2,
-					Name = "The Baconatorizor",
-					Description = "It has EVERY kind of bacon",
-					BasePrice = 11.99m,
-					ImageUrl = "img/pizzas/bacon.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 3,
-					Name = "Classic pepperoni",
-					Description = "It's the pizza you grew up with, but Blazing hot!",
-					BasePrice = 10.50m,
-					ImageUrl = "img/pizzas/pepperoni.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 4,
-					Name = "Buffalo chicken",
-					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-					BasePrice = 12.75m,
-					ImageUrl = "img/pizzas/meaty.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 5,
-					Name = "Mushroom Lovers",
-					Description = "It has mushrooms. Isn't that obvious?",
-					BasePrice = 11.00m,
-					ImageUrl = "img/pizzas/mushroom.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 6,
-					Name = "The Brit",
-					Description = "When in London...",
-					BasePrice = 10.25m,
-					ImageUrl = "img/pizzas/brit.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 7,
-					Name = "Veggie Delight",
-					Description = "It's like salad, but on a pizza",
-					BasePrice = 11.50m,
-					ImageUrl = "img/pizzas/salad.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 8,
-					Name = "Margherita",
-					Description = "Traditional Italian pizza with tomatoes and basil",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/margherita.jpg",
-			},
-		};
+        var specials = new PizzaSpecial[]
+        {
+            new PizzaSpecial()
+            {
+                    Name = "Basic Cheese Pizza",
+                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/cheese.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 2,
+                    Name = "The Baconatorizor",
+                    Description = "It has EVERY kind of bacon",
+                    BasePrice = 11.99m,
+                    ImageUrl = "img/pizzas/bacon.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 3,
+                    Name = "Classic pepperoni",
+                    Description = "It's the pizza you grew up with, but Blazing hot!",
+                    BasePrice = 10.50m,
+                    ImageUrl = "img/pizzas/pepperoni.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 4,
+                    Name = "Buffalo chicken",
+                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+                    BasePrice = 12.75m,
+                    ImageUrl = "img/pizzas/meaty.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 5,
+                    Name = "Mushroom Lovers",
+                    Description = "It has mushrooms. Isn't that obvious?",
+                    BasePrice = 11.00m,
+                    ImageUrl = "img/pizzas/mushroom.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 6,
+                    Name = "The Brit",
+                    Description = "When in London...",
+                    BasePrice = 10.25m,
+                    ImageUrl = "img/pizzas/brit.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 7,
+                    Name = "Veggie Delight",
+                    Description = "It's like salad, but on a pizza",
+                    BasePrice = 11.50m,
+                    ImageUrl = "img/pizzas/salad.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 8,
+                    Name = "Margherita",
+                    Description = "Traditional Italian pizza with tomatoes and basil",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/margherita.jpg",
+            },
+        };
 
-		db.Toppings.AddRange(toppings);
-		db.Specials.AddRange(specials);
-		db.SaveChanges();
-	}
+        db.Toppings.AddRange(toppings);
+        db.Specials.AddRange(specials);
+        db.SaveChanges();
+    }
 }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/Startup.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/Startup.cs
index ed3fca06..4a35b695 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Server/Startup.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Server/Startup.cs
@@ -22,7 +22,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddControllersWithViews();
             services.AddRazorPages();
 
-            services.AddDbContext<PizzaStoreContext>(options => 
+            services.AddDbContext<PizzaStoreContext>(options =>
                 options.UseSqlite("Data Source=pizza.db"));
 
             services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
@@ -59,8 +59,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseIdentityServer();
             app.UseAuthorization();
 
-            app.UseEndpoints(endpoints =>
-            {
+            app.UseEndpoints(endpoints => {
                 endpoints.MapControllers();
                 endpoints.MapRazorPages();
                 endpoints.MapFallbackToFile("index.html");
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Address.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Address.cs
index 63f1e167..309438b7 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Address.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Address.cs
@@ -4,23 +4,23 @@ namespace BlazingPizza;
 
 public class Address
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Name { get; set; }
+    [Required, MaxLength(100)]
+    public string Name { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Line1 { get; set; }
+    [Required, MaxLength(100)]
+    public string Line1 { get; set; }
 
-	[MaxLength(100)]
-	public string Line2 { get; set; }
+    [MaxLength(100)]
+    public string Line2 { get; set; }
 
-	[Required, MaxLength(50)]
-	public string City { get; set; }
+    [Required, MaxLength(50)]
+    public string City { get; set; }
 
-	[Required, MaxLength(20)]
-	public string Region { get; set; }
+    [Required, MaxLength(20)]
+    public string Region { get; set; }
 
-	[Required, MaxLength(20)]
-	public string PostalCode { get; set; }
+    [Required, MaxLength(20)]
+    public string PostalCode { get; set; }
 }
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/LatLong.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/LatLong.cs
index 14a94c26..a65971f8 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/LatLong.cs
@@ -2,25 +2,25 @@
 
 public class LatLong
 {
-	public LatLong()
-	{
-	}
+    public LatLong()
+    {
+    }
 
-	public LatLong(double latitude, double longitude) : this()
-	{
-		Latitude = latitude;
-		Longitude = longitude;
-	}
+    public LatLong(double latitude, double longitude) : this()
+    {
+        Latitude = latitude;
+        Longitude = longitude;
+    }
 
-	public double Latitude { get; set; }
+    public double Latitude { get; set; }
 
-	public double Longitude { get; set; }
+    public double Longitude { get; set; }
 
-	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-	{
-		// The Earth is flat, right? So no need for spherical interpolation.
-		return new LatLong(
-				start.Latitude + (end.Latitude - start.Latitude) * proportion,
-				start.Longitude + (end.Longitude - start.Longitude) * proportion);
-	}
+    public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+    {
+        // The Earth is flat, right? So no need for spherical interpolation.
+        return new LatLong(
+                start.Latitude + (end.Latitude - start.Latitude) * proportion,
+                start.Longitude + (end.Longitude - start.Longitude) * proportion);
+    }
 }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/NotificationSubscription.cs
index 9109ff57..5c99e3f4 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/NotificationSubscription.cs
@@ -2,13 +2,13 @@
 
 public class NotificationSubscription
 {
-	public int NotificationSubscriptionId { get; set; }
+    public int NotificationSubscriptionId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public string Url { get; set; }
+    public string Url { get; set; }
 
-	public string P256dh { get; set; }
+    public string P256dh { get; set; }
 
-	public string Auth { get; set; }
+    public string Auth { get; set; }
 }
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Order.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Order.cs
index aca04ca1..b47efad0 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Order.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Order.cs
@@ -4,21 +4,21 @@ namespace BlazingPizza;
 
 public class Order
 {
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public DateTime CreatedTime { get; set; }
+    public DateTime CreatedTime { get; set; }
 
-	public Address DeliveryAddress { get; set; } = new Address();
+    public Address DeliveryAddress { get; set; } = new Address();
 
-	public LatLong DeliveryLocation { get; set; }
+    public LatLong DeliveryLocation { get; set; }
 
-	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+    public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+    public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
+    public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
@@ -29,4 +29,4 @@ public class Order
 [JsonSerializable(typeof(List<PizzaSpecial>))]
 [JsonSerializable(typeof(List<Topping>))]
 [JsonSerializable(typeof(Topping))]
-public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class OrderContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/OrderWithStatus.cs
index f5f153b6..fbfac7af 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/OrderWithStatus.cs
@@ -6,73 +6,73 @@ namespace BlazingPizza;
 
 public class OrderWithStatus
 {
-	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+    public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+    public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 
-	public string StatusText { get; set; }
+    public string StatusText { get; set; }
 
-	public bool IsDelivered => StatusText == "Delivered";
+    public bool IsDelivered => StatusText == "Delivered";
 
-	public List<Marker> MapMarkers { get; set; }
+    public List<Marker> MapMarkers { get; set; }
 
-	public static OrderWithStatus FromOrder(Order order)
-	{
-		// To simulate a real backend process, we fake status updates based on the amount
-		// of time since the order was placed
-		string statusText;
-		List<Marker> mapMarkers;
-		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+    public static OrderWithStatus FromOrder(Order order)
+    {
+        // To simulate a real backend process, we fake status updates based on the amount
+        // of time since the order was placed
+        string statusText;
+        List<Marker> mapMarkers;
+        var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-		if (DateTime.Now < dispatchTime)
-		{
-			statusText = "Preparing";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-								};
-		}
-		else if (DateTime.Now < dispatchTime + DeliveryDuration)
-		{
-			statusText = "Out for delivery";
+        if (DateTime.Now < dispatchTime)
+        {
+            statusText = "Preparing";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+                                };
+        }
+        else if (DateTime.Now < dispatchTime + DeliveryDuration)
+        {
+            statusText = "Out for delivery";
 
-			var startPosition = ComputeStartPosition(order);
-			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation),
-										ToMapMarker("Driver", driverPosition, showPopup: true),
-								};
-		}
-		else
-		{
-			statusText = "Delivered";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-								};
-		}
+            var startPosition = ComputeStartPosition(order);
+            var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+            var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation),
+                                        ToMapMarker("Driver", driverPosition, showPopup: true),
+                                };
+        }
+        else
+        {
+            statusText = "Delivered";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+                                };
+        }
 
-		return new OrderWithStatus
-		{
-			Order = order,
-			StatusText = statusText,
-			MapMarkers = mapMarkers,
-		};
-	}
+        return new OrderWithStatus
+        {
+            Order = order,
+            StatusText = statusText,
+            MapMarkers = mapMarkers,
+        };
+    }
 
-	private static LatLong ComputeStartPosition(Order order)
-	{
-		// Random but deterministic based on order ID
-		var rng = new Random(order.OrderId);
-		var distance = 0.01 + rng.NextDouble() * 0.02;
-		var angle = rng.NextDouble() * Math.PI * 2;
-		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-	}
+    private static LatLong ComputeStartPosition(Order order)
+    {
+        // Random but deterministic based on order ID
+        var rng = new Random(order.OrderId);
+        var distance = 0.01 + rng.NextDouble() * 0.02;
+        var angle = rng.NextDouble() * Math.PI * 2;
+        var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+        return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+    }
 
-	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+    static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
 }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Pizza.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Pizza.cs
index 459298f4..2a7a1c29 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Pizza.cs
@@ -7,38 +7,38 @@ namespace BlazingPizza;
 /// </summary>
 public class Pizza
 {
-	public const int DefaultSize = 12;
-	public const int MinimumSize = 9;
-	public const int MaximumSize = 17;
+    public const int DefaultSize = 12;
+    public const int MinimumSize = 9;
+    public const int MaximumSize = 17;
 
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public PizzaSpecial Special { get; set; }
+    public PizzaSpecial Special { get; set; }
 
-	public int SpecialId { get; set; }
+    public int SpecialId { get; set; }
 
-	public int Size { get; set; }
+    public int Size { get; set; }
 
-	public List<PizzaTopping> Toppings { get; set; }
+    public List<PizzaTopping> Toppings { get; set; }
 
-	public decimal GetBasePrice()
-	{
-		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-	}
+    public decimal GetBasePrice()
+    {
+        return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+    }
 
-	public decimal GetTotalPrice()
-	{
-		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-	}
+    public decimal GetTotalPrice()
+    {
+        return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+    }
 
-	public string GetFormattedTotalPrice()
-	{
-		return GetTotalPrice().ToString("0.00");
-	}
+    public string GetFormattedTotalPrice()
+    {
+        return GetTotalPrice().ToString("0.00");
+    }
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
 [JsonSerializable(typeof(Pizza))]
-public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class PizzaContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaSpecial.cs
index 9653300c..1fd9006a 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaSpecial.cs
@@ -5,15 +5,15 @@
 /// </summary>
 public class PizzaSpecial
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal BasePrice { get; set; }
+    public decimal BasePrice { get; set; }
 
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public string ImageUrl { get; set; }
+    public string ImageUrl { get; set; }
 
-	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+    public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
 }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaTopping.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaTopping.cs
index 0a711647..1c062732 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/PizzaTopping.cs
@@ -2,10 +2,10 @@
 
 public class PizzaTopping
 {
-	public Topping Topping { get; set; }
+    public Topping Topping { get; set; }
 
-	public int ToppingId { get; set; }
+    public int ToppingId { get; set; }
+
+    public int PizzaId { get; set; }
 
-	public int PizzaId { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Topping.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Topping.cs
index 376c311a..4eb67ae9 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/Topping.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/Topping.cs
@@ -2,12 +2,12 @@
 
 public class Topping
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal Price { get; set; }
+    public decimal Price { get; set; }
+
+    public string GetFormattedPrice() => Price.ToString("0.00");
 
-	public string GetFormattedPrice() => Price.ToString("0.00");
-	
 }
\ No newline at end of file
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Shared/UserInfo.cs b/save-points/02-customize-a-pizza/BlazingPizza.Shared/UserInfo.cs
index 362f8f8e..babb4315 100644
--- a/save-points/02-customize-a-pizza/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/02-customize-a-pizza/BlazingPizza.Shared/UserInfo.cs
@@ -2,8 +2,8 @@
 
 public class UserInfo
 {
-	public bool IsAuthenticated { get; set; }
+    public bool IsAuthenticated { get; set; }
+
+    public string Name { get; set; }
 
-	public string Name { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index bb84f13c..be8226ec 100644
--- a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -4,12 +4,12 @@ namespace BlazingPizza.ComponentsLibrary;
 
 public static class LocalStorage
 {
-	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+    public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+    public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+    public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
 }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index a8e78f2a..b067719c 100644
--- a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -2,11 +2,11 @@
 
 public class Marker
 {
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public double X { get; set; }
+    public double X { get; set; }
 
-	public double Y { get; set; }
+    public double Y { get; set; }
 
-	public bool ShowPopup { get; set; }
+    public bool ShowPopup { get; set; }
 }
diff --git a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 349046d4..34194163 100644
--- a/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/03-show-order-status/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -2,7 +2,7 @@
 
 public class Point
 {
-	public double X { get; set; }
+    public double X { get; set; }
 
-	public double Y { get; set; }
+    public double Y { get; set; }
 }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/03-show-order-status/BlazingPizza.Server/OidcConfigurationController.cs
index b7654075..3d385048 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Server/OidcConfigurationController.cs
@@ -5,17 +5,17 @@ namespace BlazingPizza.Server;
 
 public class OidcConfigurationController : Controller
 {
-	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-	{
-		ClientRequestParametersProvider = clientRequestParametersProvider;
-	}
+    public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+    {
+        ClientRequestParametersProvider = clientRequestParametersProvider;
+    }
 
-	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+    public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-	[HttpGet("_configuration/{clientId}")]
-	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
-	{
-		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-		return Ok(parameters);
-	}
+    [HttpGet("_configuration/{clientId}")]
+    public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+    {
+        var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+        return Ok(parameters);
+    }
 }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/OrdersController.cs b/save-points/03-show-order-status/BlazingPizza.Server/OrdersController.cs
index 54ff6114..37e37cc5 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Server/OrdersController.cs
@@ -9,101 +9,101 @@ namespace BlazingPizza.Server;
 // [Authorize]
 public class OrdersController : Controller
 {
-	private readonly PizzaStoreContext _db;
-
-	public OrdersController(PizzaStoreContext db)
-	{
-		_db = db;
-	}
-
-	[HttpGet]
-	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-	{
-		var orders = await _db.Orders
-				// .Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.OrderByDescending(o => o.CreatedTime)
-				.ToListAsync();
-
-		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-	}
-
-	[HttpGet("{orderId}")]
-	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-	{
-		var order = await _db.Orders
-				.Where(o => o.OrderId == orderId)
-				// .Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.SingleOrDefaultAsync();
-
-		if (order == null)
-		{
-			return NotFound();
-		}
-
-		return OrderWithStatus.FromOrder(order);
-	}
-
-	[HttpPost]
-	public async Task<ActionResult<int>> PlaceOrder(Order order)
-	{
-		order.CreatedTime = DateTime.Now;
-		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-		// order.UserId = GetUserId();
-
-		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
-		// in the database - prevent the submitter from making up
-		// new specials and toppings
-		foreach (var pizza in order.Pizzas)
-		{
-			pizza.SpecialId = pizza.Special.Id;
-			pizza.Special = null;
-
-			foreach (var topping in pizza.Toppings)
-			{
-				topping.ToppingId = topping.Topping.Id;
-				topping.Topping = null;
-			}
-		}
-
-		_db.Orders.Attach(order);
-		await _db.SaveChangesAsync();
-
-		// In the background, send push notifications if possible
-		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-		if (subscription != null)
-		{
-			_ = TrackAndSendNotificationsAsync(order, subscription);
-		}
-
-		return order.OrderId;
-	}
-
-	private string GetUserId()
-	{
-		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
-
-	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-	{
-		// In a realistic case, some other backend process would track
-		// order delivery progress and send us notifications when it
-		// changes. Since we don't have any such process here, fake it.
-		await Task.Delay(OrderWithStatus.PreparationDuration);
-		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-		await Task.Delay(OrderWithStatus.DeliveryDuration);
-		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-	}
-
-	private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-	{
-		// This will be implemented later
-		return Task.CompletedTask;
-	}
+    private readonly PizzaStoreContext _db;
+
+    public OrdersController(PizzaStoreContext db)
+    {
+        _db = db;
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+    {
+        var orders = await _db.Orders
+                // .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .OrderByDescending(o => o.CreatedTime)
+                .ToListAsync();
+
+        return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+    }
+
+    [HttpGet("{orderId}")]
+    public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+    {
+        var order = await _db.Orders
+                .Where(o => o.OrderId == orderId)
+                // .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .SingleOrDefaultAsync();
+
+        if (order == null)
+        {
+            return NotFound();
+        }
+
+        return OrderWithStatus.FromOrder(order);
+    }
+
+    [HttpPost]
+    public async Task<ActionResult<int>> PlaceOrder(Order order)
+    {
+        order.CreatedTime = DateTime.Now;
+        order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+        // order.UserId = GetUserId();
+
+        // Enforce existence of Pizza.SpecialId and Topping.ToppingId
+        // in the database - prevent the submitter from making up
+        // new specials and toppings
+        foreach (var pizza in order.Pizzas)
+        {
+            pizza.SpecialId = pizza.Special.Id;
+            pizza.Special = null;
+
+            foreach (var topping in pizza.Toppings)
+            {
+                topping.ToppingId = topping.Topping.Id;
+                topping.Topping = null;
+            }
+        }
+
+        _db.Orders.Attach(order);
+        await _db.SaveChangesAsync();
+
+        // In the background, send push notifications if possible
+        var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+        if (subscription != null)
+        {
+            _ = TrackAndSendNotificationsAsync(order, subscription);
+        }
+
+        return order.OrderId;
+    }
+
+    private string GetUserId()
+    {
+        return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
+
+    private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+    {
+        // In a realistic case, some other backend process would track
+        // order delivery progress and send us notifications when it
+        // changes. Since we don't have any such process here, fake it.
+        await Task.Delay(OrderWithStatus.PreparationDuration);
+        await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+        await Task.Delay(OrderWithStatus.DeliveryDuration);
+        await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+    }
+
+    private static Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+    {
+        // This will be implemented later
+        return Task.CompletedTask;
+    }
 }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/03-show-order-status/BlazingPizza.Server/PizzaApiExtensions.cs
index bf6b7bde..524ca759 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/PizzaApiExtensions.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -7,54 +7,51 @@ namespace BlazingPizza.Server;
 public static class PizzaApiExtensions
 {
 
-	public static WebApplication MapPizzaApi(this WebApplication app)
-	{
+    public static WebApplication MapPizzaApi(this WebApplication app)
+    {
 
-		// Subscribe to notifications
-		app.MapPut("/notifications/subscribe", [Authorize] async (
-			HttpContext context,
-			PizzaStoreContext db,
-			NotificationSubscription subscription) =>
-		{
+        // Subscribe to notifications
+        app.MapPut("/notifications/subscribe", [Authorize] async (
+            HttpContext context,
+            PizzaStoreContext db,
+            NotificationSubscription subscription) => {
 
-			// We're storing at most one subscription per user, so delete old ones.
-			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-			var userId = GetUserId(context);
-			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
-			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+                // We're storing at most one subscription per user, so delete old ones.
+                // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+                var userId = GetUserId(context);
+                var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+                db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
 
-			// Store new subscription
-			subscription.UserId = userId;
-			db.NotificationSubscriptions.Attach(subscription);
+                // Store new subscription
+                subscription.UserId = userId;
+                db.NotificationSubscriptions.Attach(subscription);
 
-			await db.SaveChangesAsync();
-			return Results.Ok(subscription);
+                await db.SaveChangesAsync();
+                return Results.Ok(subscription);
 
-		});
+            });
 
-		// Specials
-		app.MapGet("/specials", async (PizzaStoreContext db) =>
-		{
+        // Specials
+        app.MapGet("/specials", async (PizzaStoreContext db) => {
 
-			var specials = await db.Specials.ToListAsync();
-			return Results.Ok(specials);
+            var specials = await db.Specials.ToListAsync();
+            return Results.Ok(specials);
 
-		});
+        });
 
-		// Toppings
-		app.MapGet("/toppings", async (PizzaStoreContext db) =>
-		{
-			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
-			return Results.Ok(toppings);
-		});
+        // Toppings
+        app.MapGet("/toppings", async (PizzaStoreContext db) => {
+            var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+            return Results.Ok(toppings);
+        });
 
-		return app;
+        return app;
 
-	}
+    }
 
-	private static string GetUserId(HttpContext context)
-	{
-		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
+    private static string GetUserId(HttpContext context)
+    {
+        return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
 
 }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreContext.cs
index 9a2e17ee..50ac87e4 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using Duende.IdentityServer.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
@@ -7,32 +7,32 @@ namespace BlazingPizza.Server;
 
 public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-	public PizzaStoreContext(
-			DbContextOptions options,
-			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-	{
-	}
+    public PizzaStoreContext(
+            DbContextOptions options,
+            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+    {
+    }
 
-	public DbSet<Order> Orders { get; set; }
+    public DbSet<Order> Orders { get; set; }
 
-	public DbSet<Pizza> Pizzas { get; set; }
+    public DbSet<Pizza> Pizzas { get; set; }
 
-	public DbSet<PizzaSpecial> Specials { get; set; }
+    public DbSet<PizzaSpecial> Specials { get; set; }
 
-	public DbSet<Topping> Toppings { get; set; }
+    public DbSet<Topping> Toppings { get; set; }
 
-	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+    public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
-	{
-		base.OnModelCreating(modelBuilder);
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
 
-		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
-		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+        // Configuring a many-to-many special -> topping relationship that is friendly for serialization
+        modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+        modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+        modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-		// Inline the Lat-Long pairs in Order rather than having a FK to another table
-		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-	}
+        // Inline the Lat-Long pairs in Order rather than having a FK to another table
+        modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+    }
 }
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/Program.cs b/save-points/03-show-order-status/BlazingPizza.Server/Program.cs
index 4484d8f7..b83debb4 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/Program.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Server/Program.cs
@@ -1,27 +1,27 @@
-using Microsoft.AspNetCore.Authentication;
+using BlazingPizza.Server;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.EntityFrameworkCore;
-using BlazingPizza.Server;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllersWithViews()
-	.AddJsonOptions(options =>  {
-		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
-	});
+    .AddJsonOptions(options => {
+        options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+    });
 builder.Services.AddRazorPages();
 
 builder.Services.AddDbContext<PizzaStoreContext>(options =>
-		options.UseSqlite("Data Source=pizza.db")
-			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+        options.UseSqlite("Data Source=pizza.db")
+            .UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
 
 builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-		.AddEntityFrameworkStores<PizzaStoreContext>();
+        .AddEntityFrameworkStores<PizzaStoreContext>();
 
 builder.Services.AddIdentityServer()
-		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+        .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
 
 builder.Services.AddAuthentication()
-		.AddIdentityServerJwt();
+        .AddIdentityServerJwt();
 
 var app = builder.Build();
 
@@ -29,11 +29,11 @@
 var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
 using (var scope = scopeFactory.CreateScope())
 {
-	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-	if (db.Database.EnsureCreated())
-	{
-		SeedData.Initialize(db);
-	}
+    var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+    if (db.Database.EnsureCreated())
+    {
+        SeedData.Initialize(db);
+    }
 }
 
 // Configure the HTTP request pipeline.
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/SeedData.cs b/save-points/03-show-order-status/BlazingPizza.Server/SeedData.cs
index a1e47973..f02e2b77 100644
--- a/save-points/03-show-order-status/BlazingPizza.Server/SeedData.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Server/SeedData.cs
@@ -2,191 +2,191 @@
 
 public static class SeedData
 {
-	public static void Initialize(PizzaStoreContext db)
-	{
-		var toppings = new Topping[]
-		{
-			new Topping()
-			{
-					Name = "Extra cheese",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "American bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "British bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Canadian bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Tea and crumpets",
-					Price = 5.00m
-			},
-			new Topping()
-			{
-					Name = "Fresh-baked scones",
-					Price = 4.50m,
-			},
-			new Topping()
-			{
-					Name = "Bell peppers",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Onions",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Mushrooms",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Pepperoni",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Duck sausage",
-					Price = 3.20m,
-			},
-			new Topping()
-			{
-					Name = "Venison meatballs",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "Served on a silver platter",
-					Price = 250.99m,
-			},
-			new Topping()
-			{
-					Name = "Lobster on top",
-					Price = 64.50m,
-			},
-			new Topping()
-			{
-					Name = "Sturgeon caviar",
-					Price = 101.75m,
-			},
-			new Topping()
-			{
-					Name = "Artichoke hearts",
-					Price = 3.40m,
-			},
-			new Topping()
-			{
-					Name = "Fresh tomatoes",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Basil",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Steak (medium-rare)",
-					Price = 8.50m,
-			},
-			new Topping()
-			{
-					Name = "Blazing hot peppers",
-					Price = 4.20m,
-			},
-			new Topping()
-			{
-					Name = "Buffalo chicken",
-					Price = 5.00m,
-			},
-			new Topping()
-			{
-					Name = "Blue cheese",
-					Price = 2.50m,
-			},
-		};
+    public static void Initialize(PizzaStoreContext db)
+    {
+        var toppings = new Topping[]
+        {
+            new Topping()
+            {
+                    Name = "Extra cheese",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "American bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "British bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Canadian bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Tea and crumpets",
+                    Price = 5.00m
+            },
+            new Topping()
+            {
+                    Name = "Fresh-baked scones",
+                    Price = 4.50m,
+            },
+            new Topping()
+            {
+                    Name = "Bell peppers",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Onions",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Mushrooms",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Pepperoni",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Duck sausage",
+                    Price = 3.20m,
+            },
+            new Topping()
+            {
+                    Name = "Venison meatballs",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "Served on a silver platter",
+                    Price = 250.99m,
+            },
+            new Topping()
+            {
+                    Name = "Lobster on top",
+                    Price = 64.50m,
+            },
+            new Topping()
+            {
+                    Name = "Sturgeon caviar",
+                    Price = 101.75m,
+            },
+            new Topping()
+            {
+                    Name = "Artichoke hearts",
+                    Price = 3.40m,
+            },
+            new Topping()
+            {
+                    Name = "Fresh tomatoes",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Basil",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Steak (medium-rare)",
+                    Price = 8.50m,
+            },
+            new Topping()
+            {
+                    Name = "Blazing hot peppers",
+                    Price = 4.20m,
+            },
+            new Topping()
+            {
+                    Name = "Buffalo chicken",
+                    Price = 5.00m,
+            },
+            new Topping()
+            {
+                    Name = "Blue cheese",
+                    Price = 2.50m,
+            },
+        };
 
-		var specials = new PizzaSpecial[]
-		{
-			new PizzaSpecial()
-			{
-					Name = "Basic Cheese Pizza",
-					Description = "It's cheesy and delicious. Why wouldn't you want one?",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/cheese.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 2,
-					Name = "The Baconatorizor",
-					Description = "It has EVERY kind of bacon",
-					BasePrice = 11.99m,
-					ImageUrl = "img/pizzas/bacon.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 3,
-					Name = "Classic pepperoni",
-					Description = "It's the pizza you grew up with, but Blazing hot!",
-					BasePrice = 10.50m,
-					ImageUrl = "img/pizzas/pepperoni.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 4,
-					Name = "Buffalo chicken",
-					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-					BasePrice = 12.75m,
-					ImageUrl = "img/pizzas/meaty.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 5,
-					Name = "Mushroom Lovers",
-					Description = "It has mushrooms. Isn't that obvious?",
-					BasePrice = 11.00m,
-					ImageUrl = "img/pizzas/mushroom.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 6,
-					Name = "The Brit",
-					Description = "When in London...",
-					BasePrice = 10.25m,
-					ImageUrl = "img/pizzas/brit.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 7,
-					Name = "Veggie Delight",
-					Description = "It's like salad, but on a pizza",
-					BasePrice = 11.50m,
-					ImageUrl = "img/pizzas/salad.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 8,
-					Name = "Margherita",
-					Description = "Traditional Italian pizza with tomatoes and basil",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/margherita.jpg",
-			},
-		};
+        var specials = new PizzaSpecial[]
+        {
+            new PizzaSpecial()
+            {
+                    Name = "Basic Cheese Pizza",
+                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/cheese.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 2,
+                    Name = "The Baconatorizor",
+                    Description = "It has EVERY kind of bacon",
+                    BasePrice = 11.99m,
+                    ImageUrl = "img/pizzas/bacon.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 3,
+                    Name = "Classic pepperoni",
+                    Description = "It's the pizza you grew up with, but Blazing hot!",
+                    BasePrice = 10.50m,
+                    ImageUrl = "img/pizzas/pepperoni.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 4,
+                    Name = "Buffalo chicken",
+                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+                    BasePrice = 12.75m,
+                    ImageUrl = "img/pizzas/meaty.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 5,
+                    Name = "Mushroom Lovers",
+                    Description = "It has mushrooms. Isn't that obvious?",
+                    BasePrice = 11.00m,
+                    ImageUrl = "img/pizzas/mushroom.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 6,
+                    Name = "The Brit",
+                    Description = "When in London...",
+                    BasePrice = 10.25m,
+                    ImageUrl = "img/pizzas/brit.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 7,
+                    Name = "Veggie Delight",
+                    Description = "It's like salad, but on a pizza",
+                    BasePrice = 11.50m,
+                    ImageUrl = "img/pizzas/salad.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 8,
+                    Name = "Margherita",
+                    Description = "Traditional Italian pizza with tomatoes and basil",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/margherita.jpg",
+            },
+        };
 
-		db.Toppings.AddRange(toppings);
-		db.Specials.AddRange(specials);
-		db.SaveChanges();
-	}
+        db.Toppings.AddRange(toppings);
+        db.Specials.AddRange(specials);
+        db.SaveChanges();
+    }
 }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/Address.cs b/save-points/03-show-order-status/BlazingPizza.Shared/Address.cs
index 63f1e167..309438b7 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/Address.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/Address.cs
@@ -4,23 +4,23 @@ namespace BlazingPizza;
 
 public class Address
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Name { get; set; }
+    [Required, MaxLength(100)]
+    public string Name { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Line1 { get; set; }
+    [Required, MaxLength(100)]
+    public string Line1 { get; set; }
 
-	[MaxLength(100)]
-	public string Line2 { get; set; }
+    [MaxLength(100)]
+    public string Line2 { get; set; }
 
-	[Required, MaxLength(50)]
-	public string City { get; set; }
+    [Required, MaxLength(50)]
+    public string City { get; set; }
 
-	[Required, MaxLength(20)]
-	public string Region { get; set; }
+    [Required, MaxLength(20)]
+    public string Region { get; set; }
 
-	[Required, MaxLength(20)]
-	public string PostalCode { get; set; }
+    [Required, MaxLength(20)]
+    public string PostalCode { get; set; }
 }
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/LatLong.cs b/save-points/03-show-order-status/BlazingPizza.Shared/LatLong.cs
index 14a94c26..a65971f8 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/LatLong.cs
@@ -2,25 +2,25 @@
 
 public class LatLong
 {
-	public LatLong()
-	{
-	}
+    public LatLong()
+    {
+    }
 
-	public LatLong(double latitude, double longitude) : this()
-	{
-		Latitude = latitude;
-		Longitude = longitude;
-	}
+    public LatLong(double latitude, double longitude) : this()
+    {
+        Latitude = latitude;
+        Longitude = longitude;
+    }
 
-	public double Latitude { get; set; }
+    public double Latitude { get; set; }
 
-	public double Longitude { get; set; }
+    public double Longitude { get; set; }
 
-	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-	{
-		// The Earth is flat, right? So no need for spherical interpolation.
-		return new LatLong(
-				start.Latitude + (end.Latitude - start.Latitude) * proportion,
-				start.Longitude + (end.Longitude - start.Longitude) * proportion);
-	}
+    public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+    {
+        // The Earth is flat, right? So no need for spherical interpolation.
+        return new LatLong(
+                start.Latitude + (end.Latitude - start.Latitude) * proportion,
+                start.Longitude + (end.Longitude - start.Longitude) * proportion);
+    }
 }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/03-show-order-status/BlazingPizza.Shared/NotificationSubscription.cs
index 9109ff57..5c99e3f4 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/NotificationSubscription.cs
@@ -2,13 +2,13 @@
 
 public class NotificationSubscription
 {
-	public int NotificationSubscriptionId { get; set; }
+    public int NotificationSubscriptionId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public string Url { get; set; }
+    public string Url { get; set; }
 
-	public string P256dh { get; set; }
+    public string P256dh { get; set; }
 
-	public string Auth { get; set; }
+    public string Auth { get; set; }
 }
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/Order.cs b/save-points/03-show-order-status/BlazingPizza.Shared/Order.cs
index aca04ca1..b47efad0 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/Order.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/Order.cs
@@ -4,21 +4,21 @@ namespace BlazingPizza;
 
 public class Order
 {
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public DateTime CreatedTime { get; set; }
+    public DateTime CreatedTime { get; set; }
 
-	public Address DeliveryAddress { get; set; } = new Address();
+    public Address DeliveryAddress { get; set; } = new Address();
 
-	public LatLong DeliveryLocation { get; set; }
+    public LatLong DeliveryLocation { get; set; }
 
-	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+    public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+    public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
+    public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
@@ -29,4 +29,4 @@ public class Order
 [JsonSerializable(typeof(List<PizzaSpecial>))]
 [JsonSerializable(typeof(List<Topping>))]
 [JsonSerializable(typeof(Topping))]
-public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class OrderContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/03-show-order-status/BlazingPizza.Shared/OrderWithStatus.cs
index f5f153b6..fbfac7af 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/OrderWithStatus.cs
@@ -6,73 +6,73 @@ namespace BlazingPizza;
 
 public class OrderWithStatus
 {
-	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+    public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+    public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 
-	public string StatusText { get; set; }
+    public string StatusText { get; set; }
 
-	public bool IsDelivered => StatusText == "Delivered";
+    public bool IsDelivered => StatusText == "Delivered";
 
-	public List<Marker> MapMarkers { get; set; }
+    public List<Marker> MapMarkers { get; set; }
 
-	public static OrderWithStatus FromOrder(Order order)
-	{
-		// To simulate a real backend process, we fake status updates based on the amount
-		// of time since the order was placed
-		string statusText;
-		List<Marker> mapMarkers;
-		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+    public static OrderWithStatus FromOrder(Order order)
+    {
+        // To simulate a real backend process, we fake status updates based on the amount
+        // of time since the order was placed
+        string statusText;
+        List<Marker> mapMarkers;
+        var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-		if (DateTime.Now < dispatchTime)
-		{
-			statusText = "Preparing";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-								};
-		}
-		else if (DateTime.Now < dispatchTime + DeliveryDuration)
-		{
-			statusText = "Out for delivery";
+        if (DateTime.Now < dispatchTime)
+        {
+            statusText = "Preparing";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+                                };
+        }
+        else if (DateTime.Now < dispatchTime + DeliveryDuration)
+        {
+            statusText = "Out for delivery";
 
-			var startPosition = ComputeStartPosition(order);
-			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation),
-										ToMapMarker("Driver", driverPosition, showPopup: true),
-								};
-		}
-		else
-		{
-			statusText = "Delivered";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-								};
-		}
+            var startPosition = ComputeStartPosition(order);
+            var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+            var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation),
+                                        ToMapMarker("Driver", driverPosition, showPopup: true),
+                                };
+        }
+        else
+        {
+            statusText = "Delivered";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+                                };
+        }
 
-		return new OrderWithStatus
-		{
-			Order = order,
-			StatusText = statusText,
-			MapMarkers = mapMarkers,
-		};
-	}
+        return new OrderWithStatus
+        {
+            Order = order,
+            StatusText = statusText,
+            MapMarkers = mapMarkers,
+        };
+    }
 
-	private static LatLong ComputeStartPosition(Order order)
-	{
-		// Random but deterministic based on order ID
-		var rng = new Random(order.OrderId);
-		var distance = 0.01 + rng.NextDouble() * 0.02;
-		var angle = rng.NextDouble() * Math.PI * 2;
-		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-	}
+    private static LatLong ComputeStartPosition(Order order)
+    {
+        // Random but deterministic based on order ID
+        var rng = new Random(order.OrderId);
+        var distance = 0.01 + rng.NextDouble() * 0.02;
+        var angle = rng.NextDouble() * Math.PI * 2;
+        var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+        return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+    }
 
-	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+    static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
 }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/Pizza.cs b/save-points/03-show-order-status/BlazingPizza.Shared/Pizza.cs
index 459298f4..2a7a1c29 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/Pizza.cs
@@ -7,38 +7,38 @@ namespace BlazingPizza;
 /// </summary>
 public class Pizza
 {
-	public const int DefaultSize = 12;
-	public const int MinimumSize = 9;
-	public const int MaximumSize = 17;
+    public const int DefaultSize = 12;
+    public const int MinimumSize = 9;
+    public const int MaximumSize = 17;
 
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public PizzaSpecial Special { get; set; }
+    public PizzaSpecial Special { get; set; }
 
-	public int SpecialId { get; set; }
+    public int SpecialId { get; set; }
 
-	public int Size { get; set; }
+    public int Size { get; set; }
 
-	public List<PizzaTopping> Toppings { get; set; }
+    public List<PizzaTopping> Toppings { get; set; }
 
-	public decimal GetBasePrice()
-	{
-		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-	}
+    public decimal GetBasePrice()
+    {
+        return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+    }
 
-	public decimal GetTotalPrice()
-	{
-		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-	}
+    public decimal GetTotalPrice()
+    {
+        return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+    }
 
-	public string GetFormattedTotalPrice()
-	{
-		return GetTotalPrice().ToString("0.00");
-	}
+    public string GetFormattedTotalPrice()
+    {
+        return GetTotalPrice().ToString("0.00");
+    }
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
 [JsonSerializable(typeof(Pizza))]
-public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class PizzaContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/03-show-order-status/BlazingPizza.Shared/PizzaSpecial.cs
index 9653300c..1fd9006a 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/PizzaSpecial.cs
@@ -5,15 +5,15 @@
 /// </summary>
 public class PizzaSpecial
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal BasePrice { get; set; }
+    public decimal BasePrice { get; set; }
 
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public string ImageUrl { get; set; }
+    public string ImageUrl { get; set; }
 
-	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+    public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
 }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/PizzaTopping.cs b/save-points/03-show-order-status/BlazingPizza.Shared/PizzaTopping.cs
index 0a711647..1c062732 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/PizzaTopping.cs
@@ -2,10 +2,10 @@
 
 public class PizzaTopping
 {
-	public Topping Topping { get; set; }
+    public Topping Topping { get; set; }
 
-	public int ToppingId { get; set; }
+    public int ToppingId { get; set; }
+
+    public int PizzaId { get; set; }
 
-	public int PizzaId { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/Topping.cs b/save-points/03-show-order-status/BlazingPizza.Shared/Topping.cs
index 376c311a..4eb67ae9 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/Topping.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/Topping.cs
@@ -2,12 +2,12 @@
 
 public class Topping
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal Price { get; set; }
+    public decimal Price { get; set; }
+
+    public string GetFormattedPrice() => Price.ToString("0.00");
 
-	public string GetFormattedPrice() => Price.ToString("0.00");
-	
 }
\ No newline at end of file
diff --git a/save-points/03-show-order-status/BlazingPizza.Shared/UserInfo.cs b/save-points/03-show-order-status/BlazingPizza.Shared/UserInfo.cs
index 362f8f8e..babb4315 100644
--- a/save-points/03-show-order-status/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/03-show-order-status/BlazingPizza.Shared/UserInfo.cs
@@ -2,8 +2,8 @@
 
 public class UserInfo
 {
-	public bool IsAuthenticated { get; set; }
+    public bool IsAuthenticated { get; set; }
+
+    public string Name { get; set; }
 
-	public string Name { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/OrderState.cs b/save-points/04-refactor-state-management/BlazingPizza.Client/OrderState.cs
index 064f65a7..ae82f76c 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Client/OrderState.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Client/OrderState.cs
@@ -2,46 +2,46 @@
 
 public class OrderState
 {
-		public bool ShowingConfigureDialog { get; private set; }
-
-		public Pizza ConfiguringPizza { get; private set; }
-
-		public Order Order { get; private set; } = new Order();
-
-		public void ShowConfigurePizzaDialog(PizzaSpecial special)
-		{
-				ConfiguringPizza = new Pizza()
-				{
-						Special = special,
-						SpecialId = special.Id,
-						Size = Pizza.DefaultSize,
-						Toppings = new List<PizzaTopping>(),
-				};
-
-				ShowingConfigureDialog = true;
-		}
-
-		public void CancelConfigurePizzaDialog()
-		{
-				ConfiguringPizza = null;
-				ShowingConfigureDialog = false;
-		}
-
-		public void ConfirmConfigurePizzaDialog()
-		{
-				Order.Pizzas.Add(ConfiguringPizza);
-				ConfiguringPizza = null;
-
-				ShowingConfigureDialog = false;
-		}
-
-		public void RemoveConfiguredPizza(Pizza pizza)
-		{
-				Order.Pizzas.Remove(pizza);
-		}
-
-		public void ResetOrder()
-		{
-				Order = new Order();
-		}
+    public bool ShowingConfigureDialog { get; private set; }
+
+    public Pizza ConfiguringPizza { get; private set; }
+
+    public Order Order { get; private set; } = new Order();
+
+    public void ShowConfigurePizzaDialog(PizzaSpecial special)
+    {
+        ConfiguringPizza = new Pizza()
+        {
+            Special = special,
+            SpecialId = special.Id,
+            Size = Pizza.DefaultSize,
+            Toppings = new List<PizzaTopping>(),
+        };
+
+        ShowingConfigureDialog = true;
+    }
+
+    public void CancelConfigurePizzaDialog()
+    {
+        ConfiguringPizza = null;
+        ShowingConfigureDialog = false;
+    }
+
+    public void ConfirmConfigurePizzaDialog()
+    {
+        Order.Pizzas.Add(ConfiguringPizza);
+        ConfiguringPizza = null;
+
+        ShowingConfigureDialog = false;
+    }
+
+    public void RemoveConfiguredPizza(Pizza pizza)
+    {
+        Order.Pizzas.Remove(pizza);
+    }
+
+    public void ResetOrder()
+    {
+        Order = new Order();
+    }
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs b/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs
index 6b8ae30d..97ace491 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Client/Program.cs
@@ -1,6 +1,6 @@
 using BlazingPizza.Client;
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
diff --git a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index bb84f13c..be8226ec 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -4,12 +4,12 @@ namespace BlazingPizza.ComponentsLibrary;
 
 public static class LocalStorage
 {
-	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+    public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+    public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+    public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
 }
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index a8e78f2a..b067719c 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -2,11 +2,11 @@
 
 public class Marker
 {
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public double X { get; set; }
+    public double X { get; set; }
 
-	public double Y { get; set; }
+    public double Y { get; set; }
 
-	public bool ShowPopup { get; set; }
+    public bool ShowPopup { get; set; }
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 349046d4..34194163 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -2,7 +2,7 @@
 
 public class Point
 {
-	public double X { get; set; }
+    public double X { get; set; }
 
-	public double Y { get; set; }
+    public double Y { get; set; }
 }
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/OidcConfigurationController.cs
index dc75ecb3..1431697e 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/OidcConfigurationController.cs
@@ -5,17 +5,17 @@ namespace BlazingPizza.Server;
 
 public class OidcConfigurationController : Controller
 {
-	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-	{
-		ClientRequestParametersProvider = clientRequestParametersProvider;
-	}
+    public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+    {
+        ClientRequestParametersProvider = clientRequestParametersProvider;
+    }
 
-	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+    public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-	[HttpGet("_configuration/{clientId}")]
-	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
-	{
-		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-		return Ok(parameters);
-	}
+    [HttpGet("_configuration/{clientId}")]
+    public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+    {
+        var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+        return Ok(parameters);
+    }
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/OrdersController.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/OrdersController.cs
index 4cc7115e..308f3f64 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/OrdersController.cs
@@ -12,119 +12,119 @@ namespace BlazingPizza.Server;
 // [Authorize]
 public class OrdersController : Controller
 {
-	private readonly PizzaStoreContext _db;
-
-	public OrdersController(PizzaStoreContext db)
-	{
-		_db = db;
-	}
-
-	[HttpGet]
-	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-	{
-		var orders = await _db.Orders
-				.Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.OrderByDescending(o => o.CreatedTime)
-				.ToListAsync();
-
-		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-	}
-
-	[HttpGet("{orderId}")]
-	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-	{
-		var order = await _db.Orders
-				.Where(o => o.OrderId == orderId)
-				.Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.SingleOrDefaultAsync();
-
-		if (order == null)
-		{
-			return NotFound();
-		}
-
-		return OrderWithStatus.FromOrder(order);
-	}
-
-	[HttpPost]
-	public async Task<ActionResult<int>> PlaceOrder(Order order)
-	{
-		order.CreatedTime = DateTime.Now;
-		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-		order.UserId = GetUserId();
-
-		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
-		// in the database - prevent the submitter from making up
-		// new specials and toppings
-		foreach (var pizza in order.Pizzas)
-		{
-			pizza.SpecialId = pizza.Special.Id;
-			pizza.Special = null;
-
-			foreach (var topping in pizza.Toppings)
-			{
-				topping.ToppingId = topping.Topping.Id;
-				topping.Topping = null;
-			}
-		}
-
-		_db.Orders.Attach(order);
-		await _db.SaveChangesAsync();
-
-		// In the background, send push notifications if possible
-		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-		if (subscription != null)
-		{
-			_ = TrackAndSendNotificationsAsync(order, subscription);
-		}
-
-		return order.OrderId;
-	}
-
-	private string GetUserId()
-	{
-		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
-
-	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-	{
-		// In a realistic case, some other backend process would track
-		// order delivery progress and send us notifications when it
-		// changes. Since we don't have any such process here, fake it.
-		await Task.Delay(OrderWithStatus.PreparationDuration);
-		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-		await Task.Delay(OrderWithStatus.DeliveryDuration);
-		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-	}
-
-	private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-	{
-		// For a real application, generate your own
-		var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
-		var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
-
-		var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
-		var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
-		var webPushClient = new WebPushClient();
-		try
-		{
-			var payload = JsonSerializer.Serialize(new
-			{
-				message,
-				url = $"myorders/{order.OrderId}",
-			});
-			await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
-		}
-		catch (Exception ex)
-		{
-			Console.Error.WriteLine("Error sending push notification: " + ex.Message);
-		}
-	}
+    private readonly PizzaStoreContext _db;
+
+    public OrdersController(PizzaStoreContext db)
+    {
+        _db = db;
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+    {
+        var orders = await _db.Orders
+                .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .OrderByDescending(o => o.CreatedTime)
+                .ToListAsync();
+
+        return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+    }
+
+    [HttpGet("{orderId}")]
+    public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+    {
+        var order = await _db.Orders
+                .Where(o => o.OrderId == orderId)
+                .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .SingleOrDefaultAsync();
+
+        if (order == null)
+        {
+            return NotFound();
+        }
+
+        return OrderWithStatus.FromOrder(order);
+    }
+
+    [HttpPost]
+    public async Task<ActionResult<int>> PlaceOrder(Order order)
+    {
+        order.CreatedTime = DateTime.Now;
+        order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+        order.UserId = GetUserId();
+
+        // Enforce existence of Pizza.SpecialId and Topping.ToppingId
+        // in the database - prevent the submitter from making up
+        // new specials and toppings
+        foreach (var pizza in order.Pizzas)
+        {
+            pizza.SpecialId = pizza.Special.Id;
+            pizza.Special = null;
+
+            foreach (var topping in pizza.Toppings)
+            {
+                topping.ToppingId = topping.Topping.Id;
+                topping.Topping = null;
+            }
+        }
+
+        _db.Orders.Attach(order);
+        await _db.SaveChangesAsync();
+
+        // In the background, send push notifications if possible
+        var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+        if (subscription != null)
+        {
+            _ = TrackAndSendNotificationsAsync(order, subscription);
+        }
+
+        return order.OrderId;
+    }
+
+    private string GetUserId()
+    {
+        return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
+
+    private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+    {
+        // In a realistic case, some other backend process would track
+        // order delivery progress and send us notifications when it
+        // changes. Since we don't have any such process here, fake it.
+        await Task.Delay(OrderWithStatus.PreparationDuration);
+        await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+        await Task.Delay(OrderWithStatus.DeliveryDuration);
+        await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+    }
+
+    private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+    {
+        // For a real application, generate your own
+        var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
+        var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
+
+        var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
+        var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
+        var webPushClient = new WebPushClient();
+        try
+        {
+            var payload = JsonSerializer.Serialize(new
+            {
+                message,
+                url = $"myorders/{order.OrderId}",
+            });
+            await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
+        }
+        catch (Exception ex)
+        {
+            Console.Error.WriteLine("Error sending push notification: " + ex.Message);
+        }
+    }
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaApiExtensions.cs
index bf6b7bde..524ca759 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaApiExtensions.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -7,54 +7,51 @@ namespace BlazingPizza.Server;
 public static class PizzaApiExtensions
 {
 
-	public static WebApplication MapPizzaApi(this WebApplication app)
-	{
+    public static WebApplication MapPizzaApi(this WebApplication app)
+    {
 
-		// Subscribe to notifications
-		app.MapPut("/notifications/subscribe", [Authorize] async (
-			HttpContext context,
-			PizzaStoreContext db,
-			NotificationSubscription subscription) =>
-		{
+        // Subscribe to notifications
+        app.MapPut("/notifications/subscribe", [Authorize] async (
+            HttpContext context,
+            PizzaStoreContext db,
+            NotificationSubscription subscription) => {
 
-			// We're storing at most one subscription per user, so delete old ones.
-			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-			var userId = GetUserId(context);
-			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
-			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+                // We're storing at most one subscription per user, so delete old ones.
+                // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+                var userId = GetUserId(context);
+                var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+                db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
 
-			// Store new subscription
-			subscription.UserId = userId;
-			db.NotificationSubscriptions.Attach(subscription);
+                // Store new subscription
+                subscription.UserId = userId;
+                db.NotificationSubscriptions.Attach(subscription);
 
-			await db.SaveChangesAsync();
-			return Results.Ok(subscription);
+                await db.SaveChangesAsync();
+                return Results.Ok(subscription);
 
-		});
+            });
 
-		// Specials
-		app.MapGet("/specials", async (PizzaStoreContext db) =>
-		{
+        // Specials
+        app.MapGet("/specials", async (PizzaStoreContext db) => {
 
-			var specials = await db.Specials.ToListAsync();
-			return Results.Ok(specials);
+            var specials = await db.Specials.ToListAsync();
+            return Results.Ok(specials);
 
-		});
+        });
 
-		// Toppings
-		app.MapGet("/toppings", async (PizzaStoreContext db) =>
-		{
-			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
-			return Results.Ok(toppings);
-		});
+        // Toppings
+        app.MapGet("/toppings", async (PizzaStoreContext db) => {
+            var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+            return Results.Ok(toppings);
+        });
 
-		return app;
+        return app;
 
-	}
+    }
 
-	private static string GetUserId(HttpContext context)
-	{
-		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
+    private static string GetUserId(HttpContext context)
+    {
+        return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
 
 }
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreContext.cs
index 9a2e17ee..50ac87e4 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using Duende.IdentityServer.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
@@ -7,32 +7,32 @@ namespace BlazingPizza.Server;
 
 public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-	public PizzaStoreContext(
-			DbContextOptions options,
-			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-	{
-	}
+    public PizzaStoreContext(
+            DbContextOptions options,
+            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+    {
+    }
 
-	public DbSet<Order> Orders { get; set; }
+    public DbSet<Order> Orders { get; set; }
 
-	public DbSet<Pizza> Pizzas { get; set; }
+    public DbSet<Pizza> Pizzas { get; set; }
 
-	public DbSet<PizzaSpecial> Specials { get; set; }
+    public DbSet<PizzaSpecial> Specials { get; set; }
 
-	public DbSet<Topping> Toppings { get; set; }
+    public DbSet<Topping> Toppings { get; set; }
 
-	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+    public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
-	{
-		base.OnModelCreating(modelBuilder);
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
 
-		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
-		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+        // Configuring a many-to-many special -> topping relationship that is friendly for serialization
+        modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+        modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+        modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-		// Inline the Lat-Long pairs in Order rather than having a FK to another table
-		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-	}
+        // Inline the Lat-Long pairs in Order rather than having a FK to another table
+        modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+    }
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Program.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Program.cs
index 4484d8f7..b83debb4 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/Program.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/Program.cs
@@ -1,27 +1,27 @@
-using Microsoft.AspNetCore.Authentication;
+using BlazingPizza.Server;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.EntityFrameworkCore;
-using BlazingPizza.Server;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllersWithViews()
-	.AddJsonOptions(options =>  {
-		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
-	});
+    .AddJsonOptions(options => {
+        options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+    });
 builder.Services.AddRazorPages();
 
 builder.Services.AddDbContext<PizzaStoreContext>(options =>
-		options.UseSqlite("Data Source=pizza.db")
-			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+        options.UseSqlite("Data Source=pizza.db")
+            .UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
 
 builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-		.AddEntityFrameworkStores<PizzaStoreContext>();
+        .AddEntityFrameworkStores<PizzaStoreContext>();
 
 builder.Services.AddIdentityServer()
-		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+        .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
 
 builder.Services.AddAuthentication()
-		.AddIdentityServerJwt();
+        .AddIdentityServerJwt();
 
 var app = builder.Build();
 
@@ -29,11 +29,11 @@
 var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
 using (var scope = scopeFactory.CreateScope())
 {
-	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-	if (db.Database.EnsureCreated())
-	{
-		SeedData.Initialize(db);
-	}
+    var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+    if (db.Database.EnsureCreated())
+    {
+        SeedData.Initialize(db);
+    }
 }
 
 // Configure the HTTP request pipeline.
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/SeedData.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/SeedData.cs
index a1e47973..f02e2b77 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Server/SeedData.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Server/SeedData.cs
@@ -2,191 +2,191 @@
 
 public static class SeedData
 {
-	public static void Initialize(PizzaStoreContext db)
-	{
-		var toppings = new Topping[]
-		{
-			new Topping()
-			{
-					Name = "Extra cheese",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "American bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "British bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Canadian bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Tea and crumpets",
-					Price = 5.00m
-			},
-			new Topping()
-			{
-					Name = "Fresh-baked scones",
-					Price = 4.50m,
-			},
-			new Topping()
-			{
-					Name = "Bell peppers",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Onions",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Mushrooms",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Pepperoni",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Duck sausage",
-					Price = 3.20m,
-			},
-			new Topping()
-			{
-					Name = "Venison meatballs",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "Served on a silver platter",
-					Price = 250.99m,
-			},
-			new Topping()
-			{
-					Name = "Lobster on top",
-					Price = 64.50m,
-			},
-			new Topping()
-			{
-					Name = "Sturgeon caviar",
-					Price = 101.75m,
-			},
-			new Topping()
-			{
-					Name = "Artichoke hearts",
-					Price = 3.40m,
-			},
-			new Topping()
-			{
-					Name = "Fresh tomatoes",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Basil",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Steak (medium-rare)",
-					Price = 8.50m,
-			},
-			new Topping()
-			{
-					Name = "Blazing hot peppers",
-					Price = 4.20m,
-			},
-			new Topping()
-			{
-					Name = "Buffalo chicken",
-					Price = 5.00m,
-			},
-			new Topping()
-			{
-					Name = "Blue cheese",
-					Price = 2.50m,
-			},
-		};
+    public static void Initialize(PizzaStoreContext db)
+    {
+        var toppings = new Topping[]
+        {
+            new Topping()
+            {
+                    Name = "Extra cheese",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "American bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "British bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Canadian bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Tea and crumpets",
+                    Price = 5.00m
+            },
+            new Topping()
+            {
+                    Name = "Fresh-baked scones",
+                    Price = 4.50m,
+            },
+            new Topping()
+            {
+                    Name = "Bell peppers",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Onions",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Mushrooms",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Pepperoni",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Duck sausage",
+                    Price = 3.20m,
+            },
+            new Topping()
+            {
+                    Name = "Venison meatballs",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "Served on a silver platter",
+                    Price = 250.99m,
+            },
+            new Topping()
+            {
+                    Name = "Lobster on top",
+                    Price = 64.50m,
+            },
+            new Topping()
+            {
+                    Name = "Sturgeon caviar",
+                    Price = 101.75m,
+            },
+            new Topping()
+            {
+                    Name = "Artichoke hearts",
+                    Price = 3.40m,
+            },
+            new Topping()
+            {
+                    Name = "Fresh tomatoes",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Basil",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Steak (medium-rare)",
+                    Price = 8.50m,
+            },
+            new Topping()
+            {
+                    Name = "Blazing hot peppers",
+                    Price = 4.20m,
+            },
+            new Topping()
+            {
+                    Name = "Buffalo chicken",
+                    Price = 5.00m,
+            },
+            new Topping()
+            {
+                    Name = "Blue cheese",
+                    Price = 2.50m,
+            },
+        };
 
-		var specials = new PizzaSpecial[]
-		{
-			new PizzaSpecial()
-			{
-					Name = "Basic Cheese Pizza",
-					Description = "It's cheesy and delicious. Why wouldn't you want one?",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/cheese.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 2,
-					Name = "The Baconatorizor",
-					Description = "It has EVERY kind of bacon",
-					BasePrice = 11.99m,
-					ImageUrl = "img/pizzas/bacon.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 3,
-					Name = "Classic pepperoni",
-					Description = "It's the pizza you grew up with, but Blazing hot!",
-					BasePrice = 10.50m,
-					ImageUrl = "img/pizzas/pepperoni.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 4,
-					Name = "Buffalo chicken",
-					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-					BasePrice = 12.75m,
-					ImageUrl = "img/pizzas/meaty.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 5,
-					Name = "Mushroom Lovers",
-					Description = "It has mushrooms. Isn't that obvious?",
-					BasePrice = 11.00m,
-					ImageUrl = "img/pizzas/mushroom.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 6,
-					Name = "The Brit",
-					Description = "When in London...",
-					BasePrice = 10.25m,
-					ImageUrl = "img/pizzas/brit.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 7,
-					Name = "Veggie Delight",
-					Description = "It's like salad, but on a pizza",
-					BasePrice = 11.50m,
-					ImageUrl = "img/pizzas/salad.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 8,
-					Name = "Margherita",
-					Description = "Traditional Italian pizza with tomatoes and basil",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/margherita.jpg",
-			},
-		};
+        var specials = new PizzaSpecial[]
+        {
+            new PizzaSpecial()
+            {
+                    Name = "Basic Cheese Pizza",
+                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/cheese.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 2,
+                    Name = "The Baconatorizor",
+                    Description = "It has EVERY kind of bacon",
+                    BasePrice = 11.99m,
+                    ImageUrl = "img/pizzas/bacon.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 3,
+                    Name = "Classic pepperoni",
+                    Description = "It's the pizza you grew up with, but Blazing hot!",
+                    BasePrice = 10.50m,
+                    ImageUrl = "img/pizzas/pepperoni.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 4,
+                    Name = "Buffalo chicken",
+                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+                    BasePrice = 12.75m,
+                    ImageUrl = "img/pizzas/meaty.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 5,
+                    Name = "Mushroom Lovers",
+                    Description = "It has mushrooms. Isn't that obvious?",
+                    BasePrice = 11.00m,
+                    ImageUrl = "img/pizzas/mushroom.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 6,
+                    Name = "The Brit",
+                    Description = "When in London...",
+                    BasePrice = 10.25m,
+                    ImageUrl = "img/pizzas/brit.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 7,
+                    Name = "Veggie Delight",
+                    Description = "It's like salad, but on a pizza",
+                    BasePrice = 11.50m,
+                    ImageUrl = "img/pizzas/salad.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 8,
+                    Name = "Margherita",
+                    Description = "Traditional Italian pizza with tomatoes and basil",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/margherita.jpg",
+            },
+        };
 
-		db.Toppings.AddRange(toppings);
-		db.Specials.AddRange(specials);
-		db.SaveChanges();
-	}
+        db.Toppings.AddRange(toppings);
+        db.Specials.AddRange(specials);
+        db.SaveChanges();
+    }
 }
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/Address.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/Address.cs
index 63f1e167..309438b7 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/Address.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/Address.cs
@@ -4,23 +4,23 @@ namespace BlazingPizza;
 
 public class Address
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Name { get; set; }
+    [Required, MaxLength(100)]
+    public string Name { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Line1 { get; set; }
+    [Required, MaxLength(100)]
+    public string Line1 { get; set; }
 
-	[MaxLength(100)]
-	public string Line2 { get; set; }
+    [MaxLength(100)]
+    public string Line2 { get; set; }
 
-	[Required, MaxLength(50)]
-	public string City { get; set; }
+    [Required, MaxLength(50)]
+    public string City { get; set; }
 
-	[Required, MaxLength(20)]
-	public string Region { get; set; }
+    [Required, MaxLength(20)]
+    public string Region { get; set; }
 
-	[Required, MaxLength(20)]
-	public string PostalCode { get; set; }
+    [Required, MaxLength(20)]
+    public string PostalCode { get; set; }
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/LatLong.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/LatLong.cs
index 14a94c26..a65971f8 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/LatLong.cs
@@ -2,25 +2,25 @@
 
 public class LatLong
 {
-	public LatLong()
-	{
-	}
+    public LatLong()
+    {
+    }
 
-	public LatLong(double latitude, double longitude) : this()
-	{
-		Latitude = latitude;
-		Longitude = longitude;
-	}
+    public LatLong(double latitude, double longitude) : this()
+    {
+        Latitude = latitude;
+        Longitude = longitude;
+    }
 
-	public double Latitude { get; set; }
+    public double Latitude { get; set; }
 
-	public double Longitude { get; set; }
+    public double Longitude { get; set; }
 
-	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-	{
-		// The Earth is flat, right? So no need for spherical interpolation.
-		return new LatLong(
-				start.Latitude + (end.Latitude - start.Latitude) * proportion,
-				start.Longitude + (end.Longitude - start.Longitude) * proportion);
-	}
+    public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+    {
+        // The Earth is flat, right? So no need for spherical interpolation.
+        return new LatLong(
+                start.Latitude + (end.Latitude - start.Latitude) * proportion,
+                start.Longitude + (end.Longitude - start.Longitude) * proportion);
+    }
 }
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/NotificationSubscription.cs
index 9109ff57..5c99e3f4 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/NotificationSubscription.cs
@@ -2,13 +2,13 @@
 
 public class NotificationSubscription
 {
-	public int NotificationSubscriptionId { get; set; }
+    public int NotificationSubscriptionId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public string Url { get; set; }
+    public string Url { get; set; }
 
-	public string P256dh { get; set; }
+    public string P256dh { get; set; }
 
-	public string Auth { get; set; }
+    public string Auth { get; set; }
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/Order.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/Order.cs
index aca04ca1..b47efad0 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/Order.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/Order.cs
@@ -4,21 +4,21 @@ namespace BlazingPizza;
 
 public class Order
 {
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public DateTime CreatedTime { get; set; }
+    public DateTime CreatedTime { get; set; }
 
-	public Address DeliveryAddress { get; set; } = new Address();
+    public Address DeliveryAddress { get; set; } = new Address();
 
-	public LatLong DeliveryLocation { get; set; }
+    public LatLong DeliveryLocation { get; set; }
 
-	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+    public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+    public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
+    public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
@@ -29,4 +29,4 @@ public class Order
 [JsonSerializable(typeof(List<PizzaSpecial>))]
 [JsonSerializable(typeof(List<Topping>))]
 [JsonSerializable(typeof(Topping))]
-public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class OrderContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/OrderWithStatus.cs
index f5f153b6..fbfac7af 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/OrderWithStatus.cs
@@ -6,73 +6,73 @@ namespace BlazingPizza;
 
 public class OrderWithStatus
 {
-	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+    public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+    public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 
-	public string StatusText { get; set; }
+    public string StatusText { get; set; }
 
-	public bool IsDelivered => StatusText == "Delivered";
+    public bool IsDelivered => StatusText == "Delivered";
 
-	public List<Marker> MapMarkers { get; set; }
+    public List<Marker> MapMarkers { get; set; }
 
-	public static OrderWithStatus FromOrder(Order order)
-	{
-		// To simulate a real backend process, we fake status updates based on the amount
-		// of time since the order was placed
-		string statusText;
-		List<Marker> mapMarkers;
-		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+    public static OrderWithStatus FromOrder(Order order)
+    {
+        // To simulate a real backend process, we fake status updates based on the amount
+        // of time since the order was placed
+        string statusText;
+        List<Marker> mapMarkers;
+        var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-		if (DateTime.Now < dispatchTime)
-		{
-			statusText = "Preparing";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-								};
-		}
-		else if (DateTime.Now < dispatchTime + DeliveryDuration)
-		{
-			statusText = "Out for delivery";
+        if (DateTime.Now < dispatchTime)
+        {
+            statusText = "Preparing";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+                                };
+        }
+        else if (DateTime.Now < dispatchTime + DeliveryDuration)
+        {
+            statusText = "Out for delivery";
 
-			var startPosition = ComputeStartPosition(order);
-			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation),
-										ToMapMarker("Driver", driverPosition, showPopup: true),
-								};
-		}
-		else
-		{
-			statusText = "Delivered";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-								};
-		}
+            var startPosition = ComputeStartPosition(order);
+            var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+            var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation),
+                                        ToMapMarker("Driver", driverPosition, showPopup: true),
+                                };
+        }
+        else
+        {
+            statusText = "Delivered";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+                                };
+        }
 
-		return new OrderWithStatus
-		{
-			Order = order,
-			StatusText = statusText,
-			MapMarkers = mapMarkers,
-		};
-	}
+        return new OrderWithStatus
+        {
+            Order = order,
+            StatusText = statusText,
+            MapMarkers = mapMarkers,
+        };
+    }
 
-	private static LatLong ComputeStartPosition(Order order)
-	{
-		// Random but deterministic based on order ID
-		var rng = new Random(order.OrderId);
-		var distance = 0.01 + rng.NextDouble() * 0.02;
-		var angle = rng.NextDouble() * Math.PI * 2;
-		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-	}
+    private static LatLong ComputeStartPosition(Order order)
+    {
+        // Random but deterministic based on order ID
+        var rng = new Random(order.OrderId);
+        var distance = 0.01 + rng.NextDouble() * 0.02;
+        var angle = rng.NextDouble() * Math.PI * 2;
+        var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+        return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+    }
 
-	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+    static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
 }
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/Pizza.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/Pizza.cs
index 459298f4..2a7a1c29 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/Pizza.cs
@@ -7,38 +7,38 @@ namespace BlazingPizza;
 /// </summary>
 public class Pizza
 {
-	public const int DefaultSize = 12;
-	public const int MinimumSize = 9;
-	public const int MaximumSize = 17;
+    public const int DefaultSize = 12;
+    public const int MinimumSize = 9;
+    public const int MaximumSize = 17;
 
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public PizzaSpecial Special { get; set; }
+    public PizzaSpecial Special { get; set; }
 
-	public int SpecialId { get; set; }
+    public int SpecialId { get; set; }
 
-	public int Size { get; set; }
+    public int Size { get; set; }
 
-	public List<PizzaTopping> Toppings { get; set; }
+    public List<PizzaTopping> Toppings { get; set; }
 
-	public decimal GetBasePrice()
-	{
-		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-	}
+    public decimal GetBasePrice()
+    {
+        return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+    }
 
-	public decimal GetTotalPrice()
-	{
-		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-	}
+    public decimal GetTotalPrice()
+    {
+        return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+    }
 
-	public string GetFormattedTotalPrice()
-	{
-		return GetTotalPrice().ToString("0.00");
-	}
+    public string GetFormattedTotalPrice()
+    {
+        return GetTotalPrice().ToString("0.00");
+    }
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
 [JsonSerializable(typeof(Pizza))]
-public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class PizzaContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaSpecial.cs
index 9653300c..1fd9006a 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaSpecial.cs
@@ -5,15 +5,15 @@
 /// </summary>
 public class PizzaSpecial
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal BasePrice { get; set; }
+    public decimal BasePrice { get; set; }
 
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public string ImageUrl { get; set; }
+    public string ImageUrl { get; set; }
 
-	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+    public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
 }
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaTopping.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaTopping.cs
index 0a711647..1c062732 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/PizzaTopping.cs
@@ -2,10 +2,10 @@
 
 public class PizzaTopping
 {
-	public Topping Topping { get; set; }
+    public Topping Topping { get; set; }
 
-	public int ToppingId { get; set; }
+    public int ToppingId { get; set; }
+
+    public int PizzaId { get; set; }
 
-	public int PizzaId { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/Topping.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/Topping.cs
index 376c311a..4eb67ae9 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/Topping.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/Topping.cs
@@ -2,12 +2,12 @@
 
 public class Topping
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal Price { get; set; }
+    public decimal Price { get; set; }
+
+    public string GetFormattedPrice() => Price.ToString("0.00");
 
-	public string GetFormattedPrice() => Price.ToString("0.00");
-	
 }
\ No newline at end of file
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Shared/UserInfo.cs b/save-points/04-refactor-state-management/BlazingPizza.Shared/UserInfo.cs
index 362f8f8e..babb4315 100644
--- a/save-points/04-refactor-state-management/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/04-refactor-state-management/BlazingPizza.Shared/UserInfo.cs
@@ -2,8 +2,8 @@
 
 public class UserInfo
 {
-	public bool IsAuthenticated { get; set; }
+    public bool IsAuthenticated { get; set; }
+
+    public string Name { get; set; }
 
-	public string Name { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj
index 44802d79..1847e754 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -14,7 +14,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\BlazingComponents\BlazingComponents.csproj" />
     <ProjectReference Include="..\BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj" />
     <ProjectReference Include="..\BlazingPizza.Shared\BlazingPizza.Shared.csproj" />
   </ItemGroup>
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/OrderState.cs b/save-points/05-checkout-with-validation/BlazingPizza.Client/OrderState.cs
index 4f47979d..00dd3627 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/OrderState.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/OrderState.cs
@@ -2,51 +2,51 @@
 
 public class OrderState
 {
-	public bool ShowingConfigureDialog { get; private set; }
-
-	public Pizza ConfiguringPizza { get; private set; }
-
-	public Order Order { get; private set; } = new Order();
-
-	public void ShowConfigurePizzaDialog(PizzaSpecial special)
-	{
-		ConfiguringPizza = new Pizza()
-		{
-			Special = special,
-			SpecialId = special.Id,
-			Size = Pizza.DefaultSize,
-			Toppings = new List<PizzaTopping>(),
-		};
-
-		ShowingConfigureDialog = true;
-	}
-
-	public void CancelConfigurePizzaDialog()
-	{
-		ConfiguringPizza = null;
-		ShowingConfigureDialog = false;
-	}
-
-	public void ConfirmConfigurePizzaDialog()
-	{
-		Order.Pizzas.Add(ConfiguringPizza);
-		ConfiguringPizza = null;
-
-		ShowingConfigureDialog = false;
-	}
-
-	public void RemoveConfiguredPizza(Pizza pizza)
-	{
-		Order.Pizzas.Remove(pizza);
-	}
-
-	public void ResetOrder()
-	{
-		Order = new Order();
-	}
-
-	public void ReplaceOrder(Order order)
-	{
-		Order = order;
-	}
+    public bool ShowingConfigureDialog { get; private set; }
+
+    public Pizza ConfiguringPizza { get; private set; }
+
+    public Order Order { get; private set; } = new Order();
+
+    public void ShowConfigurePizzaDialog(PizzaSpecial special)
+    {
+        ConfiguringPizza = new Pizza()
+        {
+            Special = special,
+            SpecialId = special.Id,
+            Size = Pizza.DefaultSize,
+            Toppings = new List<PizzaTopping>(),
+        };
+
+        ShowingConfigureDialog = true;
+    }
+
+    public void CancelConfigurePizzaDialog()
+    {
+        ConfiguringPizza = null;
+        ShowingConfigureDialog = false;
+    }
+
+    public void ConfirmConfigurePizzaDialog()
+    {
+        Order.Pizzas.Add(ConfiguringPizza);
+        ConfiguringPizza = null;
+
+        ShowingConfigureDialog = false;
+    }
+
+    public void RemoveConfiguredPizza(Pizza pizza)
+    {
+        Order.Pizzas.Remove(pizza);
+    }
+
+    public void ResetOrder()
+    {
+        Order = new Order();
+    }
+
+    public void ReplaceOrder(Order order)
+    {
+        Order = order;
+    }
 }
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs b/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs
index 031ebc57..97ace491 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Client/Program.cs
@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using BlazingPizza.Client;
+using BlazingPizza.Client;
 using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index bb84f13c..be8226ec 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -4,12 +4,12 @@ namespace BlazingPizza.ComponentsLibrary;
 
 public static class LocalStorage
 {
-	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+    public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+    public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+    public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
 }
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index a8e78f2a..b067719c 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -2,11 +2,11 @@
 
 public class Marker
 {
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public double X { get; set; }
+    public double X { get; set; }
 
-	public double Y { get; set; }
+    public double Y { get; set; }
 
-	public bool ShowPopup { get; set; }
+    public bool ShowPopup { get; set; }
 }
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 349046d4..34194163 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -2,7 +2,7 @@
 
 public class Point
 {
-	public double X { get; set; }
+    public double X { get; set; }
 
-	public double Y { get; set; }
+    public double Y { get; set; }
 }
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/AddressEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/AddressEntityType.cs
new file mode 100644
index 00000000..82db81b6
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/AddressEntityType.cs
@@ -0,0 +1,92 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class AddressEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Address",
+                typeof(Address),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Address).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var city = runtimeEntityType.AddProperty(
+                "City",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("City", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<City>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var line1 = runtimeEntityType.AddProperty(
+                "Line1",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var line2 = runtimeEntityType.AddProperty(
+                "Line2",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Line2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Line2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var postalCode = runtimeEntityType.AddProperty(
+                "PostalCode",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("PostalCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<PostalCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var region = runtimeEntityType.AddProperty(
+                "Region",
+                typeof(string),
+                propertyInfo: typeof(Address).GetProperty("Region", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Address).GetField("<Region>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 20);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Address");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
new file mode 100644
index 00000000..1dd4563b
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/DeviceFlowCodesEntityType.cs
@@ -0,0 +1,114 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class DeviceFlowCodesEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.DeviceFlowCodes",
+                typeof(DeviceFlowCodes),
+                baseEntityType);
+
+            var userCode = runtimeEntityType.AddProperty(
+                "UserCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("UserCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<UserCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var deviceCode = runtimeEntityType.AddProperty(
+                "DeviceCode",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("DeviceCode", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<DeviceCode>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(DeviceFlowCodes).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(DeviceFlowCodes).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userCode });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deviceCode },
+                unique: true);
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DeviceCodes");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
new file mode 100644
index 00000000..8946b261
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityRoleClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>",
+                typeof(IdentityRoleClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityRoleClaim<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRoleClaim<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoleClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityRoleEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
new file mode 100644
index 00000000..2f1fec2b
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityRoleEntityType.cs
@@ -0,0 +1,78 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityRoleEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityRole",
+                typeof(IdentityRole),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedName = runtimeEntityType.AddProperty(
+                "NormalizedName",
+                typeof(string),
+                propertyInfo: typeof(IdentityRole<string>).GetProperty("NormalizedName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityRole<string>).GetField("<NormalizedName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedName },
+                unique: true);
+            index.AddAnnotation("Relational:Name", "RoleNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
new file mode 100644
index 00000000..55418a1e
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserClaimstringEntityType.cs
@@ -0,0 +1,85 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserClaimstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserClaim<string>",
+                typeof(IdentityUserClaim<string>),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var claimType = runtimeEntityType.AddProperty(
+                "ClaimType",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimType", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimType>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var claimValue = runtimeEntityType.AddProperty(
+                "ClaimValue",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("ClaimValue", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<ClaimValue>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserClaim<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserClaim<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserClaims");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
new file mode 100644
index 00000000..3ca029bd
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserLoginstringEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserLoginstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserLogin<string>",
+                typeof(IdentityUserLogin<string>),
+                baseEntityType);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerKey = runtimeEntityType.AddProperty(
+                "ProviderKey",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderKey", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderKey>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var providerDisplayName = runtimeEntityType.AddProperty(
+                "ProviderDisplayName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("ProviderDisplayName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<ProviderDisplayName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserLogin<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserLogin<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { loginProvider, providerKey });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { userId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserLogins");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
new file mode 100644
index 00000000..70078d7a
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserRolestringEntityType.cs
@@ -0,0 +1,82 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserRolestringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserRole<string>",
+                typeof(IdentityUserRole<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var roleId = runtimeEntityType.AddProperty(
+                "RoleId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserRole<string>).GetProperty("RoleId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserRole<string>).GetField("<RoleId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, roleId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { roleId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("RoleId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserRoles");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
new file mode 100644
index 00000000..93ba6d31
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/IdentityUserTokenstringEntityType.cs
@@ -0,0 +1,84 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class IdentityUserTokenstringEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.AspNetCore.Identity.IdentityUserToken<string>",
+                typeof(IdentityUserToken<string>),
+                baseEntityType);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var loginProvider = runtimeEntityType.AddProperty(
+                "LoginProvider",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("LoginProvider", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<LoginProvider>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 128);
+
+            var value = runtimeEntityType.AddProperty(
+                "Value",
+                typeof(string),
+                propertyInfo: typeof(IdentityUserToken<string>).GetProperty("Value", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUserToken<string>).GetField("<Value>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { userId, loginProvider, name });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("UserId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUserTokens");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/KeyEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/KeyEntityType.cs
new file mode 100644
index 00000000..f6c6b4c7
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/KeyEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class KeyEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.Key",
+                typeof(Key),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var algorithm = runtimeEntityType.AddProperty(
+                "Algorithm",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Algorithm", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Algorithm>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 100);
+
+            var created = runtimeEntityType.AddProperty(
+                "Created",
+                typeof(DateTime),
+                propertyInfo: typeof(Key).GetProperty("Created", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Created>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var dataProtected = runtimeEntityType.AddProperty(
+                "DataProtected",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("DataProtected", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<DataProtected>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var isX509Certificate = runtimeEntityType.AddProperty(
+                "IsX509Certificate",
+                typeof(bool),
+                propertyInfo: typeof(Key).GetProperty("IsX509Certificate", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<IsX509Certificate>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var use = runtimeEntityType.AddProperty(
+                "Use",
+                typeof(string),
+                propertyInfo: typeof(Key).GetProperty("Use", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Use>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var version = runtimeEntityType.AddProperty(
+                "Version",
+                typeof(int),
+                propertyInfo: typeof(Key).GetProperty("Version", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Key).GetField("<Version>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { use });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Keys");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/LatLongEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/LatLongEntityType.cs
new file mode 100644
index 00000000..3fd254bd
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/LatLongEntityType.cs
@@ -0,0 +1,80 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class LatLongEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.LatLong",
+                typeof(LatLong),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var latitude = runtimeEntityType.AddProperty(
+                "Latitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Latitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Latitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var longitude = runtimeEntityType.AddProperty(
+                "Longitude",
+                typeof(double),
+                propertyInfo: typeof(LatLong).GetProperty("Longitude", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(LatLong).GetField("<Longitude>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                ownership: true);
+
+            var deliveryLocation = principalEntityType.AddNavigation("DeliveryLocation",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(LatLong),
+                propertyInfo: typeof(Order).GetProperty("DeliveryLocation", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryLocation>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
new file mode 100644
index 00000000..db236e4c
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/NotificationSubscriptionEntityType.cs
@@ -0,0 +1,77 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class NotificationSubscriptionEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.NotificationSubscription",
+                typeof(NotificationSubscription),
+                baseEntityType);
+
+            var notificationSubscriptionId = runtimeEntityType.AddProperty(
+                "NotificationSubscriptionId",
+                typeof(int),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("NotificationSubscriptionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<NotificationSubscriptionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var auth = runtimeEntityType.AddProperty(
+                "Auth",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Auth", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Auth>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var p256dh = runtimeEntityType.AddProperty(
+                "P256dh",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("P256dh", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<P256dh>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var url = runtimeEntityType.AddProperty(
+                "Url",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("Url", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<Url>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(NotificationSubscription).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(NotificationSubscription).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { notificationSubscriptionId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "NotificationSubscriptions");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/OrderEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/OrderEntityType.cs
new file mode 100644
index 00000000..9d9ec6fd
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/OrderEntityType.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class OrderEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Order",
+                typeof(Order),
+                baseEntityType);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Order).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var createdTime = runtimeEntityType.AddProperty(
+                "CreatedTime",
+                typeof(DateTime),
+                propertyInfo: typeof(Order).GetProperty("CreatedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<CreatedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var deliveryAddressId = runtimeEntityType.AddProperty(
+                "DeliveryAddressId",
+                typeof(int?),
+                nullable: true);
+
+            var userId = runtimeEntityType.AddProperty(
+                "UserId",
+                typeof(string),
+                propertyInfo: typeof(Order).GetProperty("UserId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<UserId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { orderId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { deliveryAddressId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("DeliveryAddressId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var deliveryAddress = declaringEntityType.AddNavigation("DeliveryAddress",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Address),
+                propertyInfo: typeof(Order).GetProperty("DeliveryAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<DeliveryAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Orders");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PersistedGrantEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
new file mode 100644
index 00000000..842d53a5
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PersistedGrantEntityType.cs
@@ -0,0 +1,127 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Duende.IdentityServer.EntityFramework.Entities;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PersistedGrantEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Duende.IdentityServer.EntityFramework.Entities.PersistedGrant",
+                typeof(PersistedGrant),
+                baseEntityType);
+
+            var key = runtimeEntityType.AddProperty(
+                "Key",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Key", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Key>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 200);
+
+            var clientId = runtimeEntityType.AddProperty(
+                "ClientId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ClientId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ClientId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 200);
+
+            var consumedTime = runtimeEntityType.AddProperty(
+                "ConsumedTime",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("ConsumedTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<ConsumedTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var creationTime = runtimeEntityType.AddProperty(
+                "CreationTime",
+                typeof(DateTime),
+                propertyInfo: typeof(PersistedGrant).GetProperty("CreationTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<CreationTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Data", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50000);
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var expiration = runtimeEntityType.AddProperty(
+                "Expiration",
+                typeof(DateTime?),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Expiration", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Expiration>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var sessionId = runtimeEntityType.AddProperty(
+                "SessionId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SessionId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SessionId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 100);
+
+            var subjectId = runtimeEntityType.AddProperty(
+                "SubjectId",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("SubjectId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<SubjectId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 200);
+
+            var type = runtimeEntityType.AddProperty(
+                "Type",
+                typeof(string),
+                propertyInfo: typeof(PersistedGrant).GetProperty("Type", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PersistedGrant).GetField("<Type>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                maxLength: 50);
+
+            var key0 = runtimeEntityType.AddKey(
+                new[] { key });
+            runtimeEntityType.SetPrimaryKey(key0);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { consumedTime });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { expiration });
+
+            var index1 = runtimeEntityType.AddIndex(
+                new[] { subjectId, clientId, type });
+
+            var index2 = runtimeEntityType.AddIndex(
+                new[] { subjectId, sessionId, type });
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PersistedGrants");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaEntityType.cs
new file mode 100644
index 00000000..3a124e63
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaEntityType.cs
@@ -0,0 +1,111 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Pizza",
+                typeof(Pizza),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var orderId = runtimeEntityType.AddProperty(
+                "OrderId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("OrderId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<OrderId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var size = runtimeEntityType.AddProperty(
+                "Size",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("Size", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Size>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var specialId = runtimeEntityType.AddProperty(
+                "SpecialId",
+                typeof(int),
+                propertyInfo: typeof(Pizza).GetProperty("SpecialId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<SpecialId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { orderId });
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { specialId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("OrderId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("OrderId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var pizzas = principalEntityType.AddNavigation("Pizzas",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<Pizza>),
+                propertyInfo: typeof(Order).GetProperty("Pizzas", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Order).GetField("<Pizzas>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("SpecialId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var special = declaringEntityType.AddNavigation("Special",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(PizzaSpecial),
+                propertyInfo: typeof(Pizza).GetProperty("Special", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Special>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Pizzas");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
new file mode 100644
index 00000000..e86b0f50
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaSpecialEntityType.cs
@@ -0,0 +1,76 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaSpecialEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaSpecial",
+                typeof(PizzaSpecial),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var basePrice = runtimeEntityType.AddProperty(
+                "BasePrice",
+                typeof(decimal),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("BasePrice", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<BasePrice>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var description = runtimeEntityType.AddProperty(
+                "Description",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Description", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Description>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var imageUrl = runtimeEntityType.AddProperty(
+                "ImageUrl",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("ImageUrl", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<ImageUrl>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(PizzaSpecial).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaSpecial).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Specials");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaStoreContextModel.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
new file mode 100644
index 00000000..8b516a68
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaStoreContextModel.cs
@@ -0,0 +1,28 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    [DbContext(typeof(PizzaStoreContext))]
+    public partial class PizzaStoreContextModel : RuntimeModel
+    {
+        static PizzaStoreContextModel()
+        {
+            var model = new PizzaStoreContextModel();
+            model.Initialize();
+            model.Customize();
+            _instance = model;
+        }
+
+        private static PizzaStoreContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
new file mode 100644
index 00000000..d46f50f4
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaStoreContextModelBuilder.cs
@@ -0,0 +1,69 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    public partial class PizzaStoreContextModel
+    {
+        partial void Initialize()
+        {
+            var address = AddressEntityType.Create(this);
+            var latLong = LatLongEntityType.Create(this);
+            var notificationSubscription = NotificationSubscriptionEntityType.Create(this);
+            var order = OrderEntityType.Create(this);
+            var pizza = PizzaEntityType.Create(this);
+            var pizzaSpecial = PizzaSpecialEntityType.Create(this);
+            var pizzaTopping = PizzaToppingEntityType.Create(this);
+            var pizzaStoreUser = PizzaStoreUserEntityType.Create(this);
+            var topping = ToppingEntityType.Create(this);
+            var deviceFlowCodes = DeviceFlowCodesEntityType.Create(this);
+            var key = KeyEntityType.Create(this);
+            var persistedGrant = PersistedGrantEntityType.Create(this);
+            var identityRole = IdentityRoleEntityType.Create(this);
+            var identityRoleClaimstring = IdentityRoleClaimstringEntityType.Create(this);
+            var identityUserClaimstring = IdentityUserClaimstringEntityType.Create(this);
+            var identityUserLoginstring = IdentityUserLoginstringEntityType.Create(this);
+            var identityUserRolestring = IdentityUserRolestringEntityType.Create(this);
+            var identityUserTokenstring = IdentityUserTokenstringEntityType.Create(this);
+
+            LatLongEntityType.CreateForeignKey1(latLong, order);
+            OrderEntityType.CreateForeignKey1(order, address);
+            PizzaEntityType.CreateForeignKey1(pizza, order);
+            PizzaEntityType.CreateForeignKey2(pizza, pizzaSpecial);
+            PizzaToppingEntityType.CreateForeignKey1(pizzaTopping, pizza);
+            PizzaToppingEntityType.CreateForeignKey2(pizzaTopping, topping);
+            IdentityRoleClaimstringEntityType.CreateForeignKey1(identityRoleClaimstring, identityRole);
+            IdentityUserClaimstringEntityType.CreateForeignKey1(identityUserClaimstring, pizzaStoreUser);
+            IdentityUserLoginstringEntityType.CreateForeignKey1(identityUserLoginstring, pizzaStoreUser);
+            IdentityUserRolestringEntityType.CreateForeignKey1(identityUserRolestring, identityRole);
+            IdentityUserRolestringEntityType.CreateForeignKey2(identityUserRolestring, pizzaStoreUser);
+            IdentityUserTokenstringEntityType.CreateForeignKey1(identityUserTokenstring, pizzaStoreUser);
+
+            AddressEntityType.CreateAnnotations(address);
+            LatLongEntityType.CreateAnnotations(latLong);
+            NotificationSubscriptionEntityType.CreateAnnotations(notificationSubscription);
+            OrderEntityType.CreateAnnotations(order);
+            PizzaEntityType.CreateAnnotations(pizza);
+            PizzaSpecialEntityType.CreateAnnotations(pizzaSpecial);
+            PizzaToppingEntityType.CreateAnnotations(pizzaTopping);
+            PizzaStoreUserEntityType.CreateAnnotations(pizzaStoreUser);
+            ToppingEntityType.CreateAnnotations(topping);
+            DeviceFlowCodesEntityType.CreateAnnotations(deviceFlowCodes);
+            KeyEntityType.CreateAnnotations(key);
+            PersistedGrantEntityType.CreateAnnotations(persistedGrant);
+            IdentityRoleEntityType.CreateAnnotations(identityRole);
+            IdentityRoleClaimstringEntityType.CreateAnnotations(identityRoleClaimstring);
+            IdentityUserClaimstringEntityType.CreateAnnotations(identityUserClaimstring);
+            IdentityUserLoginstringEntityType.CreateAnnotations(identityUserLoginstring);
+            IdentityUserRolestringEntityType.CreateAnnotations(identityUserRolestring);
+            IdentityUserTokenstringEntityType.CreateAnnotations(identityUserTokenstring);
+
+            AddAnnotation("ProductVersion", "6.0.0");
+        }
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
new file mode 100644
index 00000000..18b2d96d
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaStoreUserEntityType.cs
@@ -0,0 +1,156 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaStoreUserEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Server.PizzaStoreUser",
+                typeof(PizzaStoreUser),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var accessFailedCount = runtimeEntityType.AddProperty(
+                "AccessFailedCount",
+                typeof(int),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("AccessFailedCount", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<AccessFailedCount>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var concurrencyStamp = runtimeEntityType.AddProperty(
+                "ConcurrencyStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("ConcurrencyStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<ConcurrencyStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                concurrencyToken: true);
+
+            var email = runtimeEntityType.AddProperty(
+                "Email",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("Email", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<Email>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var emailConfirmed = runtimeEntityType.AddProperty(
+                "EmailConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("EmailConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<EmailConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnabled = runtimeEntityType.AddProperty(
+                "LockoutEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var lockoutEnd = runtimeEntityType.AddProperty(
+                "LockoutEnd",
+                typeof(DateTimeOffset?),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("LockoutEnd", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<LockoutEnd>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var normalizedEmail = runtimeEntityType.AddProperty(
+                "NormalizedEmail",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedEmail", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedEmail>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var normalizedUserName = runtimeEntityType.AddProperty(
+                "NormalizedUserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("NormalizedUserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<NormalizedUserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var passwordHash = runtimeEntityType.AddProperty(
+                "PasswordHash",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PasswordHash", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PasswordHash>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumber = runtimeEntityType.AddProperty(
+                "PhoneNumber",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumber", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumber>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var phoneNumberConfirmed = runtimeEntityType.AddProperty(
+                "PhoneNumberConfirmed",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("PhoneNumberConfirmed", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<PhoneNumberConfirmed>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var securityStamp = runtimeEntityType.AddProperty(
+                "SecurityStamp",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("SecurityStamp", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<SecurityStamp>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var twoFactorEnabled = runtimeEntityType.AddProperty(
+                "TwoFactorEnabled",
+                typeof(bool),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("TwoFactorEnabled", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<TwoFactorEnabled>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var userName = runtimeEntityType.AddProperty(
+                "UserName",
+                typeof(string),
+                propertyInfo: typeof(IdentityUser<string>).GetProperty("UserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(IdentityUser<string>).GetField("<UserName>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 256);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { normalizedEmail });
+            index.AddAnnotation("Relational:Name", "EmailIndex");
+
+            var index0 = runtimeEntityType.AddIndex(
+                new[] { normalizedUserName },
+                unique: true);
+            index0.AddAnnotation("Relational:Name", "UserNameIndex");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "AspNetUsers");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaToppingEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
new file mode 100644
index 00000000..b97d2a24
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/PizzaToppingEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class PizzaToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.PizzaTopping",
+                typeof(PizzaTopping),
+                baseEntityType);
+
+            var pizzaId = runtimeEntityType.AddProperty(
+                "PizzaId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("PizzaId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<PizzaId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var toppingId = runtimeEntityType.AddProperty(
+                "ToppingId",
+                typeof(int),
+                propertyInfo: typeof(PizzaTopping).GetProperty("ToppingId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<ToppingId>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { pizzaId, toppingId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { toppingId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PizzaId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var toppings = principalEntityType.AddNavigation("Toppings",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(List<PizzaTopping>),
+                propertyInfo: typeof(Pizza).GetProperty("Toppings", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Pizza).GetField("<Toppings>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("ToppingId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            var topping = declaringEntityType.AddNavigation("Topping",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(Topping),
+                propertyInfo: typeof(PizzaTopping).GetProperty("Topping", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(PizzaTopping).GetField("<Topping>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PizzaTopping");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/ToppingEntityType.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/ToppingEntityType.cs
new file mode 100644
index 00000000..9295f9bf
--- /dev/null
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Models/ToppingEntityType.cs
@@ -0,0 +1,62 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace BlazingPizza.Server.Models
+{
+    internal partial class ToppingEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "BlazingPizza.Topping",
+                typeof(Topping),
+                baseEntityType);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                propertyInfo: typeof(Topping).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+
+            var name = runtimeEntityType.AddProperty(
+                "Name",
+                typeof(string),
+                propertyInfo: typeof(Topping).GetProperty("Name", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Name>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+
+            var price = runtimeEntityType.AddProperty(
+                "Price",
+                typeof(decimal),
+                propertyInfo: typeof(Topping).GetProperty("Price", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(Topping).GetField("<Price>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Toppings");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/OidcConfigurationController.cs
index dc75ecb3..1431697e 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/OidcConfigurationController.cs
@@ -5,17 +5,17 @@ namespace BlazingPizza.Server;
 
 public class OidcConfigurationController : Controller
 {
-	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-	{
-		ClientRequestParametersProvider = clientRequestParametersProvider;
-	}
+    public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+    {
+        ClientRequestParametersProvider = clientRequestParametersProvider;
+    }
 
-	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+    public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-	[HttpGet("_configuration/{clientId}")]
-	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
-	{
-		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-		return Ok(parameters);
-	}
+    [HttpGet("_configuration/{clientId}")]
+    public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+    {
+        var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+        return Ok(parameters);
+    }
 }
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/OrdersController.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/OrdersController.cs
index 4cc7115e..308f3f64 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/OrdersController.cs
@@ -12,119 +12,119 @@ namespace BlazingPizza.Server;
 // [Authorize]
 public class OrdersController : Controller
 {
-	private readonly PizzaStoreContext _db;
-
-	public OrdersController(PizzaStoreContext db)
-	{
-		_db = db;
-	}
-
-	[HttpGet]
-	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-	{
-		var orders = await _db.Orders
-				.Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.OrderByDescending(o => o.CreatedTime)
-				.ToListAsync();
-
-		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-	}
-
-	[HttpGet("{orderId}")]
-	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-	{
-		var order = await _db.Orders
-				.Where(o => o.OrderId == orderId)
-				.Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.SingleOrDefaultAsync();
-
-		if (order == null)
-		{
-			return NotFound();
-		}
-
-		return OrderWithStatus.FromOrder(order);
-	}
-
-	[HttpPost]
-	public async Task<ActionResult<int>> PlaceOrder(Order order)
-	{
-		order.CreatedTime = DateTime.Now;
-		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-		order.UserId = GetUserId();
-
-		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
-		// in the database - prevent the submitter from making up
-		// new specials and toppings
-		foreach (var pizza in order.Pizzas)
-		{
-			pizza.SpecialId = pizza.Special.Id;
-			pizza.Special = null;
-
-			foreach (var topping in pizza.Toppings)
-			{
-				topping.ToppingId = topping.Topping.Id;
-				topping.Topping = null;
-			}
-		}
-
-		_db.Orders.Attach(order);
-		await _db.SaveChangesAsync();
-
-		// In the background, send push notifications if possible
-		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-		if (subscription != null)
-		{
-			_ = TrackAndSendNotificationsAsync(order, subscription);
-		}
-
-		return order.OrderId;
-	}
-
-	private string GetUserId()
-	{
-		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
-
-	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-	{
-		// In a realistic case, some other backend process would track
-		// order delivery progress and send us notifications when it
-		// changes. Since we don't have any such process here, fake it.
-		await Task.Delay(OrderWithStatus.PreparationDuration);
-		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-		await Task.Delay(OrderWithStatus.DeliveryDuration);
-		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-	}
-
-	private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-	{
-		// For a real application, generate your own
-		var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
-		var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
-
-		var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
-		var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
-		var webPushClient = new WebPushClient();
-		try
-		{
-			var payload = JsonSerializer.Serialize(new
-			{
-				message,
-				url = $"myorders/{order.OrderId}",
-			});
-			await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
-		}
-		catch (Exception ex)
-		{
-			Console.Error.WriteLine("Error sending push notification: " + ex.Message);
-		}
-	}
+    private readonly PizzaStoreContext _db;
+
+    public OrdersController(PizzaStoreContext db)
+    {
+        _db = db;
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+    {
+        var orders = await _db.Orders
+                .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .OrderByDescending(o => o.CreatedTime)
+                .ToListAsync();
+
+        return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+    }
+
+    [HttpGet("{orderId}")]
+    public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+    {
+        var order = await _db.Orders
+                .Where(o => o.OrderId == orderId)
+                .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .SingleOrDefaultAsync();
+
+        if (order == null)
+        {
+            return NotFound();
+        }
+
+        return OrderWithStatus.FromOrder(order);
+    }
+
+    [HttpPost]
+    public async Task<ActionResult<int>> PlaceOrder(Order order)
+    {
+        order.CreatedTime = DateTime.Now;
+        order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+        order.UserId = GetUserId();
+
+        // Enforce existence of Pizza.SpecialId and Topping.ToppingId
+        // in the database - prevent the submitter from making up
+        // new specials and toppings
+        foreach (var pizza in order.Pizzas)
+        {
+            pizza.SpecialId = pizza.Special.Id;
+            pizza.Special = null;
+
+            foreach (var topping in pizza.Toppings)
+            {
+                topping.ToppingId = topping.Topping.Id;
+                topping.Topping = null;
+            }
+        }
+
+        _db.Orders.Attach(order);
+        await _db.SaveChangesAsync();
+
+        // In the background, send push notifications if possible
+        var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+        if (subscription != null)
+        {
+            _ = TrackAndSendNotificationsAsync(order, subscription);
+        }
+
+        return order.OrderId;
+    }
+
+    private string GetUserId()
+    {
+        return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
+
+    private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+    {
+        // In a realistic case, some other backend process would track
+        // order delivery progress and send us notifications when it
+        // changes. Since we don't have any such process here, fake it.
+        await Task.Delay(OrderWithStatus.PreparationDuration);
+        await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+        await Task.Delay(OrderWithStatus.DeliveryDuration);
+        await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+    }
+
+    private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+    {
+        // For a real application, generate your own
+        var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
+        var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
+
+        var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
+        var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
+        var webPushClient = new WebPushClient();
+        try
+        {
+            var payload = JsonSerializer.Serialize(new
+            {
+                message,
+                url = $"myorders/{order.OrderId}",
+            });
+            await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
+        }
+        catch (Exception ex)
+        {
+            Console.Error.WriteLine("Error sending push notification: " + ex.Message);
+        }
+    }
 }
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaApiExtensions.cs
index bf6b7bde..524ca759 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaApiExtensions.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -7,54 +7,51 @@ namespace BlazingPizza.Server;
 public static class PizzaApiExtensions
 {
 
-	public static WebApplication MapPizzaApi(this WebApplication app)
-	{
+    public static WebApplication MapPizzaApi(this WebApplication app)
+    {
 
-		// Subscribe to notifications
-		app.MapPut("/notifications/subscribe", [Authorize] async (
-			HttpContext context,
-			PizzaStoreContext db,
-			NotificationSubscription subscription) =>
-		{
+        // Subscribe to notifications
+        app.MapPut("/notifications/subscribe", [Authorize] async (
+            HttpContext context,
+            PizzaStoreContext db,
+            NotificationSubscription subscription) => {
 
-			// We're storing at most one subscription per user, so delete old ones.
-			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-			var userId = GetUserId(context);
-			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
-			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+                // We're storing at most one subscription per user, so delete old ones.
+                // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+                var userId = GetUserId(context);
+                var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+                db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
 
-			// Store new subscription
-			subscription.UserId = userId;
-			db.NotificationSubscriptions.Attach(subscription);
+                // Store new subscription
+                subscription.UserId = userId;
+                db.NotificationSubscriptions.Attach(subscription);
 
-			await db.SaveChangesAsync();
-			return Results.Ok(subscription);
+                await db.SaveChangesAsync();
+                return Results.Ok(subscription);
 
-		});
+            });
 
-		// Specials
-		app.MapGet("/specials", async (PizzaStoreContext db) =>
-		{
+        // Specials
+        app.MapGet("/specials", async (PizzaStoreContext db) => {
 
-			var specials = await db.Specials.ToListAsync();
-			return Results.Ok(specials);
+            var specials = await db.Specials.ToListAsync();
+            return Results.Ok(specials);
 
-		});
+        });
 
-		// Toppings
-		app.MapGet("/toppings", async (PizzaStoreContext db) =>
-		{
-			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
-			return Results.Ok(toppings);
-		});
+        // Toppings
+        app.MapGet("/toppings", async (PizzaStoreContext db) => {
+            var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+            return Results.Ok(toppings);
+        });
 
-		return app;
+        return app;
 
-	}
+    }
 
-	private static string GetUserId(HttpContext context)
-	{
-		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
+    private static string GetUserId(HttpContext context)
+    {
+        return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
 
 }
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreContext.cs
index 9a2e17ee..50ac87e4 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using Duende.IdentityServer.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
@@ -7,32 +7,32 @@ namespace BlazingPizza.Server;
 
 public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-	public PizzaStoreContext(
-			DbContextOptions options,
-			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-	{
-	}
+    public PizzaStoreContext(
+            DbContextOptions options,
+            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+    {
+    }
 
-	public DbSet<Order> Orders { get; set; }
+    public DbSet<Order> Orders { get; set; }
 
-	public DbSet<Pizza> Pizzas { get; set; }
+    public DbSet<Pizza> Pizzas { get; set; }
 
-	public DbSet<PizzaSpecial> Specials { get; set; }
+    public DbSet<PizzaSpecial> Specials { get; set; }
 
-	public DbSet<Topping> Toppings { get; set; }
+    public DbSet<Topping> Toppings { get; set; }
 
-	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+    public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
-	{
-		base.OnModelCreating(modelBuilder);
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
 
-		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
-		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+        // Configuring a many-to-many special -> topping relationship that is friendly for serialization
+        modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+        modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+        modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-		// Inline the Lat-Long pairs in Order rather than having a FK to another table
-		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-	}
+        // Inline the Lat-Long pairs in Order rather than having a FK to another table
+        modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+    }
 }
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/Program.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/Program.cs
index 4484d8f7..b83debb4 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/Program.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/Program.cs
@@ -1,27 +1,27 @@
-using Microsoft.AspNetCore.Authentication;
+using BlazingPizza.Server;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.EntityFrameworkCore;
-using BlazingPizza.Server;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllersWithViews()
-	.AddJsonOptions(options =>  {
-		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
-	});
+    .AddJsonOptions(options => {
+        options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+    });
 builder.Services.AddRazorPages();
 
 builder.Services.AddDbContext<PizzaStoreContext>(options =>
-		options.UseSqlite("Data Source=pizza.db")
-			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+        options.UseSqlite("Data Source=pizza.db")
+            .UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
 
 builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-		.AddEntityFrameworkStores<PizzaStoreContext>();
+        .AddEntityFrameworkStores<PizzaStoreContext>();
 
 builder.Services.AddIdentityServer()
-		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+        .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
 
 builder.Services.AddAuthentication()
-		.AddIdentityServerJwt();
+        .AddIdentityServerJwt();
 
 var app = builder.Build();
 
@@ -29,11 +29,11 @@
 var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
 using (var scope = scopeFactory.CreateScope())
 {
-	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-	if (db.Database.EnsureCreated())
-	{
-		SeedData.Initialize(db);
-	}
+    var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+    if (db.Database.EnsureCreated())
+    {
+        SeedData.Initialize(db);
+    }
 }
 
 // Configure the HTTP request pipeline.
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/SeedData.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/SeedData.cs
index a1e47973..f02e2b77 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Server/SeedData.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Server/SeedData.cs
@@ -2,191 +2,191 @@
 
 public static class SeedData
 {
-	public static void Initialize(PizzaStoreContext db)
-	{
-		var toppings = new Topping[]
-		{
-			new Topping()
-			{
-					Name = "Extra cheese",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "American bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "British bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Canadian bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Tea and crumpets",
-					Price = 5.00m
-			},
-			new Topping()
-			{
-					Name = "Fresh-baked scones",
-					Price = 4.50m,
-			},
-			new Topping()
-			{
-					Name = "Bell peppers",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Onions",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Mushrooms",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Pepperoni",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Duck sausage",
-					Price = 3.20m,
-			},
-			new Topping()
-			{
-					Name = "Venison meatballs",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "Served on a silver platter",
-					Price = 250.99m,
-			},
-			new Topping()
-			{
-					Name = "Lobster on top",
-					Price = 64.50m,
-			},
-			new Topping()
-			{
-					Name = "Sturgeon caviar",
-					Price = 101.75m,
-			},
-			new Topping()
-			{
-					Name = "Artichoke hearts",
-					Price = 3.40m,
-			},
-			new Topping()
-			{
-					Name = "Fresh tomatoes",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Basil",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Steak (medium-rare)",
-					Price = 8.50m,
-			},
-			new Topping()
-			{
-					Name = "Blazing hot peppers",
-					Price = 4.20m,
-			},
-			new Topping()
-			{
-					Name = "Buffalo chicken",
-					Price = 5.00m,
-			},
-			new Topping()
-			{
-					Name = "Blue cheese",
-					Price = 2.50m,
-			},
-		};
+    public static void Initialize(PizzaStoreContext db)
+    {
+        var toppings = new Topping[]
+        {
+            new Topping()
+            {
+                    Name = "Extra cheese",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "American bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "British bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Canadian bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Tea and crumpets",
+                    Price = 5.00m
+            },
+            new Topping()
+            {
+                    Name = "Fresh-baked scones",
+                    Price = 4.50m,
+            },
+            new Topping()
+            {
+                    Name = "Bell peppers",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Onions",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Mushrooms",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Pepperoni",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Duck sausage",
+                    Price = 3.20m,
+            },
+            new Topping()
+            {
+                    Name = "Venison meatballs",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "Served on a silver platter",
+                    Price = 250.99m,
+            },
+            new Topping()
+            {
+                    Name = "Lobster on top",
+                    Price = 64.50m,
+            },
+            new Topping()
+            {
+                    Name = "Sturgeon caviar",
+                    Price = 101.75m,
+            },
+            new Topping()
+            {
+                    Name = "Artichoke hearts",
+                    Price = 3.40m,
+            },
+            new Topping()
+            {
+                    Name = "Fresh tomatoes",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Basil",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Steak (medium-rare)",
+                    Price = 8.50m,
+            },
+            new Topping()
+            {
+                    Name = "Blazing hot peppers",
+                    Price = 4.20m,
+            },
+            new Topping()
+            {
+                    Name = "Buffalo chicken",
+                    Price = 5.00m,
+            },
+            new Topping()
+            {
+                    Name = "Blue cheese",
+                    Price = 2.50m,
+            },
+        };
 
-		var specials = new PizzaSpecial[]
-		{
-			new PizzaSpecial()
-			{
-					Name = "Basic Cheese Pizza",
-					Description = "It's cheesy and delicious. Why wouldn't you want one?",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/cheese.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 2,
-					Name = "The Baconatorizor",
-					Description = "It has EVERY kind of bacon",
-					BasePrice = 11.99m,
-					ImageUrl = "img/pizzas/bacon.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 3,
-					Name = "Classic pepperoni",
-					Description = "It's the pizza you grew up with, but Blazing hot!",
-					BasePrice = 10.50m,
-					ImageUrl = "img/pizzas/pepperoni.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 4,
-					Name = "Buffalo chicken",
-					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-					BasePrice = 12.75m,
-					ImageUrl = "img/pizzas/meaty.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 5,
-					Name = "Mushroom Lovers",
-					Description = "It has mushrooms. Isn't that obvious?",
-					BasePrice = 11.00m,
-					ImageUrl = "img/pizzas/mushroom.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 6,
-					Name = "The Brit",
-					Description = "When in London...",
-					BasePrice = 10.25m,
-					ImageUrl = "img/pizzas/brit.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 7,
-					Name = "Veggie Delight",
-					Description = "It's like salad, but on a pizza",
-					BasePrice = 11.50m,
-					ImageUrl = "img/pizzas/salad.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 8,
-					Name = "Margherita",
-					Description = "Traditional Italian pizza with tomatoes and basil",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/margherita.jpg",
-			},
-		};
+        var specials = new PizzaSpecial[]
+        {
+            new PizzaSpecial()
+            {
+                    Name = "Basic Cheese Pizza",
+                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/cheese.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 2,
+                    Name = "The Baconatorizor",
+                    Description = "It has EVERY kind of bacon",
+                    BasePrice = 11.99m,
+                    ImageUrl = "img/pizzas/bacon.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 3,
+                    Name = "Classic pepperoni",
+                    Description = "It's the pizza you grew up with, but Blazing hot!",
+                    BasePrice = 10.50m,
+                    ImageUrl = "img/pizzas/pepperoni.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 4,
+                    Name = "Buffalo chicken",
+                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+                    BasePrice = 12.75m,
+                    ImageUrl = "img/pizzas/meaty.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 5,
+                    Name = "Mushroom Lovers",
+                    Description = "It has mushrooms. Isn't that obvious?",
+                    BasePrice = 11.00m,
+                    ImageUrl = "img/pizzas/mushroom.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 6,
+                    Name = "The Brit",
+                    Description = "When in London...",
+                    BasePrice = 10.25m,
+                    ImageUrl = "img/pizzas/brit.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 7,
+                    Name = "Veggie Delight",
+                    Description = "It's like salad, but on a pizza",
+                    BasePrice = 11.50m,
+                    ImageUrl = "img/pizzas/salad.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 8,
+                    Name = "Margherita",
+                    Description = "Traditional Italian pizza with tomatoes and basil",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/margherita.jpg",
+            },
+        };
 
-		db.Toppings.AddRange(toppings);
-		db.Specials.AddRange(specials);
-		db.SaveChanges();
-	}
+        db.Toppings.AddRange(toppings);
+        db.Specials.AddRange(specials);
+        db.SaveChanges();
+    }
 }
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Address.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Address.cs
index 79be9c5b..a671359a 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Address.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Address.cs
@@ -2,23 +2,23 @@
 
 public class Address
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Name { get; set; }
+    [Required, MaxLength(100)]
+    public string Name { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Line1 { get; set; }
+    [Required, MaxLength(100)]
+    public string Line1 { get; set; }
 
-	[MaxLength(100)]
-	public string Line2 { get; set; }
+    [MaxLength(100)]
+    public string Line2 { get; set; }
 
-	[Required, MaxLength(50)]
-	public string City { get; set; }
+    [Required, MaxLength(50)]
+    public string City { get; set; }
 
-	[Required, MaxLength(20)]
-	public string Region { get; set; }
+    [Required, MaxLength(20)]
+    public string Region { get; set; }
 
-	[Required, MaxLength(20)]
-	public string PostalCode { get; set; }
+    [Required, MaxLength(20)]
+    public string PostalCode { get; set; }
 }
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/LatLong.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/LatLong.cs
index 14a94c26..a65971f8 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/LatLong.cs
@@ -2,25 +2,25 @@
 
 public class LatLong
 {
-	public LatLong()
-	{
-	}
+    public LatLong()
+    {
+    }
 
-	public LatLong(double latitude, double longitude) : this()
-	{
-		Latitude = latitude;
-		Longitude = longitude;
-	}
+    public LatLong(double latitude, double longitude) : this()
+    {
+        Latitude = latitude;
+        Longitude = longitude;
+    }
 
-	public double Latitude { get; set; }
+    public double Latitude { get; set; }
 
-	public double Longitude { get; set; }
+    public double Longitude { get; set; }
 
-	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-	{
-		// The Earth is flat, right? So no need for spherical interpolation.
-		return new LatLong(
-				start.Latitude + (end.Latitude - start.Latitude) * proportion,
-				start.Longitude + (end.Longitude - start.Longitude) * proportion);
-	}
+    public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+    {
+        // The Earth is flat, right? So no need for spherical interpolation.
+        return new LatLong(
+                start.Latitude + (end.Latitude - start.Latitude) * proportion,
+                start.Longitude + (end.Longitude - start.Longitude) * proportion);
+    }
 }
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/NotificationSubscription.cs
index 9109ff57..5c99e3f4 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/NotificationSubscription.cs
@@ -2,13 +2,13 @@
 
 public class NotificationSubscription
 {
-	public int NotificationSubscriptionId { get; set; }
+    public int NotificationSubscriptionId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public string Url { get; set; }
+    public string Url { get; set; }
 
-	public string P256dh { get; set; }
+    public string P256dh { get; set; }
 
-	public string Auth { get; set; }
+    public string Auth { get; set; }
 }
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Order.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Order.cs
index aca04ca1..b47efad0 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Order.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Order.cs
@@ -4,21 +4,21 @@ namespace BlazingPizza;
 
 public class Order
 {
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public DateTime CreatedTime { get; set; }
+    public DateTime CreatedTime { get; set; }
 
-	public Address DeliveryAddress { get; set; } = new Address();
+    public Address DeliveryAddress { get; set; } = new Address();
 
-	public LatLong DeliveryLocation { get; set; }
+    public LatLong DeliveryLocation { get; set; }
 
-	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+    public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+    public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
+    public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
@@ -29,4 +29,4 @@ public class Order
 [JsonSerializable(typeof(List<PizzaSpecial>))]
 [JsonSerializable(typeof(List<Topping>))]
 [JsonSerializable(typeof(Topping))]
-public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class OrderContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/OrderWithStatus.cs
index f5f153b6..fbfac7af 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/OrderWithStatus.cs
@@ -6,73 +6,73 @@ namespace BlazingPizza;
 
 public class OrderWithStatus
 {
-	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+    public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+    public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 
-	public string StatusText { get; set; }
+    public string StatusText { get; set; }
 
-	public bool IsDelivered => StatusText == "Delivered";
+    public bool IsDelivered => StatusText == "Delivered";
 
-	public List<Marker> MapMarkers { get; set; }
+    public List<Marker> MapMarkers { get; set; }
 
-	public static OrderWithStatus FromOrder(Order order)
-	{
-		// To simulate a real backend process, we fake status updates based on the amount
-		// of time since the order was placed
-		string statusText;
-		List<Marker> mapMarkers;
-		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+    public static OrderWithStatus FromOrder(Order order)
+    {
+        // To simulate a real backend process, we fake status updates based on the amount
+        // of time since the order was placed
+        string statusText;
+        List<Marker> mapMarkers;
+        var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-		if (DateTime.Now < dispatchTime)
-		{
-			statusText = "Preparing";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-								};
-		}
-		else if (DateTime.Now < dispatchTime + DeliveryDuration)
-		{
-			statusText = "Out for delivery";
+        if (DateTime.Now < dispatchTime)
+        {
+            statusText = "Preparing";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+                                };
+        }
+        else if (DateTime.Now < dispatchTime + DeliveryDuration)
+        {
+            statusText = "Out for delivery";
 
-			var startPosition = ComputeStartPosition(order);
-			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation),
-										ToMapMarker("Driver", driverPosition, showPopup: true),
-								};
-		}
-		else
-		{
-			statusText = "Delivered";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-								};
-		}
+            var startPosition = ComputeStartPosition(order);
+            var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+            var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation),
+                                        ToMapMarker("Driver", driverPosition, showPopup: true),
+                                };
+        }
+        else
+        {
+            statusText = "Delivered";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+                                };
+        }
 
-		return new OrderWithStatus
-		{
-			Order = order,
-			StatusText = statusText,
-			MapMarkers = mapMarkers,
-		};
-	}
+        return new OrderWithStatus
+        {
+            Order = order,
+            StatusText = statusText,
+            MapMarkers = mapMarkers,
+        };
+    }
 
-	private static LatLong ComputeStartPosition(Order order)
-	{
-		// Random but deterministic based on order ID
-		var rng = new Random(order.OrderId);
-		var distance = 0.01 + rng.NextDouble() * 0.02;
-		var angle = rng.NextDouble() * Math.PI * 2;
-		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-	}
+    private static LatLong ComputeStartPosition(Order order)
+    {
+        // Random but deterministic based on order ID
+        var rng = new Random(order.OrderId);
+        var distance = 0.01 + rng.NextDouble() * 0.02;
+        var angle = rng.NextDouble() * Math.PI * 2;
+        var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+        return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+    }
 
-	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+    static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
 }
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Pizza.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Pizza.cs
index 459298f4..2a7a1c29 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Pizza.cs
@@ -7,38 +7,38 @@ namespace BlazingPizza;
 /// </summary>
 public class Pizza
 {
-	public const int DefaultSize = 12;
-	public const int MinimumSize = 9;
-	public const int MaximumSize = 17;
+    public const int DefaultSize = 12;
+    public const int MinimumSize = 9;
+    public const int MaximumSize = 17;
 
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public PizzaSpecial Special { get; set; }
+    public PizzaSpecial Special { get; set; }
 
-	public int SpecialId { get; set; }
+    public int SpecialId { get; set; }
 
-	public int Size { get; set; }
+    public int Size { get; set; }
 
-	public List<PizzaTopping> Toppings { get; set; }
+    public List<PizzaTopping> Toppings { get; set; }
 
-	public decimal GetBasePrice()
-	{
-		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-	}
+    public decimal GetBasePrice()
+    {
+        return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+    }
 
-	public decimal GetTotalPrice()
-	{
-		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-	}
+    public decimal GetTotalPrice()
+    {
+        return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+    }
 
-	public string GetFormattedTotalPrice()
-	{
-		return GetTotalPrice().ToString("0.00");
-	}
+    public string GetFormattedTotalPrice()
+    {
+        return GetTotalPrice().ToString("0.00");
+    }
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
 [JsonSerializable(typeof(Pizza))]
-public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class PizzaContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaSpecial.cs
index 9653300c..1fd9006a 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaSpecial.cs
@@ -5,15 +5,15 @@
 /// </summary>
 public class PizzaSpecial
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal BasePrice { get; set; }
+    public decimal BasePrice { get; set; }
 
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public string ImageUrl { get; set; }
+    public string ImageUrl { get; set; }
 
-	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+    public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
 }
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaTopping.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaTopping.cs
index 0a711647..1c062732 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/PizzaTopping.cs
@@ -2,10 +2,10 @@
 
 public class PizzaTopping
 {
-	public Topping Topping { get; set; }
+    public Topping Topping { get; set; }
 
-	public int ToppingId { get; set; }
+    public int ToppingId { get; set; }
+
+    public int PizzaId { get; set; }
 
-	public int PizzaId { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Topping.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Topping.cs
index 376c311a..4eb67ae9 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/Topping.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/Topping.cs
@@ -2,12 +2,12 @@
 
 public class Topping
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal Price { get; set; }
+    public decimal Price { get; set; }
+
+    public string GetFormattedPrice() => Price.ToString("0.00");
 
-	public string GetFormattedPrice() => Price.ToString("0.00");
-	
 }
\ No newline at end of file
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Shared/UserInfo.cs b/save-points/05-checkout-with-validation/BlazingPizza.Shared/UserInfo.cs
index 362f8f8e..babb4315 100644
--- a/save-points/05-checkout-with-validation/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/05-checkout-with-validation/BlazingPizza.Shared/UserInfo.cs
@@ -2,8 +2,8 @@
 
 public class UserInfo
 {
-	public bool IsAuthenticated { get; set; }
+    public bool IsAuthenticated { get; set; }
+
+    public string Name { get; set; }
 
-	public string Name { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj
index 44802d79..1847e754 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -14,7 +14,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\BlazingComponents\BlazingComponents.csproj" />
     <ProjectReference Include="..\BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj" />
     <ProjectReference Include="..\BlazingPizza.Shared\BlazingPizza.Shared.csproj" />
   </ItemGroup>
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrderState.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrderState.cs
index 7309fbad..00dd3627 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrderState.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrderState.cs
@@ -2,51 +2,51 @@
 
 public class OrderState
 {
-		public bool ShowingConfigureDialog { get; private set; }
-
-		public Pizza ConfiguringPizza { get; private set; }
-
-		public Order Order { get; private set; } = new Order();
-
-		public void ShowConfigurePizzaDialog(PizzaSpecial special)
-		{
-				ConfiguringPizza = new Pizza()
-				{
-						Special = special,
-						SpecialId = special.Id,
-						Size = Pizza.DefaultSize,
-						Toppings = new List<PizzaTopping>(),
-				};
-
-				ShowingConfigureDialog = true;
-		}
-
-		public void CancelConfigurePizzaDialog()
-		{
-				ConfiguringPizza = null;
-				ShowingConfigureDialog = false;
-		}
-
-		public void ConfirmConfigurePizzaDialog()
-		{
-				Order.Pizzas.Add(ConfiguringPizza);
-				ConfiguringPizza = null;
-
-				ShowingConfigureDialog = false;
-		}
-
-		public void RemoveConfiguredPizza(Pizza pizza)
-		{
-				Order.Pizzas.Remove(pizza);
-		}
-
-		public void ResetOrder()
-		{
-				Order = new Order();
-		}
-
-		public void ReplaceOrder(Order order)
-		{
-				Order = order;
-		}
+    public bool ShowingConfigureDialog { get; private set; }
+
+    public Pizza ConfiguringPizza { get; private set; }
+
+    public Order Order { get; private set; } = new Order();
+
+    public void ShowConfigurePizzaDialog(PizzaSpecial special)
+    {
+        ConfiguringPizza = new Pizza()
+        {
+            Special = special,
+            SpecialId = special.Id,
+            Size = Pizza.DefaultSize,
+            Toppings = new List<PizzaTopping>(),
+        };
+
+        ShowingConfigureDialog = true;
+    }
+
+    public void CancelConfigurePizzaDialog()
+    {
+        ConfiguringPizza = null;
+        ShowingConfigureDialog = false;
+    }
+
+    public void ConfirmConfigurePizzaDialog()
+    {
+        Order.Pizzas.Add(ConfiguringPizza);
+        ConfiguringPizza = null;
+
+        ShowingConfigureDialog = false;
+    }
+
+    public void RemoveConfiguredPizza(Pizza pizza)
+    {
+        Order.Pizzas.Remove(pizza);
+    }
+
+    public void ResetOrder()
+    {
+        Order = new Order();
+    }
+
+    public void ReplaceOrder(Order order)
+    {
+        Order = order;
+    }
 }
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrdersClient.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrdersClient.cs
index d90979ae..5e9f9858 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrdersClient.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/OrdersClient.cs
@@ -4,27 +4,27 @@ namespace BlazingPizza.Client;
 
 public class OrdersClient
 {
-	private readonly HttpClient httpClient;
+    private readonly HttpClient httpClient;
 
-	public OrdersClient(HttpClient httpClient)
-	{
-		this.httpClient = httpClient;
-	}
+    public OrdersClient(HttpClient httpClient)
+    {
+        this.httpClient = httpClient;
+    }
 
-	public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
-			await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
+    public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
+            await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
 
 
-	public async Task<OrderWithStatus> GetOrder(int orderId) =>
-			await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
+    public async Task<OrderWithStatus> GetOrder(int orderId) =>
+            await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
 
 
-	public async Task<int> PlaceOrder(Order order)
-	{
-		var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
-		response.EnsureSuccessStatusCode();
-		var orderId = await response.Content.ReadFromJsonAsync<int>();
-		return orderId;
-	}
+    public async Task<int> PlaceOrder(Order order)
+    {
+        var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
+        response.EnsureSuccessStatusCode();
+        var orderId = await response.Content.ReadFromJsonAsync<int>();
+        return orderId;
+    }
 
 }
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/PizzaAuthenticationState.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Client/PizzaAuthenticationState.cs
index f5bfef65..78627625 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/PizzaAuthenticationState.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/PizzaAuthenticationState.cs
@@ -4,5 +4,5 @@ namespace BlazingPizza.Client;
 
 public class PizzaAuthenticationState : RemoteAuthenticationState
 {
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 }
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs
index 5084a0ad..c2129f0b 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Client/Program.cs
@@ -1,8 +1,8 @@
-using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
+using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using BlazingPizza.Client;
-using Microsoft.AspNetCore.Components.Web;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
@@ -10,13 +10,12 @@
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
-		.AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
+        .AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
 builder.Services.AddScoped<OrderState>();
 
 // Add auth services
-builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
-{
-	options.AuthenticationPaths.LogOutSucceededPath = "";
+builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options => {
+    options.AuthenticationPaths.LogOutSucceededPath = "";
 });
 
 await builder.Build().RunAsync();
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index bb84f13c..be8226ec 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -4,12 +4,12 @@ namespace BlazingPizza.ComponentsLibrary;
 
 public static class LocalStorage
 {
-	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+    public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+    public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+    public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
 }
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index a8e78f2a..b067719c 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -2,11 +2,11 @@
 
 public class Marker
 {
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public double X { get; set; }
+    public double X { get; set; }
 
-	public double Y { get; set; }
+    public double Y { get; set; }
 
-	public bool ShowPopup { get; set; }
+    public bool ShowPopup { get; set; }
 }
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 349046d4..34194163 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -2,7 +2,7 @@
 
 public class Point
 {
-	public double X { get; set; }
+    public double X { get; set; }
 
-	public double Y { get; set; }
+    public double Y { get; set; }
 }
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/06-authentication-and-authorization/BlazingPizza.Server/BlazingPizza.Server.csproj
index b9c74fc4..227890e1 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
+		<ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/OidcConfigurationController.cs
index c074debf..50a0a8ad 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/OidcConfigurationController.cs
@@ -1,9 +1,9 @@
-using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
-using Microsoft.AspNetCore.Mvc;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
+using Microsoft.AspNetCore.Mvc;
 
 namespace BlazingPizza.Server
 {
@@ -17,7 +17,7 @@ public OidcConfigurationController(IClientRequestParametersProvider clientReques
         public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
         [HttpGet("_configuration/{clientId}")]
-        public IActionResult GetClientRequestParameters([FromRoute]string clientId)
+        public IActionResult GetClientRequestParameters([FromRoute] string clientId)
         {
             var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
             return Ok(parameters);
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzaApiExtensions.cs
new file mode 100644
index 00000000..524ca759
--- /dev/null
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -0,0 +1,57 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
+
+namespace BlazingPizza.Server;
+
+public static class PizzaApiExtensions
+{
+
+    public static WebApplication MapPizzaApi(this WebApplication app)
+    {
+
+        // Subscribe to notifications
+        app.MapPut("/notifications/subscribe", [Authorize] async (
+            HttpContext context,
+            PizzaStoreContext db,
+            NotificationSubscription subscription) => {
+
+                // We're storing at most one subscription per user, so delete old ones.
+                // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+                var userId = GetUserId(context);
+                var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+                db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+
+                // Store new subscription
+                subscription.UserId = userId;
+                db.NotificationSubscriptions.Attach(subscription);
+
+                await db.SaveChangesAsync();
+                return Results.Ok(subscription);
+
+            });
+
+        // Specials
+        app.MapGet("/specials", async (PizzaStoreContext db) => {
+
+            var specials = await db.Specials.ToListAsync();
+            return Results.Ok(specials);
+
+        });
+
+        // Toppings
+        app.MapGet("/toppings", async (PizzaStoreContext db) => {
+            var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+            return Results.Ok(toppings);
+        });
+
+        return app;
+
+    }
+
+    private static string GetUserId(HttpContext context)
+    {
+        return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
+
+}
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzaStoreContext.cs
index 9485bd12..4830d1a4 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using Duende.IdentityServer.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzasController.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzasController.cs
deleted file mode 100644
index c082552c..00000000
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Server/PizzasController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlazingPizza.Server
-{
-    [Route("pizzas")]
-    [ApiController]
-    public class PizzasController : Controller
-    {
-        private readonly PizzaStoreContext _db;
-
-        public PizzasController(PizzaStoreContext db)
-        {
-            _db = db;
-        }
-    }
-}
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Program.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Program.cs
index 40a47641..b83debb4 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Server/Program.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/Program.cs
@@ -1,33 +1,67 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
+using BlazingPizza.Server;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.EntityFrameworkCore;
 
-namespace BlazingPizza.Server
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddControllersWithViews()
+    .AddJsonOptions(options => {
+        options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+    });
+builder.Services.AddRazorPages();
+
+builder.Services.AddDbContext<PizzaStoreContext>(options =>
+        options.UseSqlite("Data Source=pizza.db")
+            .UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+
+builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
+        .AddEntityFrameworkStores<PizzaStoreContext>();
+
+builder.Services.AddIdentityServer()
+        .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+
+builder.Services.AddAuthentication()
+        .AddIdentityServerJwt();
+
+var app = builder.Build();
+
+// Initialize the database
+var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
+using (var scope = scopeFactory.CreateScope())
 {
-    public class Program
+    var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+    if (db.Database.EnsureCreated())
     {
-        public static void Main(string[] args)
-        {
-            var host = CreateHostBuilder(args).Build();
-
-            // Initialize the database
-            var scopeFactory = host.Services.GetRequiredService<IServiceScopeFactory>();
-            using (var scope = scopeFactory.CreateScope())
-            {
-                var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-                if (db.Database.EnsureCreated())
-                {
-                    SeedData.Initialize(db);
-                }
-            }
-
-            host.Run();
-        }
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
+        SeedData.Initialize(db);
     }
 }
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseWebAssemblyDebugging();
+}
+else
+{
+    app.UseExceptionHandler("/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
+}
+
+app.UseHttpsRedirection();
+app.UseBlazorFrameworkFiles();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseIdentityServer();
+app.UseAuthorization();
+
+app.MapPizzaApi();
+
+app.MapRazorPages();
+app.MapControllers();
+app.MapFallbackToFile("index.html");
+
+app.Run();
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/SeedData.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/SeedData.cs
index a1e47973..f02e2b77 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Server/SeedData.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Server/SeedData.cs
@@ -2,191 +2,191 @@
 
 public static class SeedData
 {
-	public static void Initialize(PizzaStoreContext db)
-	{
-		var toppings = new Topping[]
-		{
-			new Topping()
-			{
-					Name = "Extra cheese",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "American bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "British bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Canadian bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Tea and crumpets",
-					Price = 5.00m
-			},
-			new Topping()
-			{
-					Name = "Fresh-baked scones",
-					Price = 4.50m,
-			},
-			new Topping()
-			{
-					Name = "Bell peppers",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Onions",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Mushrooms",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Pepperoni",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Duck sausage",
-					Price = 3.20m,
-			},
-			new Topping()
-			{
-					Name = "Venison meatballs",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "Served on a silver platter",
-					Price = 250.99m,
-			},
-			new Topping()
-			{
-					Name = "Lobster on top",
-					Price = 64.50m,
-			},
-			new Topping()
-			{
-					Name = "Sturgeon caviar",
-					Price = 101.75m,
-			},
-			new Topping()
-			{
-					Name = "Artichoke hearts",
-					Price = 3.40m,
-			},
-			new Topping()
-			{
-					Name = "Fresh tomatoes",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Basil",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Steak (medium-rare)",
-					Price = 8.50m,
-			},
-			new Topping()
-			{
-					Name = "Blazing hot peppers",
-					Price = 4.20m,
-			},
-			new Topping()
-			{
-					Name = "Buffalo chicken",
-					Price = 5.00m,
-			},
-			new Topping()
-			{
-					Name = "Blue cheese",
-					Price = 2.50m,
-			},
-		};
+    public static void Initialize(PizzaStoreContext db)
+    {
+        var toppings = new Topping[]
+        {
+            new Topping()
+            {
+                    Name = "Extra cheese",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "American bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "British bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Canadian bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Tea and crumpets",
+                    Price = 5.00m
+            },
+            new Topping()
+            {
+                    Name = "Fresh-baked scones",
+                    Price = 4.50m,
+            },
+            new Topping()
+            {
+                    Name = "Bell peppers",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Onions",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Mushrooms",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Pepperoni",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Duck sausage",
+                    Price = 3.20m,
+            },
+            new Topping()
+            {
+                    Name = "Venison meatballs",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "Served on a silver platter",
+                    Price = 250.99m,
+            },
+            new Topping()
+            {
+                    Name = "Lobster on top",
+                    Price = 64.50m,
+            },
+            new Topping()
+            {
+                    Name = "Sturgeon caviar",
+                    Price = 101.75m,
+            },
+            new Topping()
+            {
+                    Name = "Artichoke hearts",
+                    Price = 3.40m,
+            },
+            new Topping()
+            {
+                    Name = "Fresh tomatoes",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Basil",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Steak (medium-rare)",
+                    Price = 8.50m,
+            },
+            new Topping()
+            {
+                    Name = "Blazing hot peppers",
+                    Price = 4.20m,
+            },
+            new Topping()
+            {
+                    Name = "Buffalo chicken",
+                    Price = 5.00m,
+            },
+            new Topping()
+            {
+                    Name = "Blue cheese",
+                    Price = 2.50m,
+            },
+        };
 
-		var specials = new PizzaSpecial[]
-		{
-			new PizzaSpecial()
-			{
-					Name = "Basic Cheese Pizza",
-					Description = "It's cheesy and delicious. Why wouldn't you want one?",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/cheese.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 2,
-					Name = "The Baconatorizor",
-					Description = "It has EVERY kind of bacon",
-					BasePrice = 11.99m,
-					ImageUrl = "img/pizzas/bacon.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 3,
-					Name = "Classic pepperoni",
-					Description = "It's the pizza you grew up with, but Blazing hot!",
-					BasePrice = 10.50m,
-					ImageUrl = "img/pizzas/pepperoni.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 4,
-					Name = "Buffalo chicken",
-					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-					BasePrice = 12.75m,
-					ImageUrl = "img/pizzas/meaty.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 5,
-					Name = "Mushroom Lovers",
-					Description = "It has mushrooms. Isn't that obvious?",
-					BasePrice = 11.00m,
-					ImageUrl = "img/pizzas/mushroom.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 6,
-					Name = "The Brit",
-					Description = "When in London...",
-					BasePrice = 10.25m,
-					ImageUrl = "img/pizzas/brit.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 7,
-					Name = "Veggie Delight",
-					Description = "It's like salad, but on a pizza",
-					BasePrice = 11.50m,
-					ImageUrl = "img/pizzas/salad.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 8,
-					Name = "Margherita",
-					Description = "Traditional Italian pizza with tomatoes and basil",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/margherita.jpg",
-			},
-		};
+        var specials = new PizzaSpecial[]
+        {
+            new PizzaSpecial()
+            {
+                    Name = "Basic Cheese Pizza",
+                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/cheese.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 2,
+                    Name = "The Baconatorizor",
+                    Description = "It has EVERY kind of bacon",
+                    BasePrice = 11.99m,
+                    ImageUrl = "img/pizzas/bacon.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 3,
+                    Name = "Classic pepperoni",
+                    Description = "It's the pizza you grew up with, but Blazing hot!",
+                    BasePrice = 10.50m,
+                    ImageUrl = "img/pizzas/pepperoni.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 4,
+                    Name = "Buffalo chicken",
+                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+                    BasePrice = 12.75m,
+                    ImageUrl = "img/pizzas/meaty.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 5,
+                    Name = "Mushroom Lovers",
+                    Description = "It has mushrooms. Isn't that obvious?",
+                    BasePrice = 11.00m,
+                    ImageUrl = "img/pizzas/mushroom.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 6,
+                    Name = "The Brit",
+                    Description = "When in London...",
+                    BasePrice = 10.25m,
+                    ImageUrl = "img/pizzas/brit.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 7,
+                    Name = "Veggie Delight",
+                    Description = "It's like salad, but on a pizza",
+                    BasePrice = 11.50m,
+                    ImageUrl = "img/pizzas/salad.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 8,
+                    Name = "Margherita",
+                    Description = "Traditional Italian pizza with tomatoes and basil",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/margherita.jpg",
+            },
+        };
 
-		db.Toppings.AddRange(toppings);
-		db.Specials.AddRange(specials);
-		db.SaveChanges();
-	}
+        db.Toppings.AddRange(toppings);
+        db.Specials.AddRange(specials);
+        db.SaveChanges();
+    }
 }
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Address.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Address.cs
index 79be9c5b..a671359a 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Address.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Address.cs
@@ -2,23 +2,23 @@
 
 public class Address
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Name { get; set; }
+    [Required, MaxLength(100)]
+    public string Name { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Line1 { get; set; }
+    [Required, MaxLength(100)]
+    public string Line1 { get; set; }
 
-	[MaxLength(100)]
-	public string Line2 { get; set; }
+    [MaxLength(100)]
+    public string Line2 { get; set; }
 
-	[Required, MaxLength(50)]
-	public string City { get; set; }
+    [Required, MaxLength(50)]
+    public string City { get; set; }
 
-	[Required, MaxLength(20)]
-	public string Region { get; set; }
+    [Required, MaxLength(20)]
+    public string Region { get; set; }
 
-	[Required, MaxLength(20)]
-	public string PostalCode { get; set; }
+    [Required, MaxLength(20)]
+    public string PostalCode { get; set; }
 }
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/LatLong.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/LatLong.cs
index 14a94c26..a65971f8 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/LatLong.cs
@@ -2,25 +2,25 @@
 
 public class LatLong
 {
-	public LatLong()
-	{
-	}
+    public LatLong()
+    {
+    }
 
-	public LatLong(double latitude, double longitude) : this()
-	{
-		Latitude = latitude;
-		Longitude = longitude;
-	}
+    public LatLong(double latitude, double longitude) : this()
+    {
+        Latitude = latitude;
+        Longitude = longitude;
+    }
 
-	public double Latitude { get; set; }
+    public double Latitude { get; set; }
 
-	public double Longitude { get; set; }
+    public double Longitude { get; set; }
 
-	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-	{
-		// The Earth is flat, right? So no need for spherical interpolation.
-		return new LatLong(
-				start.Latitude + (end.Latitude - start.Latitude) * proportion,
-				start.Longitude + (end.Longitude - start.Longitude) * proportion);
-	}
+    public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+    {
+        // The Earth is flat, right? So no need for spherical interpolation.
+        return new LatLong(
+                start.Latitude + (end.Latitude - start.Latitude) * proportion,
+                start.Longitude + (end.Longitude - start.Longitude) * proportion);
+    }
 }
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/NotificationSubscription.cs
index 9109ff57..5c99e3f4 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/NotificationSubscription.cs
@@ -2,13 +2,13 @@
 
 public class NotificationSubscription
 {
-	public int NotificationSubscriptionId { get; set; }
+    public int NotificationSubscriptionId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public string Url { get; set; }
+    public string Url { get; set; }
 
-	public string P256dh { get; set; }
+    public string P256dh { get; set; }
 
-	public string Auth { get; set; }
+    public string Auth { get; set; }
 }
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Order.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Order.cs
index aca04ca1..b47efad0 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Order.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Order.cs
@@ -4,21 +4,21 @@ namespace BlazingPizza;
 
 public class Order
 {
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public DateTime CreatedTime { get; set; }
+    public DateTime CreatedTime { get; set; }
 
-	public Address DeliveryAddress { get; set; } = new Address();
+    public Address DeliveryAddress { get; set; } = new Address();
 
-	public LatLong DeliveryLocation { get; set; }
+    public LatLong DeliveryLocation { get; set; }
 
-	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+    public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+    public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
+    public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
@@ -29,4 +29,4 @@ public class Order
 [JsonSerializable(typeof(List<PizzaSpecial>))]
 [JsonSerializable(typeof(List<Topping>))]
 [JsonSerializable(typeof(Topping))]
-public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class OrderContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/OrderWithStatus.cs
index f5f153b6..fbfac7af 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/OrderWithStatus.cs
@@ -6,73 +6,73 @@ namespace BlazingPizza;
 
 public class OrderWithStatus
 {
-	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+    public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+    public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 
-	public string StatusText { get; set; }
+    public string StatusText { get; set; }
 
-	public bool IsDelivered => StatusText == "Delivered";
+    public bool IsDelivered => StatusText == "Delivered";
 
-	public List<Marker> MapMarkers { get; set; }
+    public List<Marker> MapMarkers { get; set; }
 
-	public static OrderWithStatus FromOrder(Order order)
-	{
-		// To simulate a real backend process, we fake status updates based on the amount
-		// of time since the order was placed
-		string statusText;
-		List<Marker> mapMarkers;
-		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+    public static OrderWithStatus FromOrder(Order order)
+    {
+        // To simulate a real backend process, we fake status updates based on the amount
+        // of time since the order was placed
+        string statusText;
+        List<Marker> mapMarkers;
+        var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-		if (DateTime.Now < dispatchTime)
-		{
-			statusText = "Preparing";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-								};
-		}
-		else if (DateTime.Now < dispatchTime + DeliveryDuration)
-		{
-			statusText = "Out for delivery";
+        if (DateTime.Now < dispatchTime)
+        {
+            statusText = "Preparing";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+                                };
+        }
+        else if (DateTime.Now < dispatchTime + DeliveryDuration)
+        {
+            statusText = "Out for delivery";
 
-			var startPosition = ComputeStartPosition(order);
-			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation),
-										ToMapMarker("Driver", driverPosition, showPopup: true),
-								};
-		}
-		else
-		{
-			statusText = "Delivered";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-								};
-		}
+            var startPosition = ComputeStartPosition(order);
+            var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+            var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation),
+                                        ToMapMarker("Driver", driverPosition, showPopup: true),
+                                };
+        }
+        else
+        {
+            statusText = "Delivered";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+                                };
+        }
 
-		return new OrderWithStatus
-		{
-			Order = order,
-			StatusText = statusText,
-			MapMarkers = mapMarkers,
-		};
-	}
+        return new OrderWithStatus
+        {
+            Order = order,
+            StatusText = statusText,
+            MapMarkers = mapMarkers,
+        };
+    }
 
-	private static LatLong ComputeStartPosition(Order order)
-	{
-		// Random but deterministic based on order ID
-		var rng = new Random(order.OrderId);
-		var distance = 0.01 + rng.NextDouble() * 0.02;
-		var angle = rng.NextDouble() * Math.PI * 2;
-		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-	}
+    private static LatLong ComputeStartPosition(Order order)
+    {
+        // Random but deterministic based on order ID
+        var rng = new Random(order.OrderId);
+        var distance = 0.01 + rng.NextDouble() * 0.02;
+        var angle = rng.NextDouble() * Math.PI * 2;
+        var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+        return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+    }
 
-	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+    static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
 }
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Pizza.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Pizza.cs
index 459298f4..2a7a1c29 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Pizza.cs
@@ -7,38 +7,38 @@ namespace BlazingPizza;
 /// </summary>
 public class Pizza
 {
-	public const int DefaultSize = 12;
-	public const int MinimumSize = 9;
-	public const int MaximumSize = 17;
+    public const int DefaultSize = 12;
+    public const int MinimumSize = 9;
+    public const int MaximumSize = 17;
 
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public PizzaSpecial Special { get; set; }
+    public PizzaSpecial Special { get; set; }
 
-	public int SpecialId { get; set; }
+    public int SpecialId { get; set; }
 
-	public int Size { get; set; }
+    public int Size { get; set; }
 
-	public List<PizzaTopping> Toppings { get; set; }
+    public List<PizzaTopping> Toppings { get; set; }
 
-	public decimal GetBasePrice()
-	{
-		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-	}
+    public decimal GetBasePrice()
+    {
+        return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+    }
 
-	public decimal GetTotalPrice()
-	{
-		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-	}
+    public decimal GetTotalPrice()
+    {
+        return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+    }
 
-	public string GetFormattedTotalPrice()
-	{
-		return GetTotalPrice().ToString("0.00");
-	}
+    public string GetFormattedTotalPrice()
+    {
+        return GetTotalPrice().ToString("0.00");
+    }
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
 [JsonSerializable(typeof(Pizza))]
-public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class PizzaContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaSpecial.cs
index 9653300c..1fd9006a 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaSpecial.cs
@@ -5,15 +5,15 @@
 /// </summary>
 public class PizzaSpecial
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal BasePrice { get; set; }
+    public decimal BasePrice { get; set; }
 
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public string ImageUrl { get; set; }
+    public string ImageUrl { get; set; }
 
-	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+    public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
 }
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaTopping.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaTopping.cs
index 0a711647..1c062732 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/PizzaTopping.cs
@@ -2,10 +2,10 @@
 
 public class PizzaTopping
 {
-	public Topping Topping { get; set; }
+    public Topping Topping { get; set; }
 
-	public int ToppingId { get; set; }
+    public int ToppingId { get; set; }
+
+    public int PizzaId { get; set; }
 
-	public int PizzaId { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Topping.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Topping.cs
index 376c311a..4eb67ae9 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Topping.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/Topping.cs
@@ -2,12 +2,12 @@
 
 public class Topping
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal Price { get; set; }
+    public decimal Price { get; set; }
+
+    public string GetFormattedPrice() => Price.ToString("0.00");
 
-	public string GetFormattedPrice() => Price.ToString("0.00");
-	
 }
\ No newline at end of file
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/UserInfo.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/UserInfo.cs
index 362f8f8e..babb4315 100644
--- a/save-points/06-authentication-and-authorization/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/06-authentication-and-authorization/BlazingPizza.Shared/UserInfo.cs
@@ -2,8 +2,8 @@
 
 public class UserInfo
 {
-	public bool IsAuthenticated { get; set; }
+    public bool IsAuthenticated { get; set; }
+
+    public string Name { get; set; }
 
-	public string Name { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj
index 44802d79..1847e754 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -14,7 +14,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\BlazingComponents\BlazingComponents.csproj" />
     <ProjectReference Include="..\BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj" />
     <ProjectReference Include="..\BlazingPizza.Shared\BlazingPizza.Shared.csproj" />
   </ItemGroup>
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/JSRuntimeExtensions.cs b/save-points/07-javascript-interop/BlazingPizza.Client/JSRuntimeExtensions.cs
index cc242348..ef171321 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/JSRuntimeExtensions.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/JSRuntimeExtensions.cs
@@ -4,8 +4,8 @@ namespace BlazingPizza.Client;
 
 public static class JSRuntimeExtensions
 {
-	public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
-	{
-		return jsRuntime.InvokeAsync<bool>("confirm", message);
-	}
+    public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
+    {
+        return jsRuntime.InvokeAsync<bool>("confirm", message);
+    }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/OrderState.cs b/save-points/07-javascript-interop/BlazingPizza.Client/OrderState.cs
index 4f47979d..00dd3627 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/OrderState.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/OrderState.cs
@@ -2,51 +2,51 @@
 
 public class OrderState
 {
-	public bool ShowingConfigureDialog { get; private set; }
-
-	public Pizza ConfiguringPizza { get; private set; }
-
-	public Order Order { get; private set; } = new Order();
-
-	public void ShowConfigurePizzaDialog(PizzaSpecial special)
-	{
-		ConfiguringPizza = new Pizza()
-		{
-			Special = special,
-			SpecialId = special.Id,
-			Size = Pizza.DefaultSize,
-			Toppings = new List<PizzaTopping>(),
-		};
-
-		ShowingConfigureDialog = true;
-	}
-
-	public void CancelConfigurePizzaDialog()
-	{
-		ConfiguringPizza = null;
-		ShowingConfigureDialog = false;
-	}
-
-	public void ConfirmConfigurePizzaDialog()
-	{
-		Order.Pizzas.Add(ConfiguringPizza);
-		ConfiguringPizza = null;
-
-		ShowingConfigureDialog = false;
-	}
-
-	public void RemoveConfiguredPizza(Pizza pizza)
-	{
-		Order.Pizzas.Remove(pizza);
-	}
-
-	public void ResetOrder()
-	{
-		Order = new Order();
-	}
-
-	public void ReplaceOrder(Order order)
-	{
-		Order = order;
-	}
+    public bool ShowingConfigureDialog { get; private set; }
+
+    public Pizza ConfiguringPizza { get; private set; }
+
+    public Order Order { get; private set; } = new Order();
+
+    public void ShowConfigurePizzaDialog(PizzaSpecial special)
+    {
+        ConfiguringPizza = new Pizza()
+        {
+            Special = special,
+            SpecialId = special.Id,
+            Size = Pizza.DefaultSize,
+            Toppings = new List<PizzaTopping>(),
+        };
+
+        ShowingConfigureDialog = true;
+    }
+
+    public void CancelConfigurePizzaDialog()
+    {
+        ConfiguringPizza = null;
+        ShowingConfigureDialog = false;
+    }
+
+    public void ConfirmConfigurePizzaDialog()
+    {
+        Order.Pizzas.Add(ConfiguringPizza);
+        ConfiguringPizza = null;
+
+        ShowingConfigureDialog = false;
+    }
+
+    public void RemoveConfiguredPizza(Pizza pizza)
+    {
+        Order.Pizzas.Remove(pizza);
+    }
+
+    public void ResetOrder()
+    {
+        Order = new Order();
+    }
+
+    public void ReplaceOrder(Order order)
+    {
+        Order = order;
+    }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/OrdersClient.cs b/save-points/07-javascript-interop/BlazingPizza.Client/OrdersClient.cs
index e63bd045..b4a08f1e 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/OrdersClient.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/OrdersClient.cs
@@ -5,32 +5,32 @@ namespace BlazingPizza.Client;
 
 public class OrdersClient
 {
-	private readonly HttpClient httpClient;
+    private readonly HttpClient httpClient;
 
-	public OrdersClient(HttpClient httpClient)
-	{
-		this.httpClient = httpClient;
-	}
+    public OrdersClient(HttpClient httpClient)
+    {
+        this.httpClient = httpClient;
+    }
 
-	public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
-			await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
+    public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
+            await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
 
 
-	public async Task<OrderWithStatus> GetOrder(int orderId) =>
-			await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
+    public async Task<OrderWithStatus> GetOrder(int orderId) =>
+            await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
 
 
-	public async Task<int> PlaceOrder(Order order)
-	{
-		var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
-		response.EnsureSuccessStatusCode();
-		var orderId = await response.Content.ReadFromJsonAsync<int>();
-		return orderId;
-	}
+    public async Task<int> PlaceOrder(Order order)
+    {
+        var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
+        response.EnsureSuccessStatusCode();
+        var orderId = await response.Content.ReadFromJsonAsync<int>();
+        return orderId;
+    }
 
-	public async Task SubscribeToNotifications(NotificationSubscription subscription)
-	{
-		var response = await httpClient.PutAsJsonAsync("notifications/subscribe", subscription);
-		response.EnsureSuccessStatusCode();
-	}
+    public async Task SubscribeToNotifications(NotificationSubscription subscription)
+    {
+        var response = await httpClient.PutAsJsonAsync("notifications/subscribe", subscription);
+        response.EnsureSuccessStatusCode();
+    }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/PizzaAuthenticationState.cs b/save-points/07-javascript-interop/BlazingPizza.Client/PizzaAuthenticationState.cs
index f5bfef65..78627625 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/PizzaAuthenticationState.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/PizzaAuthenticationState.cs
@@ -4,5 +4,5 @@ namespace BlazingPizza.Client;
 
 public class PizzaAuthenticationState : RemoteAuthenticationState
 {
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs b/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs
index 5084a0ad..c2129f0b 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Client/Program.cs
@@ -1,8 +1,8 @@
-using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
+using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using BlazingPizza.Client;
-using Microsoft.AspNetCore.Components.Web;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
@@ -10,13 +10,12 @@
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
-		.AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
+        .AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
 builder.Services.AddScoped<OrderState>();
 
 // Add auth services
-builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
-{
-	options.AuthenticationPaths.LogOutSucceededPath = "";
+builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options => {
+    options.AuthenticationPaths.LogOutSucceededPath = "";
 });
 
 await builder.Build().RunAsync();
diff --git a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index bb84f13c..be8226ec 100644
--- a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -4,12 +4,12 @@ namespace BlazingPizza.ComponentsLibrary;
 
 public static class LocalStorage
 {
-	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+    public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+    public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+    public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
 }
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index a8e78f2a..b067719c 100644
--- a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -2,11 +2,11 @@
 
 public class Marker
 {
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public double X { get; set; }
+    public double X { get; set; }
 
-	public double Y { get; set; }
+    public double Y { get; set; }
 
-	public bool ShowPopup { get; set; }
+    public bool ShowPopup { get; set; }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 349046d4..34194163 100644
--- a/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -2,7 +2,7 @@
 
 public class Point
 {
-	public double X { get; set; }
+    public double X { get; set; }
 
-	public double Y { get; set; }
+    public double Y { get; set; }
 }
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/07-javascript-interop/BlazingPizza.Server/OidcConfigurationController.cs
index dc75ecb3..1431697e 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/OidcConfigurationController.cs
@@ -5,17 +5,17 @@ namespace BlazingPizza.Server;
 
 public class OidcConfigurationController : Controller
 {
-	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-	{
-		ClientRequestParametersProvider = clientRequestParametersProvider;
-	}
+    public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+    {
+        ClientRequestParametersProvider = clientRequestParametersProvider;
+    }
 
-	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+    public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-	[HttpGet("_configuration/{clientId}")]
-	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
-	{
-		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-		return Ok(parameters);
-	}
+    [HttpGet("_configuration/{clientId}")]
+    public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+    {
+        var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+        return Ok(parameters);
+    }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/OrdersController.cs b/save-points/07-javascript-interop/BlazingPizza.Server/OrdersController.cs
index 1859decd..3d2ba63f 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/OrdersController.cs
@@ -12,119 +12,119 @@ namespace BlazingPizza.Server;
 [Authorize]
 public class OrdersController : Controller
 {
-	private readonly PizzaStoreContext _db;
-
-	public OrdersController(PizzaStoreContext db)
-	{
-		_db = db;
-	}
-
-	[HttpGet]
-	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-	{
-		var orders = await _db.Orders
-				.Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.OrderByDescending(o => o.CreatedTime)
-				.ToListAsync();
-
-		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-	}
-
-	[HttpGet("{orderId}")]
-	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-	{
-		var order = await _db.Orders
-				.Where(o => o.OrderId == orderId)
-				.Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.SingleOrDefaultAsync();
-
-		if (order == null)
-		{
-			return NotFound();
-		}
-
-		return OrderWithStatus.FromOrder(order);
-	}
-
-	[HttpPost]
-	public async Task<ActionResult<int>> PlaceOrder(Order order)
-	{
-		order.CreatedTime = DateTime.Now;
-		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-		order.UserId = GetUserId();
-
-		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
-		// in the database - prevent the submitter from making up
-		// new specials and toppings
-		foreach (var pizza in order.Pizzas)
-		{
-			pizza.SpecialId = pizza.Special.Id;
-			pizza.Special = null;
-
-			foreach (var topping in pizza.Toppings)
-			{
-				topping.ToppingId = topping.Topping.Id;
-				topping.Topping = null;
-			}
-		}
-
-		_db.Orders.Attach(order);
-		await _db.SaveChangesAsync();
-
-		// In the background, send push notifications if possible
-		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-		if (subscription != null)
-		{
-			_ = TrackAndSendNotificationsAsync(order, subscription);
-		}
-
-		return order.OrderId;
-	}
-
-	private string GetUserId()
-	{
-		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
-
-	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-	{
-		// In a realistic case, some other backend process would track
-		// order delivery progress and send us notifications when it
-		// changes. Since we don't have any such process here, fake it.
-		await Task.Delay(OrderWithStatus.PreparationDuration);
-		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-		await Task.Delay(OrderWithStatus.DeliveryDuration);
-		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-	}
-
-	private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-	{
-		// For a real application, generate your own
-		var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
-		var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
-
-		var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
-		var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
-		var webPushClient = new WebPushClient();
-		try
-		{
-			var payload = JsonSerializer.Serialize(new
-			{
-				message,
-				url = $"myorders/{order.OrderId}",
-			});
-			await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
-		}
-		catch (Exception ex)
-		{
-			Console.Error.WriteLine("Error sending push notification: " + ex.Message);
-		}
-	}
+    private readonly PizzaStoreContext _db;
+
+    public OrdersController(PizzaStoreContext db)
+    {
+        _db = db;
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+    {
+        var orders = await _db.Orders
+                .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .OrderByDescending(o => o.CreatedTime)
+                .ToListAsync();
+
+        return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+    }
+
+    [HttpGet("{orderId}")]
+    public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+    {
+        var order = await _db.Orders
+                .Where(o => o.OrderId == orderId)
+                .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .SingleOrDefaultAsync();
+
+        if (order == null)
+        {
+            return NotFound();
+        }
+
+        return OrderWithStatus.FromOrder(order);
+    }
+
+    [HttpPost]
+    public async Task<ActionResult<int>> PlaceOrder(Order order)
+    {
+        order.CreatedTime = DateTime.Now;
+        order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+        order.UserId = GetUserId();
+
+        // Enforce existence of Pizza.SpecialId and Topping.ToppingId
+        // in the database - prevent the submitter from making up
+        // new specials and toppings
+        foreach (var pizza in order.Pizzas)
+        {
+            pizza.SpecialId = pizza.Special.Id;
+            pizza.Special = null;
+
+            foreach (var topping in pizza.Toppings)
+            {
+                topping.ToppingId = topping.Topping.Id;
+                topping.Topping = null;
+            }
+        }
+
+        _db.Orders.Attach(order);
+        await _db.SaveChangesAsync();
+
+        // In the background, send push notifications if possible
+        var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+        if (subscription != null)
+        {
+            _ = TrackAndSendNotificationsAsync(order, subscription);
+        }
+
+        return order.OrderId;
+    }
+
+    private string GetUserId()
+    {
+        return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
+
+    private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+    {
+        // In a realistic case, some other backend process would track
+        // order delivery progress and send us notifications when it
+        // changes. Since we don't have any such process here, fake it.
+        await Task.Delay(OrderWithStatus.PreparationDuration);
+        await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+        await Task.Delay(OrderWithStatus.DeliveryDuration);
+        await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+    }
+
+    private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+    {
+        // For a real application, generate your own
+        var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
+        var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
+
+        var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
+        var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
+        var webPushClient = new WebPushClient();
+        try
+        {
+            var payload = JsonSerializer.Serialize(new
+            {
+                message,
+                url = $"myorders/{order.OrderId}",
+            });
+            await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
+        }
+        catch (Exception ex)
+        {
+            Console.Error.WriteLine("Error sending push notification: " + ex.Message);
+        }
+    }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/07-javascript-interop/BlazingPizza.Server/PizzaApiExtensions.cs
index bf6b7bde..524ca759 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/PizzaApiExtensions.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -7,54 +7,51 @@ namespace BlazingPizza.Server;
 public static class PizzaApiExtensions
 {
 
-	public static WebApplication MapPizzaApi(this WebApplication app)
-	{
+    public static WebApplication MapPizzaApi(this WebApplication app)
+    {
 
-		// Subscribe to notifications
-		app.MapPut("/notifications/subscribe", [Authorize] async (
-			HttpContext context,
-			PizzaStoreContext db,
-			NotificationSubscription subscription) =>
-		{
+        // Subscribe to notifications
+        app.MapPut("/notifications/subscribe", [Authorize] async (
+            HttpContext context,
+            PizzaStoreContext db,
+            NotificationSubscription subscription) => {
 
-			// We're storing at most one subscription per user, so delete old ones.
-			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-			var userId = GetUserId(context);
-			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
-			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+                // We're storing at most one subscription per user, so delete old ones.
+                // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+                var userId = GetUserId(context);
+                var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+                db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
 
-			// Store new subscription
-			subscription.UserId = userId;
-			db.NotificationSubscriptions.Attach(subscription);
+                // Store new subscription
+                subscription.UserId = userId;
+                db.NotificationSubscriptions.Attach(subscription);
 
-			await db.SaveChangesAsync();
-			return Results.Ok(subscription);
+                await db.SaveChangesAsync();
+                return Results.Ok(subscription);
 
-		});
+            });
 
-		// Specials
-		app.MapGet("/specials", async (PizzaStoreContext db) =>
-		{
+        // Specials
+        app.MapGet("/specials", async (PizzaStoreContext db) => {
 
-			var specials = await db.Specials.ToListAsync();
-			return Results.Ok(specials);
+            var specials = await db.Specials.ToListAsync();
+            return Results.Ok(specials);
 
-		});
+        });
 
-		// Toppings
-		app.MapGet("/toppings", async (PizzaStoreContext db) =>
-		{
-			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
-			return Results.Ok(toppings);
-		});
+        // Toppings
+        app.MapGet("/toppings", async (PizzaStoreContext db) => {
+            var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+            return Results.Ok(toppings);
+        });
 
-		return app;
+        return app;
 
-	}
+    }
 
-	private static string GetUserId(HttpContext context)
-	{
-		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
+    private static string GetUserId(HttpContext context)
+    {
+        return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
 
 }
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreContext.cs
index 9a2e17ee..50ac87e4 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using Duende.IdentityServer.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
@@ -7,32 +7,32 @@ namespace BlazingPizza.Server;
 
 public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-	public PizzaStoreContext(
-			DbContextOptions options,
-			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-	{
-	}
+    public PizzaStoreContext(
+            DbContextOptions options,
+            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+    {
+    }
 
-	public DbSet<Order> Orders { get; set; }
+    public DbSet<Order> Orders { get; set; }
 
-	public DbSet<Pizza> Pizzas { get; set; }
+    public DbSet<Pizza> Pizzas { get; set; }
 
-	public DbSet<PizzaSpecial> Specials { get; set; }
+    public DbSet<PizzaSpecial> Specials { get; set; }
 
-	public DbSet<Topping> Toppings { get; set; }
+    public DbSet<Topping> Toppings { get; set; }
 
-	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+    public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
-	{
-		base.OnModelCreating(modelBuilder);
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
 
-		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
-		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+        // Configuring a many-to-many special -> topping relationship that is friendly for serialization
+        modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+        modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+        modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-		// Inline the Lat-Long pairs in Order rather than having a FK to another table
-		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-	}
+        // Inline the Lat-Long pairs in Order rather than having a FK to another table
+        modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+    }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/Program.cs b/save-points/07-javascript-interop/BlazingPizza.Server/Program.cs
index 4484d8f7..b83debb4 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/Program.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/Program.cs
@@ -1,27 +1,27 @@
-using Microsoft.AspNetCore.Authentication;
+using BlazingPizza.Server;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.EntityFrameworkCore;
-using BlazingPizza.Server;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllersWithViews()
-	.AddJsonOptions(options =>  {
-		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
-	});
+    .AddJsonOptions(options => {
+        options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+    });
 builder.Services.AddRazorPages();
 
 builder.Services.AddDbContext<PizzaStoreContext>(options =>
-		options.UseSqlite("Data Source=pizza.db")
-			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+        options.UseSqlite("Data Source=pizza.db")
+            .UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
 
 builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-		.AddEntityFrameworkStores<PizzaStoreContext>();
+        .AddEntityFrameworkStores<PizzaStoreContext>();
 
 builder.Services.AddIdentityServer()
-		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+        .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
 
 builder.Services.AddAuthentication()
-		.AddIdentityServerJwt();
+        .AddIdentityServerJwt();
 
 var app = builder.Build();
 
@@ -29,11 +29,11 @@
 var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
 using (var scope = scopeFactory.CreateScope())
 {
-	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-	if (db.Database.EnsureCreated())
-	{
-		SeedData.Initialize(db);
-	}
+    var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+    if (db.Database.EnsureCreated())
+    {
+        SeedData.Initialize(db);
+    }
 }
 
 // Configure the HTTP request pipeline.
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/SeedData.cs b/save-points/07-javascript-interop/BlazingPizza.Server/SeedData.cs
index a1e47973..f02e2b77 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Server/SeedData.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Server/SeedData.cs
@@ -2,191 +2,191 @@
 
 public static class SeedData
 {
-	public static void Initialize(PizzaStoreContext db)
-	{
-		var toppings = new Topping[]
-		{
-			new Topping()
-			{
-					Name = "Extra cheese",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "American bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "British bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Canadian bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Tea and crumpets",
-					Price = 5.00m
-			},
-			new Topping()
-			{
-					Name = "Fresh-baked scones",
-					Price = 4.50m,
-			},
-			new Topping()
-			{
-					Name = "Bell peppers",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Onions",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Mushrooms",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Pepperoni",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Duck sausage",
-					Price = 3.20m,
-			},
-			new Topping()
-			{
-					Name = "Venison meatballs",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "Served on a silver platter",
-					Price = 250.99m,
-			},
-			new Topping()
-			{
-					Name = "Lobster on top",
-					Price = 64.50m,
-			},
-			new Topping()
-			{
-					Name = "Sturgeon caviar",
-					Price = 101.75m,
-			},
-			new Topping()
-			{
-					Name = "Artichoke hearts",
-					Price = 3.40m,
-			},
-			new Topping()
-			{
-					Name = "Fresh tomatoes",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Basil",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Steak (medium-rare)",
-					Price = 8.50m,
-			},
-			new Topping()
-			{
-					Name = "Blazing hot peppers",
-					Price = 4.20m,
-			},
-			new Topping()
-			{
-					Name = "Buffalo chicken",
-					Price = 5.00m,
-			},
-			new Topping()
-			{
-					Name = "Blue cheese",
-					Price = 2.50m,
-			},
-		};
+    public static void Initialize(PizzaStoreContext db)
+    {
+        var toppings = new Topping[]
+        {
+            new Topping()
+            {
+                    Name = "Extra cheese",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "American bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "British bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Canadian bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Tea and crumpets",
+                    Price = 5.00m
+            },
+            new Topping()
+            {
+                    Name = "Fresh-baked scones",
+                    Price = 4.50m,
+            },
+            new Topping()
+            {
+                    Name = "Bell peppers",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Onions",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Mushrooms",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Pepperoni",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Duck sausage",
+                    Price = 3.20m,
+            },
+            new Topping()
+            {
+                    Name = "Venison meatballs",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "Served on a silver platter",
+                    Price = 250.99m,
+            },
+            new Topping()
+            {
+                    Name = "Lobster on top",
+                    Price = 64.50m,
+            },
+            new Topping()
+            {
+                    Name = "Sturgeon caviar",
+                    Price = 101.75m,
+            },
+            new Topping()
+            {
+                    Name = "Artichoke hearts",
+                    Price = 3.40m,
+            },
+            new Topping()
+            {
+                    Name = "Fresh tomatoes",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Basil",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Steak (medium-rare)",
+                    Price = 8.50m,
+            },
+            new Topping()
+            {
+                    Name = "Blazing hot peppers",
+                    Price = 4.20m,
+            },
+            new Topping()
+            {
+                    Name = "Buffalo chicken",
+                    Price = 5.00m,
+            },
+            new Topping()
+            {
+                    Name = "Blue cheese",
+                    Price = 2.50m,
+            },
+        };
 
-		var specials = new PizzaSpecial[]
-		{
-			new PizzaSpecial()
-			{
-					Name = "Basic Cheese Pizza",
-					Description = "It's cheesy and delicious. Why wouldn't you want one?",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/cheese.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 2,
-					Name = "The Baconatorizor",
-					Description = "It has EVERY kind of bacon",
-					BasePrice = 11.99m,
-					ImageUrl = "img/pizzas/bacon.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 3,
-					Name = "Classic pepperoni",
-					Description = "It's the pizza you grew up with, but Blazing hot!",
-					BasePrice = 10.50m,
-					ImageUrl = "img/pizzas/pepperoni.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 4,
-					Name = "Buffalo chicken",
-					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-					BasePrice = 12.75m,
-					ImageUrl = "img/pizzas/meaty.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 5,
-					Name = "Mushroom Lovers",
-					Description = "It has mushrooms. Isn't that obvious?",
-					BasePrice = 11.00m,
-					ImageUrl = "img/pizzas/mushroom.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 6,
-					Name = "The Brit",
-					Description = "When in London...",
-					BasePrice = 10.25m,
-					ImageUrl = "img/pizzas/brit.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 7,
-					Name = "Veggie Delight",
-					Description = "It's like salad, but on a pizza",
-					BasePrice = 11.50m,
-					ImageUrl = "img/pizzas/salad.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 8,
-					Name = "Margherita",
-					Description = "Traditional Italian pizza with tomatoes and basil",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/margherita.jpg",
-			},
-		};
+        var specials = new PizzaSpecial[]
+        {
+            new PizzaSpecial()
+            {
+                    Name = "Basic Cheese Pizza",
+                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/cheese.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 2,
+                    Name = "The Baconatorizor",
+                    Description = "It has EVERY kind of bacon",
+                    BasePrice = 11.99m,
+                    ImageUrl = "img/pizzas/bacon.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 3,
+                    Name = "Classic pepperoni",
+                    Description = "It's the pizza you grew up with, but Blazing hot!",
+                    BasePrice = 10.50m,
+                    ImageUrl = "img/pizzas/pepperoni.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 4,
+                    Name = "Buffalo chicken",
+                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+                    BasePrice = 12.75m,
+                    ImageUrl = "img/pizzas/meaty.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 5,
+                    Name = "Mushroom Lovers",
+                    Description = "It has mushrooms. Isn't that obvious?",
+                    BasePrice = 11.00m,
+                    ImageUrl = "img/pizzas/mushroom.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 6,
+                    Name = "The Brit",
+                    Description = "When in London...",
+                    BasePrice = 10.25m,
+                    ImageUrl = "img/pizzas/brit.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 7,
+                    Name = "Veggie Delight",
+                    Description = "It's like salad, but on a pizza",
+                    BasePrice = 11.50m,
+                    ImageUrl = "img/pizzas/salad.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 8,
+                    Name = "Margherita",
+                    Description = "Traditional Italian pizza with tomatoes and basil",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/margherita.jpg",
+            },
+        };
 
-		db.Toppings.AddRange(toppings);
-		db.Specials.AddRange(specials);
-		db.SaveChanges();
-	}
+        db.Toppings.AddRange(toppings);
+        db.Specials.AddRange(specials);
+        db.SaveChanges();
+    }
 }
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/Address.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/Address.cs
index 79be9c5b..a671359a 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/Address.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/Address.cs
@@ -2,23 +2,23 @@
 
 public class Address
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Name { get; set; }
+    [Required, MaxLength(100)]
+    public string Name { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Line1 { get; set; }
+    [Required, MaxLength(100)]
+    public string Line1 { get; set; }
 
-	[MaxLength(100)]
-	public string Line2 { get; set; }
+    [MaxLength(100)]
+    public string Line2 { get; set; }
 
-	[Required, MaxLength(50)]
-	public string City { get; set; }
+    [Required, MaxLength(50)]
+    public string City { get; set; }
 
-	[Required, MaxLength(20)]
-	public string Region { get; set; }
+    [Required, MaxLength(20)]
+    public string Region { get; set; }
 
-	[Required, MaxLength(20)]
-	public string PostalCode { get; set; }
+    [Required, MaxLength(20)]
+    public string PostalCode { get; set; }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/LatLong.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/LatLong.cs
index 14a94c26..a65971f8 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/LatLong.cs
@@ -2,25 +2,25 @@
 
 public class LatLong
 {
-	public LatLong()
-	{
-	}
+    public LatLong()
+    {
+    }
 
-	public LatLong(double latitude, double longitude) : this()
-	{
-		Latitude = latitude;
-		Longitude = longitude;
-	}
+    public LatLong(double latitude, double longitude) : this()
+    {
+        Latitude = latitude;
+        Longitude = longitude;
+    }
 
-	public double Latitude { get; set; }
+    public double Latitude { get; set; }
 
-	public double Longitude { get; set; }
+    public double Longitude { get; set; }
 
-	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-	{
-		// The Earth is flat, right? So no need for spherical interpolation.
-		return new LatLong(
-				start.Latitude + (end.Latitude - start.Latitude) * proportion,
-				start.Longitude + (end.Longitude - start.Longitude) * proportion);
-	}
+    public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+    {
+        // The Earth is flat, right? So no need for spherical interpolation.
+        return new LatLong(
+                start.Latitude + (end.Latitude - start.Latitude) * proportion,
+                start.Longitude + (end.Longitude - start.Longitude) * proportion);
+    }
 }
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/NotificationSubscription.cs
index 9109ff57..5c99e3f4 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/NotificationSubscription.cs
@@ -2,13 +2,13 @@
 
 public class NotificationSubscription
 {
-	public int NotificationSubscriptionId { get; set; }
+    public int NotificationSubscriptionId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public string Url { get; set; }
+    public string Url { get; set; }
 
-	public string P256dh { get; set; }
+    public string P256dh { get; set; }
 
-	public string Auth { get; set; }
+    public string Auth { get; set; }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/Order.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/Order.cs
index aca04ca1..b47efad0 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/Order.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/Order.cs
@@ -4,21 +4,21 @@ namespace BlazingPizza;
 
 public class Order
 {
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public DateTime CreatedTime { get; set; }
+    public DateTime CreatedTime { get; set; }
 
-	public Address DeliveryAddress { get; set; } = new Address();
+    public Address DeliveryAddress { get; set; } = new Address();
 
-	public LatLong DeliveryLocation { get; set; }
+    public LatLong DeliveryLocation { get; set; }
 
-	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+    public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+    public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
+    public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
@@ -29,4 +29,4 @@ public class Order
 [JsonSerializable(typeof(List<PizzaSpecial>))]
 [JsonSerializable(typeof(List<Topping>))]
 [JsonSerializable(typeof(Topping))]
-public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class OrderContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/OrderWithStatus.cs
index f5f153b6..fbfac7af 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/OrderWithStatus.cs
@@ -6,73 +6,73 @@ namespace BlazingPizza;
 
 public class OrderWithStatus
 {
-	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+    public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+    public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 
-	public string StatusText { get; set; }
+    public string StatusText { get; set; }
 
-	public bool IsDelivered => StatusText == "Delivered";
+    public bool IsDelivered => StatusText == "Delivered";
 
-	public List<Marker> MapMarkers { get; set; }
+    public List<Marker> MapMarkers { get; set; }
 
-	public static OrderWithStatus FromOrder(Order order)
-	{
-		// To simulate a real backend process, we fake status updates based on the amount
-		// of time since the order was placed
-		string statusText;
-		List<Marker> mapMarkers;
-		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+    public static OrderWithStatus FromOrder(Order order)
+    {
+        // To simulate a real backend process, we fake status updates based on the amount
+        // of time since the order was placed
+        string statusText;
+        List<Marker> mapMarkers;
+        var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-		if (DateTime.Now < dispatchTime)
-		{
-			statusText = "Preparing";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-								};
-		}
-		else if (DateTime.Now < dispatchTime + DeliveryDuration)
-		{
-			statusText = "Out for delivery";
+        if (DateTime.Now < dispatchTime)
+        {
+            statusText = "Preparing";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+                                };
+        }
+        else if (DateTime.Now < dispatchTime + DeliveryDuration)
+        {
+            statusText = "Out for delivery";
 
-			var startPosition = ComputeStartPosition(order);
-			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation),
-										ToMapMarker("Driver", driverPosition, showPopup: true),
-								};
-		}
-		else
-		{
-			statusText = "Delivered";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-								};
-		}
+            var startPosition = ComputeStartPosition(order);
+            var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+            var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation),
+                                        ToMapMarker("Driver", driverPosition, showPopup: true),
+                                };
+        }
+        else
+        {
+            statusText = "Delivered";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+                                };
+        }
 
-		return new OrderWithStatus
-		{
-			Order = order,
-			StatusText = statusText,
-			MapMarkers = mapMarkers,
-		};
-	}
+        return new OrderWithStatus
+        {
+            Order = order,
+            StatusText = statusText,
+            MapMarkers = mapMarkers,
+        };
+    }
 
-	private static LatLong ComputeStartPosition(Order order)
-	{
-		// Random but deterministic based on order ID
-		var rng = new Random(order.OrderId);
-		var distance = 0.01 + rng.NextDouble() * 0.02;
-		var angle = rng.NextDouble() * Math.PI * 2;
-		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-	}
+    private static LatLong ComputeStartPosition(Order order)
+    {
+        // Random but deterministic based on order ID
+        var rng = new Random(order.OrderId);
+        var distance = 0.01 + rng.NextDouble() * 0.02;
+        var angle = rng.NextDouble() * Math.PI * 2;
+        var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+        return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+    }
 
-	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+    static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
 }
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/Pizza.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/Pizza.cs
index 459298f4..2a7a1c29 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/Pizza.cs
@@ -7,38 +7,38 @@ namespace BlazingPizza;
 /// </summary>
 public class Pizza
 {
-	public const int DefaultSize = 12;
-	public const int MinimumSize = 9;
-	public const int MaximumSize = 17;
+    public const int DefaultSize = 12;
+    public const int MinimumSize = 9;
+    public const int MaximumSize = 17;
 
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public PizzaSpecial Special { get; set; }
+    public PizzaSpecial Special { get; set; }
 
-	public int SpecialId { get; set; }
+    public int SpecialId { get; set; }
 
-	public int Size { get; set; }
+    public int Size { get; set; }
 
-	public List<PizzaTopping> Toppings { get; set; }
+    public List<PizzaTopping> Toppings { get; set; }
 
-	public decimal GetBasePrice()
-	{
-		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-	}
+    public decimal GetBasePrice()
+    {
+        return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+    }
 
-	public decimal GetTotalPrice()
-	{
-		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-	}
+    public decimal GetTotalPrice()
+    {
+        return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+    }
 
-	public string GetFormattedTotalPrice()
-	{
-		return GetTotalPrice().ToString("0.00");
-	}
+    public string GetFormattedTotalPrice()
+    {
+        return GetTotalPrice().ToString("0.00");
+    }
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
 [JsonSerializable(typeof(Pizza))]
-public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class PizzaContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaSpecial.cs
index 9653300c..1fd9006a 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaSpecial.cs
@@ -5,15 +5,15 @@
 /// </summary>
 public class PizzaSpecial
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal BasePrice { get; set; }
+    public decimal BasePrice { get; set; }
 
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public string ImageUrl { get; set; }
+    public string ImageUrl { get; set; }
 
-	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+    public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
 }
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaTopping.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaTopping.cs
index 0a711647..1c062732 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/PizzaTopping.cs
@@ -2,10 +2,10 @@
 
 public class PizzaTopping
 {
-	public Topping Topping { get; set; }
+    public Topping Topping { get; set; }
 
-	public int ToppingId { get; set; }
+    public int ToppingId { get; set; }
+
+    public int PizzaId { get; set; }
 
-	public int PizzaId { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/Topping.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/Topping.cs
index 376c311a..4eb67ae9 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/Topping.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/Topping.cs
@@ -2,12 +2,12 @@
 
 public class Topping
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal Price { get; set; }
+    public decimal Price { get; set; }
+
+    public string GetFormattedPrice() => Price.ToString("0.00");
 
-	public string GetFormattedPrice() => Price.ToString("0.00");
-	
 }
\ No newline at end of file
diff --git a/save-points/07-javascript-interop/BlazingPizza.Shared/UserInfo.cs b/save-points/07-javascript-interop/BlazingPizza.Shared/UserInfo.cs
index 362f8f8e..babb4315 100644
--- a/save-points/07-javascript-interop/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/07-javascript-interop/BlazingPizza.Shared/UserInfo.cs
@@ -2,8 +2,8 @@
 
 public class UserInfo
 {
-	public bool IsAuthenticated { get; set; }
+    public bool IsAuthenticated { get; set; }
+
+    public string Name { get; set; }
 
-	public string Name { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Client/JSRuntimeExtensions.cs b/save-points/08-templated-components/BlazingPizza.Client/JSRuntimeExtensions.cs
index cc242348..ef171321 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/JSRuntimeExtensions.cs
+++ b/save-points/08-templated-components/BlazingPizza.Client/JSRuntimeExtensions.cs
@@ -4,8 +4,8 @@ namespace BlazingPizza.Client;
 
 public static class JSRuntimeExtensions
 {
-	public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
-	{
-		return jsRuntime.InvokeAsync<bool>("confirm", message);
-	}
+    public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
+    {
+        return jsRuntime.InvokeAsync<bool>("confirm", message);
+    }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Client/OrderState.cs b/save-points/08-templated-components/BlazingPizza.Client/OrderState.cs
index 4f47979d..00dd3627 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/OrderState.cs
+++ b/save-points/08-templated-components/BlazingPizza.Client/OrderState.cs
@@ -2,51 +2,51 @@
 
 public class OrderState
 {
-	public bool ShowingConfigureDialog { get; private set; }
-
-	public Pizza ConfiguringPizza { get; private set; }
-
-	public Order Order { get; private set; } = new Order();
-
-	public void ShowConfigurePizzaDialog(PizzaSpecial special)
-	{
-		ConfiguringPizza = new Pizza()
-		{
-			Special = special,
-			SpecialId = special.Id,
-			Size = Pizza.DefaultSize,
-			Toppings = new List<PizzaTopping>(),
-		};
-
-		ShowingConfigureDialog = true;
-	}
-
-	public void CancelConfigurePizzaDialog()
-	{
-		ConfiguringPizza = null;
-		ShowingConfigureDialog = false;
-	}
-
-	public void ConfirmConfigurePizzaDialog()
-	{
-		Order.Pizzas.Add(ConfiguringPizza);
-		ConfiguringPizza = null;
-
-		ShowingConfigureDialog = false;
-	}
-
-	public void RemoveConfiguredPizza(Pizza pizza)
-	{
-		Order.Pizzas.Remove(pizza);
-	}
-
-	public void ResetOrder()
-	{
-		Order = new Order();
-	}
-
-	public void ReplaceOrder(Order order)
-	{
-		Order = order;
-	}
+    public bool ShowingConfigureDialog { get; private set; }
+
+    public Pizza ConfiguringPizza { get; private set; }
+
+    public Order Order { get; private set; } = new Order();
+
+    public void ShowConfigurePizzaDialog(PizzaSpecial special)
+    {
+        ConfiguringPizza = new Pizza()
+        {
+            Special = special,
+            SpecialId = special.Id,
+            Size = Pizza.DefaultSize,
+            Toppings = new List<PizzaTopping>(),
+        };
+
+        ShowingConfigureDialog = true;
+    }
+
+    public void CancelConfigurePizzaDialog()
+    {
+        ConfiguringPizza = null;
+        ShowingConfigureDialog = false;
+    }
+
+    public void ConfirmConfigurePizzaDialog()
+    {
+        Order.Pizzas.Add(ConfiguringPizza);
+        ConfiguringPizza = null;
+
+        ShowingConfigureDialog = false;
+    }
+
+    public void RemoveConfiguredPizza(Pizza pizza)
+    {
+        Order.Pizzas.Remove(pizza);
+    }
+
+    public void ResetOrder()
+    {
+        Order = new Order();
+    }
+
+    public void ReplaceOrder(Order order)
+    {
+        Order = order;
+    }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Client/OrdersClient.cs b/save-points/08-templated-components/BlazingPizza.Client/OrdersClient.cs
index e63bd045..b4a08f1e 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/OrdersClient.cs
+++ b/save-points/08-templated-components/BlazingPizza.Client/OrdersClient.cs
@@ -5,32 +5,32 @@ namespace BlazingPizza.Client;
 
 public class OrdersClient
 {
-	private readonly HttpClient httpClient;
+    private readonly HttpClient httpClient;
 
-	public OrdersClient(HttpClient httpClient)
-	{
-		this.httpClient = httpClient;
-	}
+    public OrdersClient(HttpClient httpClient)
+    {
+        this.httpClient = httpClient;
+    }
 
-	public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
-			await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
+    public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
+            await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
 
 
-	public async Task<OrderWithStatus> GetOrder(int orderId) =>
-			await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
+    public async Task<OrderWithStatus> GetOrder(int orderId) =>
+            await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
 
 
-	public async Task<int> PlaceOrder(Order order)
-	{
-		var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
-		response.EnsureSuccessStatusCode();
-		var orderId = await response.Content.ReadFromJsonAsync<int>();
-		return orderId;
-	}
+    public async Task<int> PlaceOrder(Order order)
+    {
+        var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
+        response.EnsureSuccessStatusCode();
+        var orderId = await response.Content.ReadFromJsonAsync<int>();
+        return orderId;
+    }
 
-	public async Task SubscribeToNotifications(NotificationSubscription subscription)
-	{
-		var response = await httpClient.PutAsJsonAsync("notifications/subscribe", subscription);
-		response.EnsureSuccessStatusCode();
-	}
+    public async Task SubscribeToNotifications(NotificationSubscription subscription)
+    {
+        var response = await httpClient.PutAsJsonAsync("notifications/subscribe", subscription);
+        response.EnsureSuccessStatusCode();
+    }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Client/PizzaAuthenticationState.cs b/save-points/08-templated-components/BlazingPizza.Client/PizzaAuthenticationState.cs
index f5bfef65..78627625 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/PizzaAuthenticationState.cs
+++ b/save-points/08-templated-components/BlazingPizza.Client/PizzaAuthenticationState.cs
@@ -4,5 +4,5 @@ namespace BlazingPizza.Client;
 
 public class PizzaAuthenticationState : RemoteAuthenticationState
 {
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Client/Program.cs b/save-points/08-templated-components/BlazingPizza.Client/Program.cs
index 5084a0ad..c2129f0b 100644
--- a/save-points/08-templated-components/BlazingPizza.Client/Program.cs
+++ b/save-points/08-templated-components/BlazingPizza.Client/Program.cs
@@ -1,8 +1,8 @@
-using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
+using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using BlazingPizza.Client;
-using Microsoft.AspNetCore.Components.Web;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
@@ -10,13 +10,12 @@
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
-		.AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
+        .AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
 builder.Services.AddScoped<OrderState>();
 
 // Add auth services
-builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
-{
-	options.AuthenticationPaths.LogOutSucceededPath = "";
+builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options => {
+    options.AuthenticationPaths.LogOutSucceededPath = "";
 });
 
 await builder.Build().RunAsync();
diff --git a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index bb84f13c..be8226ec 100644
--- a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -4,12 +4,12 @@ namespace BlazingPizza.ComponentsLibrary;
 
 public static class LocalStorage
 {
-	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+    public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+    public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+    public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
 }
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index a8e78f2a..b067719c 100644
--- a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -2,11 +2,11 @@
 
 public class Marker
 {
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public double X { get; set; }
+    public double X { get; set; }
 
-	public double Y { get; set; }
+    public double Y { get; set; }
 
-	public bool ShowPopup { get; set; }
+    public bool ShowPopup { get; set; }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Point.cs b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 349046d4..34194163 100644
--- a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -2,7 +2,7 @@
 
 public class Point
 {
-	public double X { get; set; }
+    public double X { get; set; }
 
-	public double Y { get; set; }
+    public double Y { get; set; }
 }
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/08-templated-components/BlazingPizza.Server/OidcConfigurationController.cs
index dc75ecb3..1431697e 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/OidcConfigurationController.cs
@@ -5,17 +5,17 @@ namespace BlazingPizza.Server;
 
 public class OidcConfigurationController : Controller
 {
-	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-	{
-		ClientRequestParametersProvider = clientRequestParametersProvider;
-	}
+    public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+    {
+        ClientRequestParametersProvider = clientRequestParametersProvider;
+    }
 
-	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+    public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-	[HttpGet("_configuration/{clientId}")]
-	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
-	{
-		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-		return Ok(parameters);
-	}
+    [HttpGet("_configuration/{clientId}")]
+    public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+    {
+        var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+        return Ok(parameters);
+    }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Server/OrdersController.cs b/save-points/08-templated-components/BlazingPizza.Server/OrdersController.cs
index 1859decd..3d2ba63f 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/OrdersController.cs
@@ -12,119 +12,119 @@ namespace BlazingPizza.Server;
 [Authorize]
 public class OrdersController : Controller
 {
-	private readonly PizzaStoreContext _db;
-
-	public OrdersController(PizzaStoreContext db)
-	{
-		_db = db;
-	}
-
-	[HttpGet]
-	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-	{
-		var orders = await _db.Orders
-				.Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.OrderByDescending(o => o.CreatedTime)
-				.ToListAsync();
-
-		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-	}
-
-	[HttpGet("{orderId}")]
-	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-	{
-		var order = await _db.Orders
-				.Where(o => o.OrderId == orderId)
-				.Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.SingleOrDefaultAsync();
-
-		if (order == null)
-		{
-			return NotFound();
-		}
-
-		return OrderWithStatus.FromOrder(order);
-	}
-
-	[HttpPost]
-	public async Task<ActionResult<int>> PlaceOrder(Order order)
-	{
-		order.CreatedTime = DateTime.Now;
-		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-		order.UserId = GetUserId();
-
-		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
-		// in the database - prevent the submitter from making up
-		// new specials and toppings
-		foreach (var pizza in order.Pizzas)
-		{
-			pizza.SpecialId = pizza.Special.Id;
-			pizza.Special = null;
-
-			foreach (var topping in pizza.Toppings)
-			{
-				topping.ToppingId = topping.Topping.Id;
-				topping.Topping = null;
-			}
-		}
-
-		_db.Orders.Attach(order);
-		await _db.SaveChangesAsync();
-
-		// In the background, send push notifications if possible
-		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-		if (subscription != null)
-		{
-			_ = TrackAndSendNotificationsAsync(order, subscription);
-		}
-
-		return order.OrderId;
-	}
-
-	private string GetUserId()
-	{
-		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
-
-	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-	{
-		// In a realistic case, some other backend process would track
-		// order delivery progress and send us notifications when it
-		// changes. Since we don't have any such process here, fake it.
-		await Task.Delay(OrderWithStatus.PreparationDuration);
-		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-		await Task.Delay(OrderWithStatus.DeliveryDuration);
-		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-	}
-
-	private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-	{
-		// For a real application, generate your own
-		var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
-		var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
-
-		var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
-		var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
-		var webPushClient = new WebPushClient();
-		try
-		{
-			var payload = JsonSerializer.Serialize(new
-			{
-				message,
-				url = $"myorders/{order.OrderId}",
-			});
-			await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
-		}
-		catch (Exception ex)
-		{
-			Console.Error.WriteLine("Error sending push notification: " + ex.Message);
-		}
-	}
+    private readonly PizzaStoreContext _db;
+
+    public OrdersController(PizzaStoreContext db)
+    {
+        _db = db;
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+    {
+        var orders = await _db.Orders
+                .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .OrderByDescending(o => o.CreatedTime)
+                .ToListAsync();
+
+        return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+    }
+
+    [HttpGet("{orderId}")]
+    public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+    {
+        var order = await _db.Orders
+                .Where(o => o.OrderId == orderId)
+                .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .SingleOrDefaultAsync();
+
+        if (order == null)
+        {
+            return NotFound();
+        }
+
+        return OrderWithStatus.FromOrder(order);
+    }
+
+    [HttpPost]
+    public async Task<ActionResult<int>> PlaceOrder(Order order)
+    {
+        order.CreatedTime = DateTime.Now;
+        order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+        order.UserId = GetUserId();
+
+        // Enforce existence of Pizza.SpecialId and Topping.ToppingId
+        // in the database - prevent the submitter from making up
+        // new specials and toppings
+        foreach (var pizza in order.Pizzas)
+        {
+            pizza.SpecialId = pizza.Special.Id;
+            pizza.Special = null;
+
+            foreach (var topping in pizza.Toppings)
+            {
+                topping.ToppingId = topping.Topping.Id;
+                topping.Topping = null;
+            }
+        }
+
+        _db.Orders.Attach(order);
+        await _db.SaveChangesAsync();
+
+        // In the background, send push notifications if possible
+        var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+        if (subscription != null)
+        {
+            _ = TrackAndSendNotificationsAsync(order, subscription);
+        }
+
+        return order.OrderId;
+    }
+
+    private string GetUserId()
+    {
+        return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
+
+    private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+    {
+        // In a realistic case, some other backend process would track
+        // order delivery progress and send us notifications when it
+        // changes. Since we don't have any such process here, fake it.
+        await Task.Delay(OrderWithStatus.PreparationDuration);
+        await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+        await Task.Delay(OrderWithStatus.DeliveryDuration);
+        await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+    }
+
+    private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+    {
+        // For a real application, generate your own
+        var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
+        var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
+
+        var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
+        var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
+        var webPushClient = new WebPushClient();
+        try
+        {
+            var payload = JsonSerializer.Serialize(new
+            {
+                message,
+                url = $"myorders/{order.OrderId}",
+            });
+            await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
+        }
+        catch (Exception ex)
+        {
+            Console.Error.WriteLine("Error sending push notification: " + ex.Message);
+        }
+    }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/08-templated-components/BlazingPizza.Server/PizzaApiExtensions.cs
index bf6b7bde..524ca759 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/PizzaApiExtensions.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -7,54 +7,51 @@ namespace BlazingPizza.Server;
 public static class PizzaApiExtensions
 {
 
-	public static WebApplication MapPizzaApi(this WebApplication app)
-	{
+    public static WebApplication MapPizzaApi(this WebApplication app)
+    {
 
-		// Subscribe to notifications
-		app.MapPut("/notifications/subscribe", [Authorize] async (
-			HttpContext context,
-			PizzaStoreContext db,
-			NotificationSubscription subscription) =>
-		{
+        // Subscribe to notifications
+        app.MapPut("/notifications/subscribe", [Authorize] async (
+            HttpContext context,
+            PizzaStoreContext db,
+            NotificationSubscription subscription) => {
 
-			// We're storing at most one subscription per user, so delete old ones.
-			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-			var userId = GetUserId(context);
-			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
-			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+                // We're storing at most one subscription per user, so delete old ones.
+                // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+                var userId = GetUserId(context);
+                var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+                db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
 
-			// Store new subscription
-			subscription.UserId = userId;
-			db.NotificationSubscriptions.Attach(subscription);
+                // Store new subscription
+                subscription.UserId = userId;
+                db.NotificationSubscriptions.Attach(subscription);
 
-			await db.SaveChangesAsync();
-			return Results.Ok(subscription);
+                await db.SaveChangesAsync();
+                return Results.Ok(subscription);
 
-		});
+            });
 
-		// Specials
-		app.MapGet("/specials", async (PizzaStoreContext db) =>
-		{
+        // Specials
+        app.MapGet("/specials", async (PizzaStoreContext db) => {
 
-			var specials = await db.Specials.ToListAsync();
-			return Results.Ok(specials);
+            var specials = await db.Specials.ToListAsync();
+            return Results.Ok(specials);
 
-		});
+        });
 
-		// Toppings
-		app.MapGet("/toppings", async (PizzaStoreContext db) =>
-		{
-			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
-			return Results.Ok(toppings);
-		});
+        // Toppings
+        app.MapGet("/toppings", async (PizzaStoreContext db) => {
+            var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+            return Results.Ok(toppings);
+        });
 
-		return app;
+        return app;
 
-	}
+    }
 
-	private static string GetUserId(HttpContext context)
-	{
-		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
+    private static string GetUserId(HttpContext context)
+    {
+        return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
 
 }
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreContext.cs
index 9a2e17ee..50ac87e4 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,4 +1,4 @@
-using Duende.IdentityServer.EntityFramework.Options;
+using Duende.IdentityServer.EntityFramework.Options;
 using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
@@ -7,32 +7,32 @@ namespace BlazingPizza.Server;
 
 public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-	public PizzaStoreContext(
-			DbContextOptions options,
-			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-	{
-	}
+    public PizzaStoreContext(
+            DbContextOptions options,
+            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+    {
+    }
 
-	public DbSet<Order> Orders { get; set; }
+    public DbSet<Order> Orders { get; set; }
 
-	public DbSet<Pizza> Pizzas { get; set; }
+    public DbSet<Pizza> Pizzas { get; set; }
 
-	public DbSet<PizzaSpecial> Specials { get; set; }
+    public DbSet<PizzaSpecial> Specials { get; set; }
 
-	public DbSet<Topping> Toppings { get; set; }
+    public DbSet<Topping> Toppings { get; set; }
 
-	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+    public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
-	{
-		base.OnModelCreating(modelBuilder);
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
 
-		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
-		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+        // Configuring a many-to-many special -> topping relationship that is friendly for serialization
+        modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+        modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+        modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-		// Inline the Lat-Long pairs in Order rather than having a FK to another table
-		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-	}
+        // Inline the Lat-Long pairs in Order rather than having a FK to another table
+        modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+    }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Server/Program.cs b/save-points/08-templated-components/BlazingPizza.Server/Program.cs
index 4484d8f7..b83debb4 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/Program.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/Program.cs
@@ -1,27 +1,27 @@
-using Microsoft.AspNetCore.Authentication;
+using BlazingPizza.Server;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.EntityFrameworkCore;
-using BlazingPizza.Server;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllersWithViews()
-	.AddJsonOptions(options =>  {
-		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
-	});
+    .AddJsonOptions(options => {
+        options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+    });
 builder.Services.AddRazorPages();
 
 builder.Services.AddDbContext<PizzaStoreContext>(options =>
-		options.UseSqlite("Data Source=pizza.db")
-			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+        options.UseSqlite("Data Source=pizza.db")
+            .UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
 
 builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-		.AddEntityFrameworkStores<PizzaStoreContext>();
+        .AddEntityFrameworkStores<PizzaStoreContext>();
 
 builder.Services.AddIdentityServer()
-		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+        .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
 
 builder.Services.AddAuthentication()
-		.AddIdentityServerJwt();
+        .AddIdentityServerJwt();
 
 var app = builder.Build();
 
@@ -29,11 +29,11 @@
 var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
 using (var scope = scopeFactory.CreateScope())
 {
-	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-	if (db.Database.EnsureCreated())
-	{
-		SeedData.Initialize(db);
-	}
+    var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+    if (db.Database.EnsureCreated())
+    {
+        SeedData.Initialize(db);
+    }
 }
 
 // Configure the HTTP request pipeline.
diff --git a/save-points/08-templated-components/BlazingPizza.Server/SeedData.cs b/save-points/08-templated-components/BlazingPizza.Server/SeedData.cs
index a1e47973..f02e2b77 100644
--- a/save-points/08-templated-components/BlazingPizza.Server/SeedData.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/SeedData.cs
@@ -2,191 +2,191 @@
 
 public static class SeedData
 {
-	public static void Initialize(PizzaStoreContext db)
-	{
-		var toppings = new Topping[]
-		{
-			new Topping()
-			{
-					Name = "Extra cheese",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "American bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "British bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Canadian bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Tea and crumpets",
-					Price = 5.00m
-			},
-			new Topping()
-			{
-					Name = "Fresh-baked scones",
-					Price = 4.50m,
-			},
-			new Topping()
-			{
-					Name = "Bell peppers",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Onions",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Mushrooms",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Pepperoni",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Duck sausage",
-					Price = 3.20m,
-			},
-			new Topping()
-			{
-					Name = "Venison meatballs",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "Served on a silver platter",
-					Price = 250.99m,
-			},
-			new Topping()
-			{
-					Name = "Lobster on top",
-					Price = 64.50m,
-			},
-			new Topping()
-			{
-					Name = "Sturgeon caviar",
-					Price = 101.75m,
-			},
-			new Topping()
-			{
-					Name = "Artichoke hearts",
-					Price = 3.40m,
-			},
-			new Topping()
-			{
-					Name = "Fresh tomatoes",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Basil",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Steak (medium-rare)",
-					Price = 8.50m,
-			},
-			new Topping()
-			{
-					Name = "Blazing hot peppers",
-					Price = 4.20m,
-			},
-			new Topping()
-			{
-					Name = "Buffalo chicken",
-					Price = 5.00m,
-			},
-			new Topping()
-			{
-					Name = "Blue cheese",
-					Price = 2.50m,
-			},
-		};
+    public static void Initialize(PizzaStoreContext db)
+    {
+        var toppings = new Topping[]
+        {
+            new Topping()
+            {
+                    Name = "Extra cheese",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "American bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "British bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Canadian bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Tea and crumpets",
+                    Price = 5.00m
+            },
+            new Topping()
+            {
+                    Name = "Fresh-baked scones",
+                    Price = 4.50m,
+            },
+            new Topping()
+            {
+                    Name = "Bell peppers",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Onions",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Mushrooms",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Pepperoni",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Duck sausage",
+                    Price = 3.20m,
+            },
+            new Topping()
+            {
+                    Name = "Venison meatballs",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "Served on a silver platter",
+                    Price = 250.99m,
+            },
+            new Topping()
+            {
+                    Name = "Lobster on top",
+                    Price = 64.50m,
+            },
+            new Topping()
+            {
+                    Name = "Sturgeon caviar",
+                    Price = 101.75m,
+            },
+            new Topping()
+            {
+                    Name = "Artichoke hearts",
+                    Price = 3.40m,
+            },
+            new Topping()
+            {
+                    Name = "Fresh tomatoes",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Basil",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Steak (medium-rare)",
+                    Price = 8.50m,
+            },
+            new Topping()
+            {
+                    Name = "Blazing hot peppers",
+                    Price = 4.20m,
+            },
+            new Topping()
+            {
+                    Name = "Buffalo chicken",
+                    Price = 5.00m,
+            },
+            new Topping()
+            {
+                    Name = "Blue cheese",
+                    Price = 2.50m,
+            },
+        };
 
-		var specials = new PizzaSpecial[]
-		{
-			new PizzaSpecial()
-			{
-					Name = "Basic Cheese Pizza",
-					Description = "It's cheesy and delicious. Why wouldn't you want one?",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/cheese.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 2,
-					Name = "The Baconatorizor",
-					Description = "It has EVERY kind of bacon",
-					BasePrice = 11.99m,
-					ImageUrl = "img/pizzas/bacon.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 3,
-					Name = "Classic pepperoni",
-					Description = "It's the pizza you grew up with, but Blazing hot!",
-					BasePrice = 10.50m,
-					ImageUrl = "img/pizzas/pepperoni.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 4,
-					Name = "Buffalo chicken",
-					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-					BasePrice = 12.75m,
-					ImageUrl = "img/pizzas/meaty.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 5,
-					Name = "Mushroom Lovers",
-					Description = "It has mushrooms. Isn't that obvious?",
-					BasePrice = 11.00m,
-					ImageUrl = "img/pizzas/mushroom.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 6,
-					Name = "The Brit",
-					Description = "When in London...",
-					BasePrice = 10.25m,
-					ImageUrl = "img/pizzas/brit.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 7,
-					Name = "Veggie Delight",
-					Description = "It's like salad, but on a pizza",
-					BasePrice = 11.50m,
-					ImageUrl = "img/pizzas/salad.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 8,
-					Name = "Margherita",
-					Description = "Traditional Italian pizza with tomatoes and basil",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/margherita.jpg",
-			},
-		};
+        var specials = new PizzaSpecial[]
+        {
+            new PizzaSpecial()
+            {
+                    Name = "Basic Cheese Pizza",
+                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/cheese.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 2,
+                    Name = "The Baconatorizor",
+                    Description = "It has EVERY kind of bacon",
+                    BasePrice = 11.99m,
+                    ImageUrl = "img/pizzas/bacon.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 3,
+                    Name = "Classic pepperoni",
+                    Description = "It's the pizza you grew up with, but Blazing hot!",
+                    BasePrice = 10.50m,
+                    ImageUrl = "img/pizzas/pepperoni.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 4,
+                    Name = "Buffalo chicken",
+                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+                    BasePrice = 12.75m,
+                    ImageUrl = "img/pizzas/meaty.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 5,
+                    Name = "Mushroom Lovers",
+                    Description = "It has mushrooms. Isn't that obvious?",
+                    BasePrice = 11.00m,
+                    ImageUrl = "img/pizzas/mushroom.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 6,
+                    Name = "The Brit",
+                    Description = "When in London...",
+                    BasePrice = 10.25m,
+                    ImageUrl = "img/pizzas/brit.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 7,
+                    Name = "Veggie Delight",
+                    Description = "It's like salad, but on a pizza",
+                    BasePrice = 11.50m,
+                    ImageUrl = "img/pizzas/salad.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 8,
+                    Name = "Margherita",
+                    Description = "Traditional Italian pizza with tomatoes and basil",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/margherita.jpg",
+            },
+        };
 
-		db.Toppings.AddRange(toppings);
-		db.Specials.AddRange(specials);
-		db.SaveChanges();
-	}
+        db.Toppings.AddRange(toppings);
+        db.Specials.AddRange(specials);
+        db.SaveChanges();
+    }
 }
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/Address.cs b/save-points/08-templated-components/BlazingPizza.Shared/Address.cs
index 79be9c5b..a671359a 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/Address.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/Address.cs
@@ -2,23 +2,23 @@
 
 public class Address
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Name { get; set; }
+    [Required, MaxLength(100)]
+    public string Name { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Line1 { get; set; }
+    [Required, MaxLength(100)]
+    public string Line1 { get; set; }
 
-	[MaxLength(100)]
-	public string Line2 { get; set; }
+    [MaxLength(100)]
+    public string Line2 { get; set; }
 
-	[Required, MaxLength(50)]
-	public string City { get; set; }
+    [Required, MaxLength(50)]
+    public string City { get; set; }
 
-	[Required, MaxLength(20)]
-	public string Region { get; set; }
+    [Required, MaxLength(20)]
+    public string Region { get; set; }
 
-	[Required, MaxLength(20)]
-	public string PostalCode { get; set; }
+    [Required, MaxLength(20)]
+    public string PostalCode { get; set; }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/LatLong.cs b/save-points/08-templated-components/BlazingPizza.Shared/LatLong.cs
index 14a94c26..a65971f8 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/LatLong.cs
@@ -2,25 +2,25 @@
 
 public class LatLong
 {
-	public LatLong()
-	{
-	}
+    public LatLong()
+    {
+    }
 
-	public LatLong(double latitude, double longitude) : this()
-	{
-		Latitude = latitude;
-		Longitude = longitude;
-	}
+    public LatLong(double latitude, double longitude) : this()
+    {
+        Latitude = latitude;
+        Longitude = longitude;
+    }
 
-	public double Latitude { get; set; }
+    public double Latitude { get; set; }
 
-	public double Longitude { get; set; }
+    public double Longitude { get; set; }
 
-	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-	{
-		// The Earth is flat, right? So no need for spherical interpolation.
-		return new LatLong(
-				start.Latitude + (end.Latitude - start.Latitude) * proportion,
-				start.Longitude + (end.Longitude - start.Longitude) * proportion);
-	}
+    public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+    {
+        // The Earth is flat, right? So no need for spherical interpolation.
+        return new LatLong(
+                start.Latitude + (end.Latitude - start.Latitude) * proportion,
+                start.Longitude + (end.Longitude - start.Longitude) * proportion);
+    }
 }
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/08-templated-components/BlazingPizza.Shared/NotificationSubscription.cs
index 9109ff57..5c99e3f4 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/NotificationSubscription.cs
@@ -2,13 +2,13 @@
 
 public class NotificationSubscription
 {
-	public int NotificationSubscriptionId { get; set; }
+    public int NotificationSubscriptionId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public string Url { get; set; }
+    public string Url { get; set; }
 
-	public string P256dh { get; set; }
+    public string P256dh { get; set; }
 
-	public string Auth { get; set; }
+    public string Auth { get; set; }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/Order.cs b/save-points/08-templated-components/BlazingPizza.Shared/Order.cs
index aca04ca1..b47efad0 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/Order.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/Order.cs
@@ -4,21 +4,21 @@ namespace BlazingPizza;
 
 public class Order
 {
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public DateTime CreatedTime { get; set; }
+    public DateTime CreatedTime { get; set; }
 
-	public Address DeliveryAddress { get; set; } = new Address();
+    public Address DeliveryAddress { get; set; } = new Address();
 
-	public LatLong DeliveryLocation { get; set; }
+    public LatLong DeliveryLocation { get; set; }
 
-	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+    public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+    public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
+    public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
@@ -29,4 +29,4 @@ public class Order
 [JsonSerializable(typeof(List<PizzaSpecial>))]
 [JsonSerializable(typeof(List<Topping>))]
 [JsonSerializable(typeof(Topping))]
-public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class OrderContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/08-templated-components/BlazingPizza.Shared/OrderWithStatus.cs
index f5f153b6..fbfac7af 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/OrderWithStatus.cs
@@ -6,73 +6,73 @@ namespace BlazingPizza;
 
 public class OrderWithStatus
 {
-	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+    public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+    public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 
-	public string StatusText { get; set; }
+    public string StatusText { get; set; }
 
-	public bool IsDelivered => StatusText == "Delivered";
+    public bool IsDelivered => StatusText == "Delivered";
 
-	public List<Marker> MapMarkers { get; set; }
+    public List<Marker> MapMarkers { get; set; }
 
-	public static OrderWithStatus FromOrder(Order order)
-	{
-		// To simulate a real backend process, we fake status updates based on the amount
-		// of time since the order was placed
-		string statusText;
-		List<Marker> mapMarkers;
-		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+    public static OrderWithStatus FromOrder(Order order)
+    {
+        // To simulate a real backend process, we fake status updates based on the amount
+        // of time since the order was placed
+        string statusText;
+        List<Marker> mapMarkers;
+        var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-		if (DateTime.Now < dispatchTime)
-		{
-			statusText = "Preparing";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-								};
-		}
-		else if (DateTime.Now < dispatchTime + DeliveryDuration)
-		{
-			statusText = "Out for delivery";
+        if (DateTime.Now < dispatchTime)
+        {
+            statusText = "Preparing";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+                                };
+        }
+        else if (DateTime.Now < dispatchTime + DeliveryDuration)
+        {
+            statusText = "Out for delivery";
 
-			var startPosition = ComputeStartPosition(order);
-			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation),
-										ToMapMarker("Driver", driverPosition, showPopup: true),
-								};
-		}
-		else
-		{
-			statusText = "Delivered";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-								};
-		}
+            var startPosition = ComputeStartPosition(order);
+            var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+            var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation),
+                                        ToMapMarker("Driver", driverPosition, showPopup: true),
+                                };
+        }
+        else
+        {
+            statusText = "Delivered";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+                                };
+        }
 
-		return new OrderWithStatus
-		{
-			Order = order,
-			StatusText = statusText,
-			MapMarkers = mapMarkers,
-		};
-	}
+        return new OrderWithStatus
+        {
+            Order = order,
+            StatusText = statusText,
+            MapMarkers = mapMarkers,
+        };
+    }
 
-	private static LatLong ComputeStartPosition(Order order)
-	{
-		// Random but deterministic based on order ID
-		var rng = new Random(order.OrderId);
-		var distance = 0.01 + rng.NextDouble() * 0.02;
-		var angle = rng.NextDouble() * Math.PI * 2;
-		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-	}
+    private static LatLong ComputeStartPosition(Order order)
+    {
+        // Random but deterministic based on order ID
+        var rng = new Random(order.OrderId);
+        var distance = 0.01 + rng.NextDouble() * 0.02;
+        var angle = rng.NextDouble() * Math.PI * 2;
+        var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+        return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+    }
 
-	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+    static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
 }
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/Pizza.cs b/save-points/08-templated-components/BlazingPizza.Shared/Pizza.cs
index 459298f4..2a7a1c29 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/Pizza.cs
@@ -7,38 +7,38 @@ namespace BlazingPizza;
 /// </summary>
 public class Pizza
 {
-	public const int DefaultSize = 12;
-	public const int MinimumSize = 9;
-	public const int MaximumSize = 17;
+    public const int DefaultSize = 12;
+    public const int MinimumSize = 9;
+    public const int MaximumSize = 17;
 
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public PizzaSpecial Special { get; set; }
+    public PizzaSpecial Special { get; set; }
 
-	public int SpecialId { get; set; }
+    public int SpecialId { get; set; }
 
-	public int Size { get; set; }
+    public int Size { get; set; }
 
-	public List<PizzaTopping> Toppings { get; set; }
+    public List<PizzaTopping> Toppings { get; set; }
 
-	public decimal GetBasePrice()
-	{
-		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-	}
+    public decimal GetBasePrice()
+    {
+        return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+    }
 
-	public decimal GetTotalPrice()
-	{
-		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-	}
+    public decimal GetTotalPrice()
+    {
+        return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+    }
 
-	public string GetFormattedTotalPrice()
-	{
-		return GetTotalPrice().ToString("0.00");
-	}
+    public string GetFormattedTotalPrice()
+    {
+        return GetTotalPrice().ToString("0.00");
+    }
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
 [JsonSerializable(typeof(Pizza))]
-public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class PizzaContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/08-templated-components/BlazingPizza.Shared/PizzaSpecial.cs
index 9653300c..1fd9006a 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/PizzaSpecial.cs
@@ -5,15 +5,15 @@
 /// </summary>
 public class PizzaSpecial
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal BasePrice { get; set; }
+    public decimal BasePrice { get; set; }
 
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public string ImageUrl { get; set; }
+    public string ImageUrl { get; set; }
 
-	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+    public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
 }
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/PizzaTopping.cs b/save-points/08-templated-components/BlazingPizza.Shared/PizzaTopping.cs
index 0a711647..1c062732 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/PizzaTopping.cs
@@ -2,10 +2,10 @@
 
 public class PizzaTopping
 {
-	public Topping Topping { get; set; }
+    public Topping Topping { get; set; }
 
-	public int ToppingId { get; set; }
+    public int ToppingId { get; set; }
+
+    public int PizzaId { get; set; }
 
-	public int PizzaId { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/Topping.cs b/save-points/08-templated-components/BlazingPizza.Shared/Topping.cs
index 376c311a..4eb67ae9 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/Topping.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/Topping.cs
@@ -2,12 +2,12 @@
 
 public class Topping
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal Price { get; set; }
+    public decimal Price { get; set; }
+
+    public string GetFormattedPrice() => Price.ToString("0.00");
 
-	public string GetFormattedPrice() => Price.ToString("0.00");
-	
 }
\ No newline at end of file
diff --git a/save-points/08-templated-components/BlazingPizza.Shared/UserInfo.cs b/save-points/08-templated-components/BlazingPizza.Shared/UserInfo.cs
index 362f8f8e..babb4315 100644
--- a/save-points/08-templated-components/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/08-templated-components/BlazingPizza.Shared/UserInfo.cs
@@ -2,8 +2,8 @@
 
 public class UserInfo
 {
-	public bool IsAuthenticated { get; set; }
+    public bool IsAuthenticated { get; set; }
+
+    public string Name { get; set; }
 
-	public string Name { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/JSRuntimeExtensions.cs b/save-points/09-progressive-web-app/BlazingPizza.Client/JSRuntimeExtensions.cs
index cc242348..ef171321 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/JSRuntimeExtensions.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/JSRuntimeExtensions.cs
@@ -4,8 +4,8 @@ namespace BlazingPizza.Client;
 
 public static class JSRuntimeExtensions
 {
-	public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
-	{
-		return jsRuntime.InvokeAsync<bool>("confirm", message);
-	}
+    public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
+    {
+        return jsRuntime.InvokeAsync<bool>("confirm", message);
+    }
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/OrderState.cs b/save-points/09-progressive-web-app/BlazingPizza.Client/OrderState.cs
index 4f47979d..00dd3627 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/OrderState.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/OrderState.cs
@@ -2,51 +2,51 @@
 
 public class OrderState
 {
-	public bool ShowingConfigureDialog { get; private set; }
-
-	public Pizza ConfiguringPizza { get; private set; }
-
-	public Order Order { get; private set; } = new Order();
-
-	public void ShowConfigurePizzaDialog(PizzaSpecial special)
-	{
-		ConfiguringPizza = new Pizza()
-		{
-			Special = special,
-			SpecialId = special.Id,
-			Size = Pizza.DefaultSize,
-			Toppings = new List<PizzaTopping>(),
-		};
-
-		ShowingConfigureDialog = true;
-	}
-
-	public void CancelConfigurePizzaDialog()
-	{
-		ConfiguringPizza = null;
-		ShowingConfigureDialog = false;
-	}
-
-	public void ConfirmConfigurePizzaDialog()
-	{
-		Order.Pizzas.Add(ConfiguringPizza);
-		ConfiguringPizza = null;
-
-		ShowingConfigureDialog = false;
-	}
-
-	public void RemoveConfiguredPizza(Pizza pizza)
-	{
-		Order.Pizzas.Remove(pizza);
-	}
-
-	public void ResetOrder()
-	{
-		Order = new Order();
-	}
-
-	public void ReplaceOrder(Order order)
-	{
-		Order = order;
-	}
+    public bool ShowingConfigureDialog { get; private set; }
+
+    public Pizza ConfiguringPizza { get; private set; }
+
+    public Order Order { get; private set; } = new Order();
+
+    public void ShowConfigurePizzaDialog(PizzaSpecial special)
+    {
+        ConfiguringPizza = new Pizza()
+        {
+            Special = special,
+            SpecialId = special.Id,
+            Size = Pizza.DefaultSize,
+            Toppings = new List<PizzaTopping>(),
+        };
+
+        ShowingConfigureDialog = true;
+    }
+
+    public void CancelConfigurePizzaDialog()
+    {
+        ConfiguringPizza = null;
+        ShowingConfigureDialog = false;
+    }
+
+    public void ConfirmConfigurePizzaDialog()
+    {
+        Order.Pizzas.Add(ConfiguringPizza);
+        ConfiguringPizza = null;
+
+        ShowingConfigureDialog = false;
+    }
+
+    public void RemoveConfiguredPizza(Pizza pizza)
+    {
+        Order.Pizzas.Remove(pizza);
+    }
+
+    public void ResetOrder()
+    {
+        Order = new Order();
+    }
+
+    public void ReplaceOrder(Order order)
+    {
+        Order = order;
+    }
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/OrdersClient.cs b/save-points/09-progressive-web-app/BlazingPizza.Client/OrdersClient.cs
index 59dcb35b..c2c1a398 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/OrdersClient.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/OrdersClient.cs
@@ -4,32 +4,32 @@ namespace BlazingPizza.Client;
 
 public class OrdersClient
 {
-	private readonly HttpClient httpClient;
+    private readonly HttpClient httpClient;
 
-	public OrdersClient(HttpClient httpClient)
-	{
-		this.httpClient = httpClient;
-	}
+    public OrdersClient(HttpClient httpClient)
+    {
+        this.httpClient = httpClient;
+    }
 
-	public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
-			await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
+    public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
+            await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
 
 
-	public async Task<OrderWithStatus> GetOrder(int orderId) =>
-			await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
+    public async Task<OrderWithStatus> GetOrder(int orderId) =>
+            await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
 
 
-	public async Task<int> PlaceOrder(Order order)
-	{
-		var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
-		response.EnsureSuccessStatusCode();
-		var orderId = await response.Content.ReadFromJsonAsync<int>();
-		return orderId;
-	}
+    public async Task<int> PlaceOrder(Order order)
+    {
+        var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
+        response.EnsureSuccessStatusCode();
+        var orderId = await response.Content.ReadFromJsonAsync<int>();
+        return orderId;
+    }
 
-	public async Task SubscribeToNotifications(NotificationSubscription subscription)
-	{
-		var response = await httpClient.PutAsJsonAsync("notifications/subscribe", subscription);
-		response.EnsureSuccessStatusCode();
-	}
+    public async Task SubscribeToNotifications(NotificationSubscription subscription)
+    {
+        var response = await httpClient.PutAsJsonAsync("notifications/subscribe", subscription);
+        response.EnsureSuccessStatusCode();
+    }
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/PizzaAuthenticationState.cs b/save-points/09-progressive-web-app/BlazingPizza.Client/PizzaAuthenticationState.cs
index f5bfef65..78627625 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/PizzaAuthenticationState.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/PizzaAuthenticationState.cs
@@ -4,5 +4,5 @@ namespace BlazingPizza.Client;
 
 public class PizzaAuthenticationState : RemoteAuthenticationState
 {
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs b/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs
index 5084a0ad..c2129f0b 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs
@@ -1,8 +1,8 @@
-using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
+using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using BlazingPizza.Client;
-using Microsoft.AspNetCore.Components.Web;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
@@ -10,13 +10,12 @@
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
-		.AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
+        .AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
 builder.Services.AddScoped<OrderState>();
 
 // Add auth services
-builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
-{
-	options.AuthenticationPaths.LogOutSucceededPath = "";
+builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options => {
+    options.AuthenticationPaths.LogOutSucceededPath = "";
 });
 
 await builder.Build().RunAsync();
diff --git a/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index bb84f13c..be8226ec 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -4,12 +4,12 @@ namespace BlazingPizza.ComponentsLibrary;
 
 public static class LocalStorage
 {
-	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+    public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+    public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+    public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
 }
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/OidcConfigurationController.cs
index dc75ecb3..1431697e 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/OidcConfigurationController.cs
@@ -5,17 +5,17 @@ namespace BlazingPizza.Server;
 
 public class OidcConfigurationController : Controller
 {
-	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-	{
-		ClientRequestParametersProvider = clientRequestParametersProvider;
-	}
+    public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+    {
+        ClientRequestParametersProvider = clientRequestParametersProvider;
+    }
 
-	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+    public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-	[HttpGet("_configuration/{clientId}")]
-	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
-	{
-		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-		return Ok(parameters);
-	}
+    [HttpGet("_configuration/{clientId}")]
+    public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+    {
+        var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+        return Ok(parameters);
+    }
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/OrdersController.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/OrdersController.cs
index 1859decd..3d2ba63f 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/OrdersController.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/OrdersController.cs
@@ -12,119 +12,119 @@ namespace BlazingPizza.Server;
 [Authorize]
 public class OrdersController : Controller
 {
-	private readonly PizzaStoreContext _db;
-
-	public OrdersController(PizzaStoreContext db)
-	{
-		_db = db;
-	}
-
-	[HttpGet]
-	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-	{
-		var orders = await _db.Orders
-				.Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.OrderByDescending(o => o.CreatedTime)
-				.ToListAsync();
-
-		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-	}
-
-	[HttpGet("{orderId}")]
-	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-	{
-		var order = await _db.Orders
-				.Where(o => o.OrderId == orderId)
-				.Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.SingleOrDefaultAsync();
-
-		if (order == null)
-		{
-			return NotFound();
-		}
-
-		return OrderWithStatus.FromOrder(order);
-	}
-
-	[HttpPost]
-	public async Task<ActionResult<int>> PlaceOrder(Order order)
-	{
-		order.CreatedTime = DateTime.Now;
-		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-		order.UserId = GetUserId();
-
-		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
-		// in the database - prevent the submitter from making up
-		// new specials and toppings
-		foreach (var pizza in order.Pizzas)
-		{
-			pizza.SpecialId = pizza.Special.Id;
-			pizza.Special = null;
-
-			foreach (var topping in pizza.Toppings)
-			{
-				topping.ToppingId = topping.Topping.Id;
-				topping.Topping = null;
-			}
-		}
-
-		_db.Orders.Attach(order);
-		await _db.SaveChangesAsync();
-
-		// In the background, send push notifications if possible
-		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-		if (subscription != null)
-		{
-			_ = TrackAndSendNotificationsAsync(order, subscription);
-		}
-
-		return order.OrderId;
-	}
-
-	private string GetUserId()
-	{
-		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
-
-	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-	{
-		// In a realistic case, some other backend process would track
-		// order delivery progress and send us notifications when it
-		// changes. Since we don't have any such process here, fake it.
-		await Task.Delay(OrderWithStatus.PreparationDuration);
-		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-		await Task.Delay(OrderWithStatus.DeliveryDuration);
-		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-	}
-
-	private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-	{
-		// For a real application, generate your own
-		var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
-		var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
-
-		var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
-		var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
-		var webPushClient = new WebPushClient();
-		try
-		{
-			var payload = JsonSerializer.Serialize(new
-			{
-				message,
-				url = $"myorders/{order.OrderId}",
-			});
-			await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
-		}
-		catch (Exception ex)
-		{
-			Console.Error.WriteLine("Error sending push notification: " + ex.Message);
-		}
-	}
+    private readonly PizzaStoreContext _db;
+
+    public OrdersController(PizzaStoreContext db)
+    {
+        _db = db;
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+    {
+        var orders = await _db.Orders
+                .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .OrderByDescending(o => o.CreatedTime)
+                .ToListAsync();
+
+        return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+    }
+
+    [HttpGet("{orderId}")]
+    public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+    {
+        var order = await _db.Orders
+                .Where(o => o.OrderId == orderId)
+                .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .SingleOrDefaultAsync();
+
+        if (order == null)
+        {
+            return NotFound();
+        }
+
+        return OrderWithStatus.FromOrder(order);
+    }
+
+    [HttpPost]
+    public async Task<ActionResult<int>> PlaceOrder(Order order)
+    {
+        order.CreatedTime = DateTime.Now;
+        order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+        order.UserId = GetUserId();
+
+        // Enforce existence of Pizza.SpecialId and Topping.ToppingId
+        // in the database - prevent the submitter from making up
+        // new specials and toppings
+        foreach (var pizza in order.Pizzas)
+        {
+            pizza.SpecialId = pizza.Special.Id;
+            pizza.Special = null;
+
+            foreach (var topping in pizza.Toppings)
+            {
+                topping.ToppingId = topping.Topping.Id;
+                topping.Topping = null;
+            }
+        }
+
+        _db.Orders.Attach(order);
+        await _db.SaveChangesAsync();
+
+        // In the background, send push notifications if possible
+        var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+        if (subscription != null)
+        {
+            _ = TrackAndSendNotificationsAsync(order, subscription);
+        }
+
+        return order.OrderId;
+    }
+
+    private string GetUserId()
+    {
+        return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
+
+    private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+    {
+        // In a realistic case, some other backend process would track
+        // order delivery progress and send us notifications when it
+        // changes. Since we don't have any such process here, fake it.
+        await Task.Delay(OrderWithStatus.PreparationDuration);
+        await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+        await Task.Delay(OrderWithStatus.DeliveryDuration);
+        await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+    }
+
+    private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+    {
+        // For a real application, generate your own
+        var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
+        var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
+
+        var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
+        var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
+        var webPushClient = new WebPushClient();
+        try
+        {
+            var payload = JsonSerializer.Serialize(new
+            {
+                message,
+                url = $"myorders/{order.OrderId}",
+            });
+            await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
+        }
+        catch (Exception ex)
+        {
+            Console.Error.WriteLine("Error sending push notification: " + ex.Message);
+        }
+    }
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaApiExtensions.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaApiExtensions.cs
index bf6b7bde..524ca759 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaApiExtensions.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -7,54 +7,51 @@ namespace BlazingPizza.Server;
 public static class PizzaApiExtensions
 {
 
-	public static WebApplication MapPizzaApi(this WebApplication app)
-	{
+    public static WebApplication MapPizzaApi(this WebApplication app)
+    {
 
-		// Subscribe to notifications
-		app.MapPut("/notifications/subscribe", [Authorize] async (
-			HttpContext context,
-			PizzaStoreContext db,
-			NotificationSubscription subscription) =>
-		{
+        // Subscribe to notifications
+        app.MapPut("/notifications/subscribe", [Authorize] async (
+            HttpContext context,
+            PizzaStoreContext db,
+            NotificationSubscription subscription) => {
 
-			// We're storing at most one subscription per user, so delete old ones.
-			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-			var userId = GetUserId(context);
-			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
-			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+                // We're storing at most one subscription per user, so delete old ones.
+                // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+                var userId = GetUserId(context);
+                var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+                db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
 
-			// Store new subscription
-			subscription.UserId = userId;
-			db.NotificationSubscriptions.Attach(subscription);
+                // Store new subscription
+                subscription.UserId = userId;
+                db.NotificationSubscriptions.Attach(subscription);
 
-			await db.SaveChangesAsync();
-			return Results.Ok(subscription);
+                await db.SaveChangesAsync();
+                return Results.Ok(subscription);
 
-		});
+            });
 
-		// Specials
-		app.MapGet("/specials", async (PizzaStoreContext db) =>
-		{
+        // Specials
+        app.MapGet("/specials", async (PizzaStoreContext db) => {
 
-			var specials = await db.Specials.ToListAsync();
-			return Results.Ok(specials);
+            var specials = await db.Specials.ToListAsync();
+            return Results.Ok(specials);
 
-		});
+        });
 
-		// Toppings
-		app.MapGet("/toppings", async (PizzaStoreContext db) =>
-		{
-			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
-			return Results.Ok(toppings);
-		});
+        // Toppings
+        app.MapGet("/toppings", async (PizzaStoreContext db) => {
+            var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+            return Results.Ok(toppings);
+        });
 
-		return app;
+        return app;
 
-	}
+    }
 
-	private static string GetUserId(HttpContext context)
-	{
-		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
+    private static string GetUserId(HttpContext context)
+    {
+        return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
 
 }
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreContext.cs
index 992baa19..50ac87e4 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/PizzaStoreContext.cs
@@ -7,32 +7,32 @@ namespace BlazingPizza.Server;
 
 public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-	public PizzaStoreContext(
-			DbContextOptions options,
-			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-	{
-	}
+    public PizzaStoreContext(
+            DbContextOptions options,
+            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+    {
+    }
 
-	public DbSet<Order> Orders { get; set; }
+    public DbSet<Order> Orders { get; set; }
 
-	public DbSet<Pizza> Pizzas { get; set; }
+    public DbSet<Pizza> Pizzas { get; set; }
 
-	public DbSet<PizzaSpecial> Specials { get; set; }
+    public DbSet<PizzaSpecial> Specials { get; set; }
 
-	public DbSet<Topping> Toppings { get; set; }
+    public DbSet<Topping> Toppings { get; set; }
 
-	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+    public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
-	{
-		base.OnModelCreating(modelBuilder);
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
 
-		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
-		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+        // Configuring a many-to-many special -> topping relationship that is friendly for serialization
+        modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+        modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+        modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-		// Inline the Lat-Long pairs in Order rather than having a FK to another table
-		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-	}
+        // Inline the Lat-Long pairs in Order rather than having a FK to another table
+        modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+    }
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/Program.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/Program.cs
index 4484d8f7..b83debb4 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/Program.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Program.cs
@@ -1,27 +1,27 @@
-using Microsoft.AspNetCore.Authentication;
+using BlazingPizza.Server;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.EntityFrameworkCore;
-using BlazingPizza.Server;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllersWithViews()
-	.AddJsonOptions(options =>  {
-		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
-	});
+    .AddJsonOptions(options => {
+        options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+    });
 builder.Services.AddRazorPages();
 
 builder.Services.AddDbContext<PizzaStoreContext>(options =>
-		options.UseSqlite("Data Source=pizza.db")
-			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+        options.UseSqlite("Data Source=pizza.db")
+            .UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
 
 builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-		.AddEntityFrameworkStores<PizzaStoreContext>();
+        .AddEntityFrameworkStores<PizzaStoreContext>();
 
 builder.Services.AddIdentityServer()
-		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+        .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
 
 builder.Services.AddAuthentication()
-		.AddIdentityServerJwt();
+        .AddIdentityServerJwt();
 
 var app = builder.Build();
 
@@ -29,11 +29,11 @@
 var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
 using (var scope = scopeFactory.CreateScope())
 {
-	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-	if (db.Database.EnsureCreated())
-	{
-		SeedData.Initialize(db);
-	}
+    var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+    if (db.Database.EnsureCreated())
+    {
+        SeedData.Initialize(db);
+    }
 }
 
 // Configure the HTTP request pipeline.
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/SeedData.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/SeedData.cs
index a1e47973..f02e2b77 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/SeedData.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/SeedData.cs
@@ -2,191 +2,191 @@
 
 public static class SeedData
 {
-	public static void Initialize(PizzaStoreContext db)
-	{
-		var toppings = new Topping[]
-		{
-			new Topping()
-			{
-					Name = "Extra cheese",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "American bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "British bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Canadian bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Tea and crumpets",
-					Price = 5.00m
-			},
-			new Topping()
-			{
-					Name = "Fresh-baked scones",
-					Price = 4.50m,
-			},
-			new Topping()
-			{
-					Name = "Bell peppers",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Onions",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Mushrooms",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Pepperoni",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Duck sausage",
-					Price = 3.20m,
-			},
-			new Topping()
-			{
-					Name = "Venison meatballs",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "Served on a silver platter",
-					Price = 250.99m,
-			},
-			new Topping()
-			{
-					Name = "Lobster on top",
-					Price = 64.50m,
-			},
-			new Topping()
-			{
-					Name = "Sturgeon caviar",
-					Price = 101.75m,
-			},
-			new Topping()
-			{
-					Name = "Artichoke hearts",
-					Price = 3.40m,
-			},
-			new Topping()
-			{
-					Name = "Fresh tomatoes",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Basil",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Steak (medium-rare)",
-					Price = 8.50m,
-			},
-			new Topping()
-			{
-					Name = "Blazing hot peppers",
-					Price = 4.20m,
-			},
-			new Topping()
-			{
-					Name = "Buffalo chicken",
-					Price = 5.00m,
-			},
-			new Topping()
-			{
-					Name = "Blue cheese",
-					Price = 2.50m,
-			},
-		};
+    public static void Initialize(PizzaStoreContext db)
+    {
+        var toppings = new Topping[]
+        {
+            new Topping()
+            {
+                    Name = "Extra cheese",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "American bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "British bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Canadian bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Tea and crumpets",
+                    Price = 5.00m
+            },
+            new Topping()
+            {
+                    Name = "Fresh-baked scones",
+                    Price = 4.50m,
+            },
+            new Topping()
+            {
+                    Name = "Bell peppers",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Onions",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Mushrooms",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Pepperoni",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Duck sausage",
+                    Price = 3.20m,
+            },
+            new Topping()
+            {
+                    Name = "Venison meatballs",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "Served on a silver platter",
+                    Price = 250.99m,
+            },
+            new Topping()
+            {
+                    Name = "Lobster on top",
+                    Price = 64.50m,
+            },
+            new Topping()
+            {
+                    Name = "Sturgeon caviar",
+                    Price = 101.75m,
+            },
+            new Topping()
+            {
+                    Name = "Artichoke hearts",
+                    Price = 3.40m,
+            },
+            new Topping()
+            {
+                    Name = "Fresh tomatoes",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Basil",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Steak (medium-rare)",
+                    Price = 8.50m,
+            },
+            new Topping()
+            {
+                    Name = "Blazing hot peppers",
+                    Price = 4.20m,
+            },
+            new Topping()
+            {
+                    Name = "Buffalo chicken",
+                    Price = 5.00m,
+            },
+            new Topping()
+            {
+                    Name = "Blue cheese",
+                    Price = 2.50m,
+            },
+        };
 
-		var specials = new PizzaSpecial[]
-		{
-			new PizzaSpecial()
-			{
-					Name = "Basic Cheese Pizza",
-					Description = "It's cheesy and delicious. Why wouldn't you want one?",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/cheese.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 2,
-					Name = "The Baconatorizor",
-					Description = "It has EVERY kind of bacon",
-					BasePrice = 11.99m,
-					ImageUrl = "img/pizzas/bacon.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 3,
-					Name = "Classic pepperoni",
-					Description = "It's the pizza you grew up with, but Blazing hot!",
-					BasePrice = 10.50m,
-					ImageUrl = "img/pizzas/pepperoni.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 4,
-					Name = "Buffalo chicken",
-					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-					BasePrice = 12.75m,
-					ImageUrl = "img/pizzas/meaty.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 5,
-					Name = "Mushroom Lovers",
-					Description = "It has mushrooms. Isn't that obvious?",
-					BasePrice = 11.00m,
-					ImageUrl = "img/pizzas/mushroom.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 6,
-					Name = "The Brit",
-					Description = "When in London...",
-					BasePrice = 10.25m,
-					ImageUrl = "img/pizzas/brit.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 7,
-					Name = "Veggie Delight",
-					Description = "It's like salad, but on a pizza",
-					BasePrice = 11.50m,
-					ImageUrl = "img/pizzas/salad.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 8,
-					Name = "Margherita",
-					Description = "Traditional Italian pizza with tomatoes and basil",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/margherita.jpg",
-			},
-		};
+        var specials = new PizzaSpecial[]
+        {
+            new PizzaSpecial()
+            {
+                    Name = "Basic Cheese Pizza",
+                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/cheese.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 2,
+                    Name = "The Baconatorizor",
+                    Description = "It has EVERY kind of bacon",
+                    BasePrice = 11.99m,
+                    ImageUrl = "img/pizzas/bacon.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 3,
+                    Name = "Classic pepperoni",
+                    Description = "It's the pizza you grew up with, but Blazing hot!",
+                    BasePrice = 10.50m,
+                    ImageUrl = "img/pizzas/pepperoni.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 4,
+                    Name = "Buffalo chicken",
+                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+                    BasePrice = 12.75m,
+                    ImageUrl = "img/pizzas/meaty.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 5,
+                    Name = "Mushroom Lovers",
+                    Description = "It has mushrooms. Isn't that obvious?",
+                    BasePrice = 11.00m,
+                    ImageUrl = "img/pizzas/mushroom.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 6,
+                    Name = "The Brit",
+                    Description = "When in London...",
+                    BasePrice = 10.25m,
+                    ImageUrl = "img/pizzas/brit.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 7,
+                    Name = "Veggie Delight",
+                    Description = "It's like salad, but on a pizza",
+                    BasePrice = 11.50m,
+                    ImageUrl = "img/pizzas/salad.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 8,
+                    Name = "Margherita",
+                    Description = "Traditional Italian pizza with tomatoes and basil",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/margherita.jpg",
+            },
+        };
 
-		db.Toppings.AddRange(toppings);
-		db.Specials.AddRange(specials);
-		db.SaveChanges();
-	}
+        db.Toppings.AddRange(toppings);
+        db.Specials.AddRange(specials);
+        db.SaveChanges();
+    }
 }
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/Address.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/Address.cs
index 79be9c5b..a671359a 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/Address.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/Address.cs
@@ -2,23 +2,23 @@
 
 public class Address
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Name { get; set; }
+    [Required, MaxLength(100)]
+    public string Name { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Line1 { get; set; }
+    [Required, MaxLength(100)]
+    public string Line1 { get; set; }
 
-	[MaxLength(100)]
-	public string Line2 { get; set; }
+    [MaxLength(100)]
+    public string Line2 { get; set; }
 
-	[Required, MaxLength(50)]
-	public string City { get; set; }
+    [Required, MaxLength(50)]
+    public string City { get; set; }
 
-	[Required, MaxLength(20)]
-	public string Region { get; set; }
+    [Required, MaxLength(20)]
+    public string Region { get; set; }
 
-	[Required, MaxLength(20)]
-	public string PostalCode { get; set; }
+    [Required, MaxLength(20)]
+    public string PostalCode { get; set; }
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/LatLong.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/LatLong.cs
index 14a94c26..a65971f8 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/LatLong.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/LatLong.cs
@@ -2,25 +2,25 @@
 
 public class LatLong
 {
-	public LatLong()
-	{
-	}
+    public LatLong()
+    {
+    }
 
-	public LatLong(double latitude, double longitude) : this()
-	{
-		Latitude = latitude;
-		Longitude = longitude;
-	}
+    public LatLong(double latitude, double longitude) : this()
+    {
+        Latitude = latitude;
+        Longitude = longitude;
+    }
 
-	public double Latitude { get; set; }
+    public double Latitude { get; set; }
 
-	public double Longitude { get; set; }
+    public double Longitude { get; set; }
 
-	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-	{
-		// The Earth is flat, right? So no need for spherical interpolation.
-		return new LatLong(
-				start.Latitude + (end.Latitude - start.Latitude) * proportion,
-				start.Longitude + (end.Longitude - start.Longitude) * proportion);
-	}
+    public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+    {
+        // The Earth is flat, right? So no need for spherical interpolation.
+        return new LatLong(
+                start.Latitude + (end.Latitude - start.Latitude) * proportion,
+                start.Longitude + (end.Longitude - start.Longitude) * proportion);
+    }
 }
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/NotificationSubscription.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/NotificationSubscription.cs
index 9109ff57..5c99e3f4 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/NotificationSubscription.cs
@@ -2,13 +2,13 @@
 
 public class NotificationSubscription
 {
-	public int NotificationSubscriptionId { get; set; }
+    public int NotificationSubscriptionId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public string Url { get; set; }
+    public string Url { get; set; }
 
-	public string P256dh { get; set; }
+    public string P256dh { get; set; }
 
-	public string Auth { get; set; }
+    public string Auth { get; set; }
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/Order.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/Order.cs
index aca04ca1..b47efad0 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/Order.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/Order.cs
@@ -4,21 +4,21 @@ namespace BlazingPizza;
 
 public class Order
 {
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public DateTime CreatedTime { get; set; }
+    public DateTime CreatedTime { get; set; }
 
-	public Address DeliveryAddress { get; set; } = new Address();
+    public Address DeliveryAddress { get; set; } = new Address();
 
-	public LatLong DeliveryLocation { get; set; }
+    public LatLong DeliveryLocation { get; set; }
 
-	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+    public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+    public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
+    public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
@@ -29,4 +29,4 @@ public class Order
 [JsonSerializable(typeof(List<PizzaSpecial>))]
 [JsonSerializable(typeof(List<Topping>))]
 [JsonSerializable(typeof(Topping))]
-public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class OrderContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/OrderWithStatus.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/OrderWithStatus.cs
index f5f153b6..fbfac7af 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/OrderWithStatus.cs
@@ -6,73 +6,73 @@ namespace BlazingPizza;
 
 public class OrderWithStatus
 {
-	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+    public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+    public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 
-	public string StatusText { get; set; }
+    public string StatusText { get; set; }
 
-	public bool IsDelivered => StatusText == "Delivered";
+    public bool IsDelivered => StatusText == "Delivered";
 
-	public List<Marker> MapMarkers { get; set; }
+    public List<Marker> MapMarkers { get; set; }
 
-	public static OrderWithStatus FromOrder(Order order)
-	{
-		// To simulate a real backend process, we fake status updates based on the amount
-		// of time since the order was placed
-		string statusText;
-		List<Marker> mapMarkers;
-		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+    public static OrderWithStatus FromOrder(Order order)
+    {
+        // To simulate a real backend process, we fake status updates based on the amount
+        // of time since the order was placed
+        string statusText;
+        List<Marker> mapMarkers;
+        var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-		if (DateTime.Now < dispatchTime)
-		{
-			statusText = "Preparing";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-								};
-		}
-		else if (DateTime.Now < dispatchTime + DeliveryDuration)
-		{
-			statusText = "Out for delivery";
+        if (DateTime.Now < dispatchTime)
+        {
+            statusText = "Preparing";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+                                };
+        }
+        else if (DateTime.Now < dispatchTime + DeliveryDuration)
+        {
+            statusText = "Out for delivery";
 
-			var startPosition = ComputeStartPosition(order);
-			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation),
-										ToMapMarker("Driver", driverPosition, showPopup: true),
-								};
-		}
-		else
-		{
-			statusText = "Delivered";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-								};
-		}
+            var startPosition = ComputeStartPosition(order);
+            var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+            var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation),
+                                        ToMapMarker("Driver", driverPosition, showPopup: true),
+                                };
+        }
+        else
+        {
+            statusText = "Delivered";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+                                };
+        }
 
-		return new OrderWithStatus
-		{
-			Order = order,
-			StatusText = statusText,
-			MapMarkers = mapMarkers,
-		};
-	}
+        return new OrderWithStatus
+        {
+            Order = order,
+            StatusText = statusText,
+            MapMarkers = mapMarkers,
+        };
+    }
 
-	private static LatLong ComputeStartPosition(Order order)
-	{
-		// Random but deterministic based on order ID
-		var rng = new Random(order.OrderId);
-		var distance = 0.01 + rng.NextDouble() * 0.02;
-		var angle = rng.NextDouble() * Math.PI * 2;
-		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-	}
+    private static LatLong ComputeStartPosition(Order order)
+    {
+        // Random but deterministic based on order ID
+        var rng = new Random(order.OrderId);
+        var distance = 0.01 + rng.NextDouble() * 0.02;
+        var angle = rng.NextDouble() * Math.PI * 2;
+        var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+        return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+    }
 
-	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+    static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
 }
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/Pizza.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/Pizza.cs
index 459298f4..2a7a1c29 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/Pizza.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/Pizza.cs
@@ -7,38 +7,38 @@ namespace BlazingPizza;
 /// </summary>
 public class Pizza
 {
-	public const int DefaultSize = 12;
-	public const int MinimumSize = 9;
-	public const int MaximumSize = 17;
+    public const int DefaultSize = 12;
+    public const int MinimumSize = 9;
+    public const int MaximumSize = 17;
 
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public PizzaSpecial Special { get; set; }
+    public PizzaSpecial Special { get; set; }
 
-	public int SpecialId { get; set; }
+    public int SpecialId { get; set; }
 
-	public int Size { get; set; }
+    public int Size { get; set; }
 
-	public List<PizzaTopping> Toppings { get; set; }
+    public List<PizzaTopping> Toppings { get; set; }
 
-	public decimal GetBasePrice()
-	{
-		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-	}
+    public decimal GetBasePrice()
+    {
+        return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+    }
 
-	public decimal GetTotalPrice()
-	{
-		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-	}
+    public decimal GetTotalPrice()
+    {
+        return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+    }
 
-	public string GetFormattedTotalPrice()
-	{
-		return GetTotalPrice().ToString("0.00");
-	}
+    public string GetFormattedTotalPrice()
+    {
+        return GetTotalPrice().ToString("0.00");
+    }
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
 [JsonSerializable(typeof(Pizza))]
-public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class PizzaContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaSpecial.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaSpecial.cs
index 9653300c..1fd9006a 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaSpecial.cs
@@ -5,15 +5,15 @@
 /// </summary>
 public class PizzaSpecial
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal BasePrice { get; set; }
+    public decimal BasePrice { get; set; }
 
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public string ImageUrl { get; set; }
+    public string ImageUrl { get; set; }
 
-	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+    public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
 }
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaTopping.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaTopping.cs
index 0a711647..1c062732 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaTopping.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/PizzaTopping.cs
@@ -2,10 +2,10 @@
 
 public class PizzaTopping
 {
-	public Topping Topping { get; set; }
+    public Topping Topping { get; set; }
 
-	public int ToppingId { get; set; }
+    public int ToppingId { get; set; }
+
+    public int PizzaId { get; set; }
 
-	public int PizzaId { get; set; }
-	
 }
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/Topping.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/Topping.cs
index 376c311a..4eb67ae9 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/Topping.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/Topping.cs
@@ -2,12 +2,12 @@
 
 public class Topping
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal Price { get; set; }
+    public decimal Price { get; set; }
+
+    public string GetFormattedPrice() => Price.ToString("0.00");
 
-	public string GetFormattedPrice() => Price.ToString("0.00");
-	
 }
\ No newline at end of file
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Shared/UserInfo.cs b/save-points/09-progressive-web-app/BlazingPizza.Shared/UserInfo.cs
index 362f8f8e..babb4315 100644
--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/UserInfo.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/UserInfo.cs
@@ -2,8 +2,8 @@
 
 public class UserInfo
 {
-	public bool IsAuthenticated { get; set; }
+    public bool IsAuthenticated { get; set; }
+
+    public string Name { get; set; }
 
-	public string Name { get; set; }
-	
 }
\ No newline at end of file
diff --git a/src/BlazingPizza.Client/JSRuntimeExtensions.cs b/src/BlazingPizza.Client/JSRuntimeExtensions.cs
index cc242348..ef171321 100644
--- a/src/BlazingPizza.Client/JSRuntimeExtensions.cs
+++ b/src/BlazingPizza.Client/JSRuntimeExtensions.cs
@@ -4,8 +4,8 @@ namespace BlazingPizza.Client;
 
 public static class JSRuntimeExtensions
 {
-	public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
-	{
-		return jsRuntime.InvokeAsync<bool>("confirm", message);
-	}
+    public static ValueTask<bool> Confirm(this IJSRuntime jsRuntime, string message)
+    {
+        return jsRuntime.InvokeAsync<bool>("confirm", message);
+    }
 }
diff --git a/src/BlazingPizza.Client/OrderState.cs b/src/BlazingPizza.Client/OrderState.cs
index 4f47979d..00dd3627 100644
--- a/src/BlazingPizza.Client/OrderState.cs
+++ b/src/BlazingPizza.Client/OrderState.cs
@@ -2,51 +2,51 @@
 
 public class OrderState
 {
-	public bool ShowingConfigureDialog { get; private set; }
-
-	public Pizza ConfiguringPizza { get; private set; }
-
-	public Order Order { get; private set; } = new Order();
-
-	public void ShowConfigurePizzaDialog(PizzaSpecial special)
-	{
-		ConfiguringPizza = new Pizza()
-		{
-			Special = special,
-			SpecialId = special.Id,
-			Size = Pizza.DefaultSize,
-			Toppings = new List<PizzaTopping>(),
-		};
-
-		ShowingConfigureDialog = true;
-	}
-
-	public void CancelConfigurePizzaDialog()
-	{
-		ConfiguringPizza = null;
-		ShowingConfigureDialog = false;
-	}
-
-	public void ConfirmConfigurePizzaDialog()
-	{
-		Order.Pizzas.Add(ConfiguringPizza);
-		ConfiguringPizza = null;
-
-		ShowingConfigureDialog = false;
-	}
-
-	public void RemoveConfiguredPizza(Pizza pizza)
-	{
-		Order.Pizzas.Remove(pizza);
-	}
-
-	public void ResetOrder()
-	{
-		Order = new Order();
-	}
-
-	public void ReplaceOrder(Order order)
-	{
-		Order = order;
-	}
+    public bool ShowingConfigureDialog { get; private set; }
+
+    public Pizza ConfiguringPizza { get; private set; }
+
+    public Order Order { get; private set; } = new Order();
+
+    public void ShowConfigurePizzaDialog(PizzaSpecial special)
+    {
+        ConfiguringPizza = new Pizza()
+        {
+            Special = special,
+            SpecialId = special.Id,
+            Size = Pizza.DefaultSize,
+            Toppings = new List<PizzaTopping>(),
+        };
+
+        ShowingConfigureDialog = true;
+    }
+
+    public void CancelConfigurePizzaDialog()
+    {
+        ConfiguringPizza = null;
+        ShowingConfigureDialog = false;
+    }
+
+    public void ConfirmConfigurePizzaDialog()
+    {
+        Order.Pizzas.Add(ConfiguringPizza);
+        ConfiguringPizza = null;
+
+        ShowingConfigureDialog = false;
+    }
+
+    public void RemoveConfiguredPizza(Pizza pizza)
+    {
+        Order.Pizzas.Remove(pizza);
+    }
+
+    public void ResetOrder()
+    {
+        Order = new Order();
+    }
+
+    public void ReplaceOrder(Order order)
+    {
+        Order = order;
+    }
 }
diff --git a/src/BlazingPizza.Client/OrdersClient.cs b/src/BlazingPizza.Client/OrdersClient.cs
index e63bd045..b4a08f1e 100644
--- a/src/BlazingPizza.Client/OrdersClient.cs
+++ b/src/BlazingPizza.Client/OrdersClient.cs
@@ -5,32 +5,32 @@ namespace BlazingPizza.Client;
 
 public class OrdersClient
 {
-	private readonly HttpClient httpClient;
+    private readonly HttpClient httpClient;
 
-	public OrdersClient(HttpClient httpClient)
-	{
-		this.httpClient = httpClient;
-	}
+    public OrdersClient(HttpClient httpClient)
+    {
+        this.httpClient = httpClient;
+    }
 
-	public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
-			await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
+    public async Task<IEnumerable<OrderWithStatus>> GetOrders() =>
+            await httpClient.GetFromJsonAsync("orders", OrderContext.Default.ListOrderWithStatus);
 
 
-	public async Task<OrderWithStatus> GetOrder(int orderId) =>
-			await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
+    public async Task<OrderWithStatus> GetOrder(int orderId) =>
+            await httpClient.GetFromJsonAsync($"orders/{orderId}", OrderContext.Default.OrderWithStatus);
 
 
-	public async Task<int> PlaceOrder(Order order)
-	{
-		var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
-		response.EnsureSuccessStatusCode();
-		var orderId = await response.Content.ReadFromJsonAsync<int>();
-		return orderId;
-	}
+    public async Task<int> PlaceOrder(Order order)
+    {
+        var response = await httpClient.PostAsJsonAsync("orders", order, OrderContext.Default.Order);
+        response.EnsureSuccessStatusCode();
+        var orderId = await response.Content.ReadFromJsonAsync<int>();
+        return orderId;
+    }
 
-	public async Task SubscribeToNotifications(NotificationSubscription subscription)
-	{
-		var response = await httpClient.PutAsJsonAsync("notifications/subscribe", subscription);
-		response.EnsureSuccessStatusCode();
-	}
+    public async Task SubscribeToNotifications(NotificationSubscription subscription)
+    {
+        var response = await httpClient.PutAsJsonAsync("notifications/subscribe", subscription);
+        response.EnsureSuccessStatusCode();
+    }
 }
diff --git a/src/BlazingPizza.Client/PizzaAuthenticationState.cs b/src/BlazingPizza.Client/PizzaAuthenticationState.cs
index f5bfef65..78627625 100644
--- a/src/BlazingPizza.Client/PizzaAuthenticationState.cs
+++ b/src/BlazingPizza.Client/PizzaAuthenticationState.cs
@@ -4,5 +4,5 @@ namespace BlazingPizza.Client;
 
 public class PizzaAuthenticationState : RemoteAuthenticationState
 {
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 }
diff --git a/src/BlazingPizza.Client/Program.cs b/src/BlazingPizza.Client/Program.cs
index 5084a0ad..c2129f0b 100644
--- a/src/BlazingPizza.Client/Program.cs
+++ b/src/BlazingPizza.Client/Program.cs
@@ -1,8 +1,8 @@
-using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
+using BlazingPizza.Client;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using BlazingPizza.Client;
-using Microsoft.AspNetCore.Components.Web;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
@@ -10,13 +10,12 @@
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
-		.AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
+        .AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
 builder.Services.AddScoped<OrderState>();
 
 // Add auth services
-builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options =>
-{
-	options.AuthenticationPaths.LogOutSucceededPath = "";
+builder.Services.AddApiAuthorization<PizzaAuthenticationState>(options => {
+    options.AuthenticationPaths.LogOutSucceededPath = "";
 });
 
 await builder.Build().RunAsync();
diff --git a/src/BlazingPizza.ComponentsLibrary/LocalStorage.cs b/src/BlazingPizza.ComponentsLibrary/LocalStorage.cs
index bb84f13c..be8226ec 100644
--- a/src/BlazingPizza.ComponentsLibrary/LocalStorage.cs
+++ b/src/BlazingPizza.ComponentsLibrary/LocalStorage.cs
@@ -4,12 +4,12 @@ namespace BlazingPizza.ComponentsLibrary;
 
 public static class LocalStorage
 {
-	public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
+    public static ValueTask<T> GetAsync<T>(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeAsync<T>("blazorLocalStorage.get", key);
 
-	public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
+    public static ValueTask SetAsync(IJSRuntime jsRuntime, string key, object value)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.set", key, value);
 
-	public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
-			=> jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
+    public static ValueTask DeleteAsync(IJSRuntime jsRuntime, string key)
+            => jsRuntime.InvokeVoidAsync("blazorLocalStorage.delete", key);
 }
\ No newline at end of file
diff --git a/src/BlazingPizza.ComponentsLibrary/Map/Marker.cs b/src/BlazingPizza.ComponentsLibrary/Map/Marker.cs
index a8e78f2a..b067719c 100644
--- a/src/BlazingPizza.ComponentsLibrary/Map/Marker.cs
+++ b/src/BlazingPizza.ComponentsLibrary/Map/Marker.cs
@@ -2,11 +2,11 @@
 
 public class Marker
 {
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public double X { get; set; }
+    public double X { get; set; }
 
-	public double Y { get; set; }
+    public double Y { get; set; }
 
-	public bool ShowPopup { get; set; }
+    public bool ShowPopup { get; set; }
 }
diff --git a/src/BlazingPizza.ComponentsLibrary/Map/Point.cs b/src/BlazingPizza.ComponentsLibrary/Map/Point.cs
index 349046d4..34194163 100644
--- a/src/BlazingPizza.ComponentsLibrary/Map/Point.cs
+++ b/src/BlazingPizza.ComponentsLibrary/Map/Point.cs
@@ -2,7 +2,7 @@
 
 public class Point
 {
-	public double X { get; set; }
+    public double X { get; set; }
 
-	public double Y { get; set; }
+    public double Y { get; set; }
 }
\ No newline at end of file
diff --git a/src/BlazingPizza.Server/OidcConfigurationController.cs b/src/BlazingPizza.Server/OidcConfigurationController.cs
index dc75ecb3..1431697e 100644
--- a/src/BlazingPizza.Server/OidcConfigurationController.cs
+++ b/src/BlazingPizza.Server/OidcConfigurationController.cs
@@ -5,17 +5,17 @@ namespace BlazingPizza.Server;
 
 public class OidcConfigurationController : Controller
 {
-	public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
-	{
-		ClientRequestParametersProvider = clientRequestParametersProvider;
-	}
+    public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+    {
+        ClientRequestParametersProvider = clientRequestParametersProvider;
+    }
 
-	public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+    public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
 
-	[HttpGet("_configuration/{clientId}")]
-	public IActionResult GetClientRequestParameters([FromRoute] string clientId)
-	{
-		var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
-		return Ok(parameters);
-	}
+    [HttpGet("_configuration/{clientId}")]
+    public IActionResult GetClientRequestParameters([FromRoute] string clientId)
+    {
+        var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+        return Ok(parameters);
+    }
 }
diff --git a/src/BlazingPizza.Server/OrdersController.cs b/src/BlazingPizza.Server/OrdersController.cs
index 1859decd..3d2ba63f 100644
--- a/src/BlazingPizza.Server/OrdersController.cs
+++ b/src/BlazingPizza.Server/OrdersController.cs
@@ -12,119 +12,119 @@ namespace BlazingPizza.Server;
 [Authorize]
 public class OrdersController : Controller
 {
-	private readonly PizzaStoreContext _db;
-
-	public OrdersController(PizzaStoreContext db)
-	{
-		_db = db;
-	}
-
-	[HttpGet]
-	public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
-	{
-		var orders = await _db.Orders
-				.Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.OrderByDescending(o => o.CreatedTime)
-				.ToListAsync();
-
-		return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
-	}
-
-	[HttpGet("{orderId}")]
-	public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
-	{
-		var order = await _db.Orders
-				.Where(o => o.OrderId == orderId)
-				.Where(o => o.UserId == GetUserId())
-				.Include(o => o.DeliveryLocation)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Special)
-				.Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
-				.SingleOrDefaultAsync();
-
-		if (order == null)
-		{
-			return NotFound();
-		}
-
-		return OrderWithStatus.FromOrder(order);
-	}
-
-	[HttpPost]
-	public async Task<ActionResult<int>> PlaceOrder(Order order)
-	{
-		order.CreatedTime = DateTime.Now;
-		order.DeliveryLocation = new LatLong(51.5001, -0.1239);
-		order.UserId = GetUserId();
-
-		// Enforce existence of Pizza.SpecialId and Topping.ToppingId
-		// in the database - prevent the submitter from making up
-		// new specials and toppings
-		foreach (var pizza in order.Pizzas)
-		{
-			pizza.SpecialId = pizza.Special.Id;
-			pizza.Special = null;
-
-			foreach (var topping in pizza.Toppings)
-			{
-				topping.ToppingId = topping.Topping.Id;
-				topping.Topping = null;
-			}
-		}
-
-		_db.Orders.Attach(order);
-		await _db.SaveChangesAsync();
-
-		// In the background, send push notifications if possible
-		var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
-		if (subscription != null)
-		{
-			_ = TrackAndSendNotificationsAsync(order, subscription);
-		}
-
-		return order.OrderId;
-	}
-
-	private string GetUserId()
-	{
-		return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
-
-	private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
-	{
-		// In a realistic case, some other backend process would track
-		// order delivery progress and send us notifications when it
-		// changes. Since we don't have any such process here, fake it.
-		await Task.Delay(OrderWithStatus.PreparationDuration);
-		await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
-
-		await Task.Delay(OrderWithStatus.DeliveryDuration);
-		await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
-	}
-
-	private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
-	{
-		// For a real application, generate your own
-		var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
-		var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
-
-		var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
-		var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
-		var webPushClient = new WebPushClient();
-		try
-		{
-			var payload = JsonSerializer.Serialize(new
-			{
-				message,
-				url = $"myorders/{order.OrderId}",
-			});
-			await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
-		}
-		catch (Exception ex)
-		{
-			Console.Error.WriteLine("Error sending push notification: " + ex.Message);
-		}
-	}
+    private readonly PizzaStoreContext _db;
+
+    public OrdersController(PizzaStoreContext db)
+    {
+        _db = db;
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<List<OrderWithStatus>>> GetOrders()
+    {
+        var orders = await _db.Orders
+                .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .OrderByDescending(o => o.CreatedTime)
+                .ToListAsync();
+
+        return orders.Select(o => OrderWithStatus.FromOrder(o)).ToList();
+    }
+
+    [HttpGet("{orderId}")]
+    public async Task<ActionResult<OrderWithStatus>> GetOrderWithStatus(int orderId)
+    {
+        var order = await _db.Orders
+                .Where(o => o.OrderId == orderId)
+                .Where(o => o.UserId == GetUserId())
+                .Include(o => o.DeliveryLocation)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Special)
+                .Include(o => o.Pizzas).ThenInclude(p => p.Toppings).ThenInclude(t => t.Topping)
+                .SingleOrDefaultAsync();
+
+        if (order == null)
+        {
+            return NotFound();
+        }
+
+        return OrderWithStatus.FromOrder(order);
+    }
+
+    [HttpPost]
+    public async Task<ActionResult<int>> PlaceOrder(Order order)
+    {
+        order.CreatedTime = DateTime.Now;
+        order.DeliveryLocation = new LatLong(51.5001, -0.1239);
+        order.UserId = GetUserId();
+
+        // Enforce existence of Pizza.SpecialId and Topping.ToppingId
+        // in the database - prevent the submitter from making up
+        // new specials and toppings
+        foreach (var pizza in order.Pizzas)
+        {
+            pizza.SpecialId = pizza.Special.Id;
+            pizza.Special = null;
+
+            foreach (var topping in pizza.Toppings)
+            {
+                topping.ToppingId = topping.Topping.Id;
+                topping.Topping = null;
+            }
+        }
+
+        _db.Orders.Attach(order);
+        await _db.SaveChangesAsync();
+
+        // In the background, send push notifications if possible
+        var subscription = await _db.NotificationSubscriptions.Where(e => e.UserId == GetUserId()).SingleOrDefaultAsync();
+        if (subscription != null)
+        {
+            _ = TrackAndSendNotificationsAsync(order, subscription);
+        }
+
+        return order.OrderId;
+    }
+
+    private string GetUserId()
+    {
+        return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
+
+    private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
+    {
+        // In a realistic case, some other backend process would track
+        // order delivery progress and send us notifications when it
+        // changes. Since we don't have any such process here, fake it.
+        await Task.Delay(OrderWithStatus.PreparationDuration);
+        await SendNotificationAsync(order, subscription, "Your order has been dispatched!");
+
+        await Task.Delay(OrderWithStatus.DeliveryDuration);
+        await SendNotificationAsync(order, subscription, "Your order is now delivered. Enjoy!");
+    }
+
+    private static async Task SendNotificationAsync(Order order, NotificationSubscription subscription, string message)
+    {
+        // For a real application, generate your own
+        var publicKey = "BLC8GOevpcpjQiLkO7JmVClQjycvTCYWm6Cq_a7wJZlstGTVZvwGFFHMYfXt6Njyvgx_GlXJeo5cSiZ1y4JOx1o";
+        var privateKey = "OrubzSz3yWACscZXjFQrrtDwCKg-TGFuWhluQ2wLXDo";
+
+        var pushSubscription = new PushSubscription(subscription.Url, subscription.P256dh, subscription.Auth);
+        var vapidDetails = new VapidDetails("mailto:<someone@example.com>", publicKey, privateKey);
+        var webPushClient = new WebPushClient();
+        try
+        {
+            var payload = JsonSerializer.Serialize(new
+            {
+                message,
+                url = $"myorders/{order.OrderId}",
+            });
+            await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
+        }
+        catch (Exception ex)
+        {
+            Console.Error.WriteLine("Error sending push notification: " + ex.Message);
+        }
+    }
 }
diff --git a/src/BlazingPizza.Server/PizzaApiExtensions.cs b/src/BlazingPizza.Server/PizzaApiExtensions.cs
index bf6b7bde..524ca759 100644
--- a/src/BlazingPizza.Server/PizzaApiExtensions.cs
+++ b/src/BlazingPizza.Server/PizzaApiExtensions.cs
@@ -7,54 +7,51 @@ namespace BlazingPizza.Server;
 public static class PizzaApiExtensions
 {
 
-	public static WebApplication MapPizzaApi(this WebApplication app)
-	{
+    public static WebApplication MapPizzaApi(this WebApplication app)
+    {
 
-		// Subscribe to notifications
-		app.MapPut("/notifications/subscribe", [Authorize] async (
-			HttpContext context,
-			PizzaStoreContext db,
-			NotificationSubscription subscription) =>
-		{
+        // Subscribe to notifications
+        app.MapPut("/notifications/subscribe", [Authorize] async (
+            HttpContext context,
+            PizzaStoreContext db,
+            NotificationSubscription subscription) => {
 
-			// We're storing at most one subscription per user, so delete old ones.
-			// Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
-			var userId = GetUserId(context);
-			var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
-			db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
+                // We're storing at most one subscription per user, so delete old ones.
+                // Alternatively, you could let the user register multiple subscriptions from different browsers/devices.
+                var userId = GetUserId(context);
+                var oldSubscriptions = db.NotificationSubscriptions.Where(e => e.UserId == userId);
+                db.NotificationSubscriptions.RemoveRange(oldSubscriptions);
 
-			// Store new subscription
-			subscription.UserId = userId;
-			db.NotificationSubscriptions.Attach(subscription);
+                // Store new subscription
+                subscription.UserId = userId;
+                db.NotificationSubscriptions.Attach(subscription);
 
-			await db.SaveChangesAsync();
-			return Results.Ok(subscription);
+                await db.SaveChangesAsync();
+                return Results.Ok(subscription);
 
-		});
+            });
 
-		// Specials
-		app.MapGet("/specials", async (PizzaStoreContext db) =>
-		{
+        // Specials
+        app.MapGet("/specials", async (PizzaStoreContext db) => {
 
-			var specials = await db.Specials.ToListAsync();
-			return Results.Ok(specials);
+            var specials = await db.Specials.ToListAsync();
+            return Results.Ok(specials);
 
-		});
+        });
 
-		// Toppings
-		app.MapGet("/toppings", async (PizzaStoreContext db) =>
-		{
-			var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
-			return Results.Ok(toppings);
-		});
+        // Toppings
+        app.MapGet("/toppings", async (PizzaStoreContext db) => {
+            var toppings = await db.Toppings.OrderBy(t => t.Name).ToListAsync();
+            return Results.Ok(toppings);
+        });
 
-		return app;
+        return app;
 
-	}
+    }
 
-	private static string GetUserId(HttpContext context)
-	{
-		return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
-	}
+    private static string GetUserId(HttpContext context)
+    {
+        return context.User.FindFirstValue(ClaimTypes.NameIdentifier);
+    }
 
 }
\ No newline at end of file
diff --git a/src/BlazingPizza.Server/PizzaStoreContext.cs b/src/BlazingPizza.Server/PizzaStoreContext.cs
index 992baa19..50ac87e4 100644
--- a/src/BlazingPizza.Server/PizzaStoreContext.cs
+++ b/src/BlazingPizza.Server/PizzaStoreContext.cs
@@ -7,32 +7,32 @@ namespace BlazingPizza.Server;
 
 public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
 {
-	public PizzaStoreContext(
-			DbContextOptions options,
-			IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
-	{
-	}
+    public PizzaStoreContext(
+            DbContextOptions options,
+            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
+    {
+    }
 
-	public DbSet<Order> Orders { get; set; }
+    public DbSet<Order> Orders { get; set; }
 
-	public DbSet<Pizza> Pizzas { get; set; }
+    public DbSet<Pizza> Pizzas { get; set; }
 
-	public DbSet<PizzaSpecial> Specials { get; set; }
+    public DbSet<PizzaSpecial> Specials { get; set; }
 
-	public DbSet<Topping> Toppings { get; set; }
+    public DbSet<Topping> Toppings { get; set; }
 
-	public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
+    public DbSet<NotificationSubscription> NotificationSubscriptions { get; set; }
 
-	protected override void OnModelCreating(ModelBuilder modelBuilder)
-	{
-		base.OnModelCreating(modelBuilder);
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
 
-		// Configuring a many-to-many special -> topping relationship that is friendly for serialization
-		modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
-		modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
-		modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
+        // Configuring a many-to-many special -> topping relationship that is friendly for serialization
+        modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
+        modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
+        modelBuilder.Entity<PizzaTopping>().HasOne(pst => pst.Topping).WithMany();
 
-		// Inline the Lat-Long pairs in Order rather than having a FK to another table
-		modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
-	}
+        // Inline the Lat-Long pairs in Order rather than having a FK to another table
+        modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
+    }
 }
diff --git a/src/BlazingPizza.Server/Program.cs b/src/BlazingPizza.Server/Program.cs
index 4484d8f7..b83debb4 100644
--- a/src/BlazingPizza.Server/Program.cs
+++ b/src/BlazingPizza.Server/Program.cs
@@ -1,27 +1,27 @@
-using Microsoft.AspNetCore.Authentication;
+using BlazingPizza.Server;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.EntityFrameworkCore;
-using BlazingPizza.Server;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllersWithViews()
-	.AddJsonOptions(options =>  {
-		options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
-	});
+    .AddJsonOptions(options => {
+        options.JsonSerializerOptions.AddContext<BlazingPizza.OrderContext>();
+    });
 builder.Services.AddRazorPages();
 
 builder.Services.AddDbContext<PizzaStoreContext>(options =>
-		options.UseSqlite("Data Source=pizza.db")
-			.UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
+        options.UseSqlite("Data Source=pizza.db")
+            .UseModel(BlazingPizza.Server.Models.PizzaStoreContextModel.Instance));
 
 builder.Services.AddDefaultIdentity<PizzaStoreUser>(options => options.SignIn.RequireConfirmedAccount = true)
-		.AddEntityFrameworkStores<PizzaStoreContext>();
+        .AddEntityFrameworkStores<PizzaStoreContext>();
 
 builder.Services.AddIdentityServer()
-		.AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
+        .AddApiAuthorization<PizzaStoreUser, PizzaStoreContext>();
 
 builder.Services.AddAuthentication()
-		.AddIdentityServerJwt();
+        .AddIdentityServerJwt();
 
 var app = builder.Build();
 
@@ -29,11 +29,11 @@
 var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
 using (var scope = scopeFactory.CreateScope())
 {
-	var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
-	if (db.Database.EnsureCreated())
-	{
-		SeedData.Initialize(db);
-	}
+    var db = scope.ServiceProvider.GetRequiredService<PizzaStoreContext>();
+    if (db.Database.EnsureCreated())
+    {
+        SeedData.Initialize(db);
+    }
 }
 
 // Configure the HTTP request pipeline.
diff --git a/src/BlazingPizza.Server/SeedData.cs b/src/BlazingPizza.Server/SeedData.cs
index a1e47973..f02e2b77 100644
--- a/src/BlazingPizza.Server/SeedData.cs
+++ b/src/BlazingPizza.Server/SeedData.cs
@@ -2,191 +2,191 @@
 
 public static class SeedData
 {
-	public static void Initialize(PizzaStoreContext db)
-	{
-		var toppings = new Topping[]
-		{
-			new Topping()
-			{
-					Name = "Extra cheese",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "American bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "British bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Canadian bacon",
-					Price = 2.99m,
-			},
-			new Topping()
-			{
-					Name = "Tea and crumpets",
-					Price = 5.00m
-			},
-			new Topping()
-			{
-					Name = "Fresh-baked scones",
-					Price = 4.50m,
-			},
-			new Topping()
-			{
-					Name = "Bell peppers",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Onions",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Mushrooms",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Pepperoni",
-					Price = 1.00m,
-			},
-			new Topping()
-			{
-					Name = "Duck sausage",
-					Price = 3.20m,
-			},
-			new Topping()
-			{
-					Name = "Venison meatballs",
-					Price = 2.50m,
-			},
-			new Topping()
-			{
-					Name = "Served on a silver platter",
-					Price = 250.99m,
-			},
-			new Topping()
-			{
-					Name = "Lobster on top",
-					Price = 64.50m,
-			},
-			new Topping()
-			{
-					Name = "Sturgeon caviar",
-					Price = 101.75m,
-			},
-			new Topping()
-			{
-					Name = "Artichoke hearts",
-					Price = 3.40m,
-			},
-			new Topping()
-			{
-					Name = "Fresh tomatoes",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Basil",
-					Price = 1.50m,
-			},
-			new Topping()
-			{
-					Name = "Steak (medium-rare)",
-					Price = 8.50m,
-			},
-			new Topping()
-			{
-					Name = "Blazing hot peppers",
-					Price = 4.20m,
-			},
-			new Topping()
-			{
-					Name = "Buffalo chicken",
-					Price = 5.00m,
-			},
-			new Topping()
-			{
-					Name = "Blue cheese",
-					Price = 2.50m,
-			},
-		};
+    public static void Initialize(PizzaStoreContext db)
+    {
+        var toppings = new Topping[]
+        {
+            new Topping()
+            {
+                    Name = "Extra cheese",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "American bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "British bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Canadian bacon",
+                    Price = 2.99m,
+            },
+            new Topping()
+            {
+                    Name = "Tea and crumpets",
+                    Price = 5.00m
+            },
+            new Topping()
+            {
+                    Name = "Fresh-baked scones",
+                    Price = 4.50m,
+            },
+            new Topping()
+            {
+                    Name = "Bell peppers",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Onions",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Mushrooms",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Pepperoni",
+                    Price = 1.00m,
+            },
+            new Topping()
+            {
+                    Name = "Duck sausage",
+                    Price = 3.20m,
+            },
+            new Topping()
+            {
+                    Name = "Venison meatballs",
+                    Price = 2.50m,
+            },
+            new Topping()
+            {
+                    Name = "Served on a silver platter",
+                    Price = 250.99m,
+            },
+            new Topping()
+            {
+                    Name = "Lobster on top",
+                    Price = 64.50m,
+            },
+            new Topping()
+            {
+                    Name = "Sturgeon caviar",
+                    Price = 101.75m,
+            },
+            new Topping()
+            {
+                    Name = "Artichoke hearts",
+                    Price = 3.40m,
+            },
+            new Topping()
+            {
+                    Name = "Fresh tomatoes",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Basil",
+                    Price = 1.50m,
+            },
+            new Topping()
+            {
+                    Name = "Steak (medium-rare)",
+                    Price = 8.50m,
+            },
+            new Topping()
+            {
+                    Name = "Blazing hot peppers",
+                    Price = 4.20m,
+            },
+            new Topping()
+            {
+                    Name = "Buffalo chicken",
+                    Price = 5.00m,
+            },
+            new Topping()
+            {
+                    Name = "Blue cheese",
+                    Price = 2.50m,
+            },
+        };
 
-		var specials = new PizzaSpecial[]
-		{
-			new PizzaSpecial()
-			{
-					Name = "Basic Cheese Pizza",
-					Description = "It's cheesy and delicious. Why wouldn't you want one?",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/cheese.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 2,
-					Name = "The Baconatorizor",
-					Description = "It has EVERY kind of bacon",
-					BasePrice = 11.99m,
-					ImageUrl = "img/pizzas/bacon.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 3,
-					Name = "Classic pepperoni",
-					Description = "It's the pizza you grew up with, but Blazing hot!",
-					BasePrice = 10.50m,
-					ImageUrl = "img/pizzas/pepperoni.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 4,
-					Name = "Buffalo chicken",
-					Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
-					BasePrice = 12.75m,
-					ImageUrl = "img/pizzas/meaty.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 5,
-					Name = "Mushroom Lovers",
-					Description = "It has mushrooms. Isn't that obvious?",
-					BasePrice = 11.00m,
-					ImageUrl = "img/pizzas/mushroom.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 6,
-					Name = "The Brit",
-					Description = "When in London...",
-					BasePrice = 10.25m,
-					ImageUrl = "img/pizzas/brit.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 7,
-					Name = "Veggie Delight",
-					Description = "It's like salad, but on a pizza",
-					BasePrice = 11.50m,
-					ImageUrl = "img/pizzas/salad.jpg",
-			},
-			new PizzaSpecial()
-			{
-					Id = 8,
-					Name = "Margherita",
-					Description = "Traditional Italian pizza with tomatoes and basil",
-					BasePrice = 9.99m,
-					ImageUrl = "img/pizzas/margherita.jpg",
-			},
-		};
+        var specials = new PizzaSpecial[]
+        {
+            new PizzaSpecial()
+            {
+                    Name = "Basic Cheese Pizza",
+                    Description = "It's cheesy and delicious. Why wouldn't you want one?",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/cheese.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 2,
+                    Name = "The Baconatorizor",
+                    Description = "It has EVERY kind of bacon",
+                    BasePrice = 11.99m,
+                    ImageUrl = "img/pizzas/bacon.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 3,
+                    Name = "Classic pepperoni",
+                    Description = "It's the pizza you grew up with, but Blazing hot!",
+                    BasePrice = 10.50m,
+                    ImageUrl = "img/pizzas/pepperoni.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 4,
+                    Name = "Buffalo chicken",
+                    Description = "Spicy chicken, hot sauce and bleu cheese, guaranteed to warm you up",
+                    BasePrice = 12.75m,
+                    ImageUrl = "img/pizzas/meaty.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 5,
+                    Name = "Mushroom Lovers",
+                    Description = "It has mushrooms. Isn't that obvious?",
+                    BasePrice = 11.00m,
+                    ImageUrl = "img/pizzas/mushroom.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 6,
+                    Name = "The Brit",
+                    Description = "When in London...",
+                    BasePrice = 10.25m,
+                    ImageUrl = "img/pizzas/brit.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 7,
+                    Name = "Veggie Delight",
+                    Description = "It's like salad, but on a pizza",
+                    BasePrice = 11.50m,
+                    ImageUrl = "img/pizzas/salad.jpg",
+            },
+            new PizzaSpecial()
+            {
+                    Id = 8,
+                    Name = "Margherita",
+                    Description = "Traditional Italian pizza with tomatoes and basil",
+                    BasePrice = 9.99m,
+                    ImageUrl = "img/pizzas/margherita.jpg",
+            },
+        };
 
-		db.Toppings.AddRange(toppings);
-		db.Specials.AddRange(specials);
-		db.SaveChanges();
-	}
+        db.Toppings.AddRange(toppings);
+        db.Specials.AddRange(specials);
+        db.SaveChanges();
+    }
 }
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/Address.cs b/src/BlazingPizza.Shared/Address.cs
index 79be9c5b..a671359a 100644
--- a/src/BlazingPizza.Shared/Address.cs
+++ b/src/BlazingPizza.Shared/Address.cs
@@ -2,23 +2,23 @@
 
 public class Address
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Name { get; set; }
+    [Required, MaxLength(100)]
+    public string Name { get; set; }
 
-	[Required, MaxLength(100)]
-	public string Line1 { get; set; }
+    [Required, MaxLength(100)]
+    public string Line1 { get; set; }
 
-	[MaxLength(100)]
-	public string Line2 { get; set; }
+    [MaxLength(100)]
+    public string Line2 { get; set; }
 
-	[Required, MaxLength(50)]
-	public string City { get; set; }
+    [Required, MaxLength(50)]
+    public string City { get; set; }
 
-	[Required, MaxLength(20)]
-	public string Region { get; set; }
+    [Required, MaxLength(20)]
+    public string Region { get; set; }
 
-	[Required, MaxLength(20)]
-	public string PostalCode { get; set; }
+    [Required, MaxLength(20)]
+    public string PostalCode { get; set; }
 }
diff --git a/src/BlazingPizza.Shared/LatLong.cs b/src/BlazingPizza.Shared/LatLong.cs
index 14a94c26..a65971f8 100644
--- a/src/BlazingPizza.Shared/LatLong.cs
+++ b/src/BlazingPizza.Shared/LatLong.cs
@@ -2,25 +2,25 @@
 
 public class LatLong
 {
-	public LatLong()
-	{
-	}
+    public LatLong()
+    {
+    }
 
-	public LatLong(double latitude, double longitude) : this()
-	{
-		Latitude = latitude;
-		Longitude = longitude;
-	}
+    public LatLong(double latitude, double longitude) : this()
+    {
+        Latitude = latitude;
+        Longitude = longitude;
+    }
 
-	public double Latitude { get; set; }
+    public double Latitude { get; set; }
 
-	public double Longitude { get; set; }
+    public double Longitude { get; set; }
 
-	public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
-	{
-		// The Earth is flat, right? So no need for spherical interpolation.
-		return new LatLong(
-				start.Latitude + (end.Latitude - start.Latitude) * proportion,
-				start.Longitude + (end.Longitude - start.Longitude) * proportion);
-	}
+    public static LatLong Interpolate(LatLong start, LatLong end, double proportion)
+    {
+        // The Earth is flat, right? So no need for spherical interpolation.
+        return new LatLong(
+                start.Latitude + (end.Latitude - start.Latitude) * proportion,
+                start.Longitude + (end.Longitude - start.Longitude) * proportion);
+    }
 }
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/NotificationSubscription.cs b/src/BlazingPizza.Shared/NotificationSubscription.cs
index 9109ff57..5c99e3f4 100644
--- a/src/BlazingPizza.Shared/NotificationSubscription.cs
+++ b/src/BlazingPizza.Shared/NotificationSubscription.cs
@@ -2,13 +2,13 @@
 
 public class NotificationSubscription
 {
-	public int NotificationSubscriptionId { get; set; }
+    public int NotificationSubscriptionId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public string Url { get; set; }
+    public string Url { get; set; }
 
-	public string P256dh { get; set; }
+    public string P256dh { get; set; }
 
-	public string Auth { get; set; }
+    public string Auth { get; set; }
 }
diff --git a/src/BlazingPizza.Shared/Order.cs b/src/BlazingPizza.Shared/Order.cs
index aca04ca1..b47efad0 100644
--- a/src/BlazingPizza.Shared/Order.cs
+++ b/src/BlazingPizza.Shared/Order.cs
@@ -4,21 +4,21 @@ namespace BlazingPizza;
 
 public class Order
 {
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public string UserId { get; set; }
+    public string UserId { get; set; }
 
-	public DateTime CreatedTime { get; set; }
+    public DateTime CreatedTime { get; set; }
 
-	public Address DeliveryAddress { get; set; } = new Address();
+    public Address DeliveryAddress { get; set; } = new Address();
 
-	public LatLong DeliveryLocation { get; set; }
+    public LatLong DeliveryLocation { get; set; }
 
-	public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
+    public List<Pizza> Pizzas { get; set; } = new List<Pizza>();
 
-	public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
+    public decimal GetTotalPrice() => Pizzas.Sum(p => p.GetTotalPrice());
 
-	public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
+    public string GetFormattedTotalPrice() => GetTotalPrice().ToString("0.00");
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
@@ -29,4 +29,4 @@ public class Order
 [JsonSerializable(typeof(List<PizzaSpecial>))]
 [JsonSerializable(typeof(List<Topping>))]
 [JsonSerializable(typeof(Topping))]
-public partial class OrderContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class OrderContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/OrderWithStatus.cs b/src/BlazingPizza.Shared/OrderWithStatus.cs
index f5f153b6..fbfac7af 100644
--- a/src/BlazingPizza.Shared/OrderWithStatus.cs
+++ b/src/BlazingPizza.Shared/OrderWithStatus.cs
@@ -6,73 +6,73 @@ namespace BlazingPizza;
 
 public class OrderWithStatus
 {
-	public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-	public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+    public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+    public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
-	public Order Order { get; set; }
+    public Order Order { get; set; }
 
-	public string StatusText { get; set; }
+    public string StatusText { get; set; }
 
-	public bool IsDelivered => StatusText == "Delivered";
+    public bool IsDelivered => StatusText == "Delivered";
 
-	public List<Marker> MapMarkers { get; set; }
+    public List<Marker> MapMarkers { get; set; }
 
-	public static OrderWithStatus FromOrder(Order order)
-	{
-		// To simulate a real backend process, we fake status updates based on the amount
-		// of time since the order was placed
-		string statusText;
-		List<Marker> mapMarkers;
-		var dispatchTime = order.CreatedTime.Add(PreparationDuration);
+    public static OrderWithStatus FromOrder(Order order)
+    {
+        // To simulate a real backend process, we fake status updates based on the amount
+        // of time since the order was placed
+        string statusText;
+        List<Marker> mapMarkers;
+        var dispatchTime = order.CreatedTime.Add(PreparationDuration);
 
-		if (DateTime.Now < dispatchTime)
-		{
-			statusText = "Preparing";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation, showPopup: true)
-								};
-		}
-		else if (DateTime.Now < dispatchTime + DeliveryDuration)
-		{
-			statusText = "Out for delivery";
+        if (DateTime.Now < dispatchTime)
+        {
+            statusText = "Preparing";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation, showPopup: true)
+                                };
+        }
+        else if (DateTime.Now < dispatchTime + DeliveryDuration)
+        {
+            statusText = "Out for delivery";
 
-			var startPosition = ComputeStartPosition(order);
-			var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
-			var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("You", order.DeliveryLocation),
-										ToMapMarker("Driver", driverPosition, showPopup: true),
-								};
-		}
-		else
-		{
-			statusText = "Delivered";
-			mapMarkers = new List<Marker>
-								{
-										ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
-								};
-		}
+            var startPosition = ComputeStartPosition(order);
+            var proportionOfDeliveryCompleted = Math.Min(1, (DateTime.Now - dispatchTime).TotalMilliseconds / DeliveryDuration.TotalMilliseconds);
+            var driverPosition = LatLong.Interpolate(startPosition, order.DeliveryLocation, proportionOfDeliveryCompleted);
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("You", order.DeliveryLocation),
+                                        ToMapMarker("Driver", driverPosition, showPopup: true),
+                                };
+        }
+        else
+        {
+            statusText = "Delivered";
+            mapMarkers = new List<Marker>
+                                {
+                                        ToMapMarker("Delivery location", order.DeliveryLocation, showPopup: true),
+                                };
+        }
 
-		return new OrderWithStatus
-		{
-			Order = order,
-			StatusText = statusText,
-			MapMarkers = mapMarkers,
-		};
-	}
+        return new OrderWithStatus
+        {
+            Order = order,
+            StatusText = statusText,
+            MapMarkers = mapMarkers,
+        };
+    }
 
-	private static LatLong ComputeStartPosition(Order order)
-	{
-		// Random but deterministic based on order ID
-		var rng = new Random(order.OrderId);
-		var distance = 0.01 + rng.NextDouble() * 0.02;
-		var angle = rng.NextDouble() * Math.PI * 2;
-		var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
-		return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
-	}
+    private static LatLong ComputeStartPosition(Order order)
+    {
+        // Random but deterministic based on order ID
+        var rng = new Random(order.OrderId);
+        var distance = 0.01 + rng.NextDouble() * 0.02;
+        var angle = rng.NextDouble() * Math.PI * 2;
+        var offset = (distance * Math.Cos(angle), distance * Math.Sin(angle));
+        return new LatLong(order.DeliveryLocation.Latitude + offset.Item1, order.DeliveryLocation.Longitude + offset.Item2);
+    }
 
-	static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
-			=> new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
+    static Marker ToMapMarker(string description, LatLong coords, bool showPopup = false)
+            => new Marker { Description = description, X = coords.Longitude, Y = coords.Latitude, ShowPopup = showPopup };
 }
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/Pizza.cs b/src/BlazingPizza.Shared/Pizza.cs
index 459298f4..2a7a1c29 100644
--- a/src/BlazingPizza.Shared/Pizza.cs
+++ b/src/BlazingPizza.Shared/Pizza.cs
@@ -7,38 +7,38 @@ namespace BlazingPizza;
 /// </summary>
 public class Pizza
 {
-	public const int DefaultSize = 12;
-	public const int MinimumSize = 9;
-	public const int MaximumSize = 17;
+    public const int DefaultSize = 12;
+    public const int MinimumSize = 9;
+    public const int MaximumSize = 17;
 
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public int OrderId { get; set; }
+    public int OrderId { get; set; }
 
-	public PizzaSpecial Special { get; set; }
+    public PizzaSpecial Special { get; set; }
 
-	public int SpecialId { get; set; }
+    public int SpecialId { get; set; }
 
-	public int Size { get; set; }
+    public int Size { get; set; }
 
-	public List<PizzaTopping> Toppings { get; set; }
+    public List<PizzaTopping> Toppings { get; set; }
 
-	public decimal GetBasePrice()
-	{
-		return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
-	}
+    public decimal GetBasePrice()
+    {
+        return ((decimal)Size / (decimal)DefaultSize) * Special.BasePrice;
+    }
 
-	public decimal GetTotalPrice()
-	{
-		return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
-	}
+    public decimal GetTotalPrice()
+    {
+        return GetBasePrice() + Toppings.Sum(t => t.Topping.Price);
+    }
 
-	public string GetFormattedTotalPrice()
-	{
-		return GetTotalPrice().ToString("0.00");
-	}
+    public string GetFormattedTotalPrice()
+    {
+        return GetTotalPrice().ToString("0.00");
+    }
 }
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
 [JsonSerializable(typeof(Pizza))]
-public partial class PizzaContext : JsonSerializerContext {}
\ No newline at end of file
+public partial class PizzaContext : JsonSerializerContext { }
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/PizzaSpecial.cs b/src/BlazingPizza.Shared/PizzaSpecial.cs
index 9653300c..1fd9006a 100644
--- a/src/BlazingPizza.Shared/PizzaSpecial.cs
+++ b/src/BlazingPizza.Shared/PizzaSpecial.cs
@@ -5,15 +5,15 @@
 /// </summary>
 public class PizzaSpecial
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal BasePrice { get; set; }
+    public decimal BasePrice { get; set; }
 
-	public string Description { get; set; }
+    public string Description { get; set; }
 
-	public string ImageUrl { get; set; }
+    public string ImageUrl { get; set; }
 
-	public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
+    public string GetFormattedBasePrice() => BasePrice.ToString("0.00");
 }
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/PizzaTopping.cs b/src/BlazingPizza.Shared/PizzaTopping.cs
index 0a711647..1c062732 100644
--- a/src/BlazingPizza.Shared/PizzaTopping.cs
+++ b/src/BlazingPizza.Shared/PizzaTopping.cs
@@ -2,10 +2,10 @@
 
 public class PizzaTopping
 {
-	public Topping Topping { get; set; }
+    public Topping Topping { get; set; }
 
-	public int ToppingId { get; set; }
+    public int ToppingId { get; set; }
+
+    public int PizzaId { get; set; }
 
-	public int PizzaId { get; set; }
-	
 }
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/Topping.cs b/src/BlazingPizza.Shared/Topping.cs
index 376c311a..4eb67ae9 100644
--- a/src/BlazingPizza.Shared/Topping.cs
+++ b/src/BlazingPizza.Shared/Topping.cs
@@ -2,12 +2,12 @@
 
 public class Topping
 {
-	public int Id { get; set; }
+    public int Id { get; set; }
 
-	public string Name { get; set; }
+    public string Name { get; set; }
 
-	public decimal Price { get; set; }
+    public decimal Price { get; set; }
+
+    public string GetFormattedPrice() => Price.ToString("0.00");
 
-	public string GetFormattedPrice() => Price.ToString("0.00");
-	
 }
\ No newline at end of file
diff --git a/src/BlazingPizza.Shared/UserInfo.cs b/src/BlazingPizza.Shared/UserInfo.cs
index 362f8f8e..babb4315 100644
--- a/src/BlazingPizza.Shared/UserInfo.cs
+++ b/src/BlazingPizza.Shared/UserInfo.cs
@@ -2,8 +2,8 @@
 
 public class UserInfo
 {
-	public bool IsAuthenticated { get; set; }
+    public bool IsAuthenticated { get; set; }
+
+    public string Name { get; set; }
 
-	public string Name { get; set; }
-	
 }
\ No newline at end of file
diff --git a/src/BlazingPizza.sln b/src/BlazingPizza.sln
index 1db6afe7..0f195a94 100644
--- a/src/BlazingPizza.sln
+++ b/src/BlazingPizza.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28902.138
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32317.152
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazingPizza.Server", "BlazingPizza.Server\BlazingPizza.Server.csproj", "{29F85A53-A43B-4B5F-8C11-4FC62CDF19D6}"
 EndProject
@@ -10,7 +10,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazingPizza.Shared", "Blaz
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazingPizza.ComponentsLibrary", "BlazingPizza.ComponentsLibrary\BlazingPizza.ComponentsLibrary.csproj", "{0C421DC9-9F9A-4C97-9BC5-D959E8840864}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazingComponents", "BlazingComponents\BlazingComponents.csproj", "{4C4132E7-D096-42DA-9C3D-C444B42C3889}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazingComponents", "BlazingComponents\BlazingComponents.csproj", "{4C4132E7-D096-42DA-9C3D-C444B42C3889}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F9424A4A-0D8F-4320-8063-4D835522DDA5}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution