diff --git a/Apps/Client/Pages/Container.razor b/Apps/Client/Pages/Container.razor
new file mode 100644
index 0000000..16c7768
--- /dev/null
+++ b/Apps/Client/Pages/Container.razor
@@ -0,0 +1,22 @@
+@page "/container"
+@inject MyState State
+
+@foreach (var name in State.Names)
+{
+  <p>@name</p>
+}
+
+<Names />
+
+<input @bind="@CurrentValue" />
+<button @onclick="OnSend">Save</button>
+
+@code {
+  private string CurrentValue;
+
+  private void OnSend()
+  {
+    State.AddName(CurrentValue);
+    CurrentValue = "";
+  }
+}
\ No newline at end of file
diff --git a/Apps/Client/Pages/Index.razor b/Apps/Client/Pages/Index.razor
index dfc6d9c..bc5ee0d 100644
--- a/Apps/Client/Pages/Index.razor
+++ b/Apps/Client/Pages/Index.razor
@@ -1,23 +1,39 @@
 @page "/"
 @inject LinksClient Links
 
-<h1>Hello, world!</h1>
+<h1>Latest links</h1>
 
-Welcome to your new app.
-
-@foreach (var link in _links)
+@if (_loading)
 {
-  <Link Item="@link" />
+  <p>Loading...</p>
+}
+else
+{
+  <ul>
+  @foreach (var link in _links)
+    {
+      <li>
+        <Link Item="@link" />
+      </li>
+    }
+  </ul>
 }
-
-
-<SurveyPrompt Title="How is Blazor working for you?" />
 
 @code {
   private LinkDto[] _links = new LinkDto[] { };
+  private bool _loading = false;
 
   protected override async Task OnInitializedAsync()
   {
-    _links = (await Links.GetLinksAsync()).ToArray();
+    _loading = true;
+
+    try
+    {
+      _links = (await Links.GetLinksAsync()).ToArray();
+    }
+    finally
+    {
+      _loading = false;
+    }
   }
 }
\ No newline at end of file
diff --git a/Apps/Client/Pages/Show.razor b/Apps/Client/Pages/Show.razor
new file mode 100644
index 0000000..73701ac
--- /dev/null
+++ b/Apps/Client/Pages/Show.razor
@@ -0,0 +1,24 @@
+@page "/links/{id:guid}"
+@inject LinksClient Links
+
+@if (Item == null)
+{
+  <p>Loading...</p>
+}
+else
+{
+  <h1>Showing link @Item.Url with @Item.UpVotes / @Item.DownVotes</h1>
+}
+
+@code {
+  [Parameter]
+  public Guid Id { get; set; }
+
+  private LinkDto Item;
+
+  protected override async Task OnInitializedAsync()
+  {
+    Item = await Links.GetLinkByIdAsync(Id);
+  }
+
+}
\ No newline at end of file
diff --git a/Apps/Client/Program.cs b/Apps/Client/Program.cs
index af45f1f..be64455 100644
--- a/Apps/Client/Program.cs
+++ b/Apps/Client/Program.cs
@@ -2,14 +2,24 @@ using System;
 using System.Net.Http;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using System.Text;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace Client
 {
+  public class MyState
+  {
+    public List<string> Names { get; } = new List<string>();
+
+    public event Action OnChange;
+
+    public void AddName(string name)
+    {
+      Names.Add(name);
+      OnChange?.Invoke();
+    }
+  }
+
   public class Program
   {
     public static async Task Main(string[] args)
@@ -19,6 +29,7 @@ namespace Client
 
       builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:8888/") });
       builder.Services.AddScoped<LinksClient>();
+      builder.Services.AddSingleton<MyState>();
 
       await builder.Build().RunAsync();
     }
diff --git a/Apps/Client/Shared/Link.razor b/Apps/Client/Shared/Link.razor
index 1b2d468..2959b71 100644
--- a/Apps/Client/Shared/Link.razor
+++ b/Apps/Client/Shared/Link.razor
@@ -1,4 +1,4 @@
-<p>@Item.Url</p>
+<NavLink href=@($"/links/{Item.Id}")>@Item.Url</NavLink>
 
 @code {
   [Parameter]
diff --git a/Apps/Client/Shared/Names.razor b/Apps/Client/Shared/Names.razor
new file mode 100644
index 0000000..f1e1e71
--- /dev/null
+++ b/Apps/Client/Shared/Names.razor
@@ -0,0 +1,15 @@
+@inject MyState State
+
+<p>Got @State.Names.Count</p>
+
+@code {
+  protected override void OnInitialized()
+  {
+    State.OnChange += StateHasChanged;
+  }
+
+  public void Dispose()
+  {
+    State.OnChange -= StateHasChanged;
+  }
+}
\ No newline at end of file