diff --git a/MyFirstBlazor/BlazingPizza/Pages/Checkout.razor b/MyFirstBlazor/BlazingPizza/Pages/Checkout.razor
index ca0fae0..df63b8f 100644
--- a/MyFirstBlazor/BlazingPizza/Pages/Checkout.razor
+++ b/MyFirstBlazor/BlazingPizza/Pages/Checkout.razor
@@ -9,23 +9,12 @@
     <div class="checkout-cols">
         <div class="checkout-order-details">
             <h4>Review order</h4>
-            @foreach (var pizza in Order.Pizzas)
-            {
-                <p>
-                    <string>
-                        @(pizza.Size)"
-                        @pizza.Special.Name
-                        (£@pizza.GetFormattedTotalPrice())
-                    </string>
-                </p>
-            }
+            <OrderReview Order="Order"/>
+        </div>
 
-            <p>
-                <string>
-                    Total price:
-                    £@Order.GetFormattedTotalPrice()
-                </string>
-            </p>
+        <div class="checkout-delivery-address">
+            <h4>Deliver to...</h4>
+            <AddressEditor Address="Order.DeliveryAddress"/>
         </div>
     </div>
 
diff --git a/MyFirstBlazor/BlazingPizza/Shared/AddressEditor.razor b/MyFirstBlazor/BlazingPizza/Shared/AddressEditor.razor
new file mode 100644
index 0000000..006bbed
--- /dev/null
+++ b/MyFirstBlazor/BlazingPizza/Shared/AddressEditor.razor
@@ -0,0 +1,53 @@
+<div class="form-field">
+    <label>Name:</label>
+    <div>
+        <input @ref="startName" @bind="Address.Name" />
+    </div>
+</div>
+
+<div class="form-field">
+    <label>Line 1:</label>
+    <div>
+        <input @bind="Address.Line1" />
+    </div>
+</div>
+
+<div class="form-field">
+    <label>Line 2:</label>
+    <div>
+        <input @bind="Address.Line2" />
+    </div>
+</div>
+
+<div class="form-field">
+    <label>City:</label>
+    <div>
+        <input @bind="Address.City" />
+    </div>
+</div>
+
+<div class="form-field">
+    <label>Region:</label>
+    <div>
+        <input @bind="Address.Region" />
+    </div>
+</div>
+
+<div class="form-field">
+    <label>Postal code:</label>
+    <div>
+        <input @bind="Address.PostalCode" />
+    </div>
+</div>
+
+@code {
+    [Parameter] public Address Address { get; set; }
+
+    private ElementReference startName;
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+            await startName.FocusAsync();
+    }
+}
diff --git a/MyFirstBlazor/BlazingPizza/Shared/OrderReview.razor b/MyFirstBlazor/BlazingPizza/Shared/OrderReview.razor
new file mode 100644
index 0000000..0d76000
--- /dev/null
+++ b/MyFirstBlazor/BlazingPizza/Shared/OrderReview.razor
@@ -0,0 +1,21 @@
+@foreach (var pizza in Order.Pizzas)
+{
+    <p>
+        <strong>
+            @(pizza.Size)"
+            @pizza.Special.Name
+            (£@pizza.GetFormattedTotalPrice())
+        </strong>
+    </p>
+}
+
+<p>
+    <strong>
+        Total price:
+        (£@Order.GetFormattedTotalPrice())
+    </strong>
+</p>
+
+@code {
+    [Parameter] public Order Order { get; set; }
+}
diff --git a/MyFirstBlazor/BlazingPizza/pizza.db b/MyFirstBlazor/BlazingPizza/pizza.db
index b3f91f1..7480915 100644
Binary files a/MyFirstBlazor/BlazingPizza/pizza.db and b/MyFirstBlazor/BlazingPizza/pizza.db differ
diff --git a/MyFirstBlazor/BlazingPizza/pizza.db-shm b/MyFirstBlazor/BlazingPizza/pizza.db-shm
index 67f4617..de5ec21 100644
Binary files a/MyFirstBlazor/BlazingPizza/pizza.db-shm and b/MyFirstBlazor/BlazingPizza/pizza.db-shm differ
diff --git a/MyFirstBlazor/BlazingPizza/pizza.db-wal b/MyFirstBlazor/BlazingPizza/pizza.db-wal
index 4097639..ab20c49 100644
Binary files a/MyFirstBlazor/BlazingPizza/pizza.db-wal and b/MyFirstBlazor/BlazingPizza/pizza.db-wal differ