diff --git a/.github/workflows/admin.yaml b/.github/workflows/admin.yaml
index 389eb98..0e1017f 100644
--- a/.github/workflows/admin.yaml
+++ b/.github/workflows/admin.yaml
@@ -4,6 +4,7 @@ on:
   push:
     paths:
       - 'admin/**'
+      - 'TwoWeeksReady.Common/**'
       - '.github/workflows/admin.yaml'
     branches: [ master ]
   pull_request:
diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml
index af42913..2d69bd8 100644
--- a/.github/workflows/api.yaml
+++ b/.github/workflows/api.yaml
@@ -4,6 +4,7 @@ on:
   push:
     paths:
       - 'api/**'
+      - 'TwoWeeksReady.Common/**'
       - '.github/workflows/api.yaml'
     branches: [ master ]
   pull_request:
diff --git a/admin/TwoWeeksReady.Admin/Data/FunctionsRepository.cs b/admin/TwoWeeksReady.Admin/Data/FunctionsRepository.cs
index af72b1d..3507f5c 100644
--- a/admin/TwoWeeksReady.Admin/Data/FunctionsRepository.cs
+++ b/admin/TwoWeeksReady.Admin/Data/FunctionsRepository.cs
@@ -47,14 +47,7 @@ public Task<HazardHunt> GetHazardHuntById(string id)
 
         public async Task<HazardInfo> GetHazardInfoById(string id)
         {
-            try
-            {
-                return await _httpClient.GetFromJsonAsync<HazardInfo>($"hazardinfo-by-id/{id}");
-            } catch (Exception ex)
-            {
-                return new HazardInfo();
-            }
-            
+            return await _httpClient.GetFromJsonAsync<HazardInfo>($"hazardinfo-by-id/{id}");
         }
 
         public Task<BaseKitItem> SaveBaseKitItem(BaseKitItem kit)
@@ -67,9 +60,30 @@ public Task<HazardHunt> SaveHazardHunt(HazardHunt hazardHunt)
             throw new NotImplementedException();
         }
 
-        public Task<HazardInfo> SaveHazardInfo(HazardInfo hazardInfo)
+        public async Task<HazardInfo> SaveHazardInfo(HazardInfo hazardInfo)
         {
-            throw new NotImplementedException();
+            var response = await _httpClient.PutAsJsonAsync("hazardinfo-update", hazardInfo);
+            if (response.IsSuccessStatusCode)
+            {
+                return await response.Content.ReadFromJsonAsync<HazardInfo>();
+            } 
+            else
+            {
+                throw new Exception("Error saving hazard info");
+            }
+        }
+
+        public async Task<HazardInfo> CreateHazardInfo(HazardInfo hazardInfo)
+        {
+            var response = await _httpClient.PostAsJsonAsync("hazardinfo-create", hazardInfo);
+            if (response.IsSuccessStatusCode)
+            {
+                return await response.Content.ReadFromJsonAsync<HazardInfo>();
+            }
+            else
+            {
+                throw new Exception("Error saving hazard info");
+            }
         }
     }
 }
diff --git a/admin/TwoWeeksReady.Admin/Data/IRepository.cs b/admin/TwoWeeksReady.Admin/Data/IRepository.cs
index 10975aa..210f445 100644
--- a/admin/TwoWeeksReady.Admin/Data/IRepository.cs
+++ b/admin/TwoWeeksReady.Admin/Data/IRepository.cs
@@ -23,7 +23,9 @@ public interface IRepository
 
 		Task<HazardInfo> GetHazardInfoById(string id);
 
-		Task<HazardInfo> SaveHazardInfo(HazardInfo hazardInfo);		
+		Task<HazardInfo> SaveHazardInfo(HazardInfo hazardInfo);
+
+		Task<HazardInfo> CreateHazardInfo(HazardInfo hazardInfo);
 	}
 
 }
diff --git a/admin/TwoWeeksReady.Admin/Data/StubRepository.cs b/admin/TwoWeeksReady.Admin/Data/StubRepository.cs
index 8853357..ecd131e 100644
--- a/admin/TwoWeeksReady.Admin/Data/StubRepository.cs
+++ b/admin/TwoWeeksReady.Admin/Data/StubRepository.cs
@@ -103,6 +103,13 @@ public Task<HazardInfo> SaveHazardInfo(HazardInfo hazardInfo)
 		{
 			return Task.FromResult(hazardInfo);
 		}
+
+		public Task<HazardInfo> CreateHazardInfo(HazardInfo hazardInfo)
+		{
+			return Task.FromResult(hazardInfo);
+		}
+
+
 	}
 
 }
diff --git a/admin/TwoWeeksReady.Admin/Pages/HazardInfos/Details.razor b/admin/TwoWeeksReady.Admin/Pages/HazardInfos/Details.razor
index 6c35d59..cd6ce55 100644
--- a/admin/TwoWeeksReady.Admin/Pages/HazardInfos/Details.razor
+++ b/admin/TwoWeeksReady.Admin/Pages/HazardInfos/Details.razor
@@ -1,8 +1,15 @@
 @page "/HazardInfos/{id}"
+@page "/HazardInfos/new"
 @attribute [Authorize(Roles = "admin")]
 
+@using TinyMCE.Blazor
 @inject IRepository repository
 @inject IJSRuntime JS
+@inject Microsoft.Extensions.Configuration.IConfiguration configuration 
+
+@{ 
+    var tinyMCEApiKey = configuration["TinyMCEApiKey"];
+}
 
 @if (Hazard == null)
 {
@@ -10,18 +17,65 @@
 }
 else
 {
+
     <h3>Details</h3>
-    <label for="name">Hazard Name:</label>
-    <input type="text" @bind="@Hazard.Name" />
-    <br />
-    <label for="description">Short Description:</label>
-    <input type="text" @bind="@Hazard.Description" />
-    <span class="btn btn-secondary float-right" style="cursor: pointer" @onclick="@Save">Save</span>
+    <form>
+        <div class="form-group">
+            <label for="name">Hazard Name</label>
+            <input type="text" class="form-control" name="name" @bind="@Hazard.Name">
+        </div>
+        <div class="form-group">
+            <label for="description">Short Description:</label>
+            <textarea class="form-control" name="description" @bind="@Hazard.Description" rows="5"></textarea>
+        </div>
+        <div class="form-group">
+            <label for="iconUrl">Icon Url</label>
+            <input type="text" class="form-control" name="iconUrl" @bind="@Hazard.IconUrl">
+        </div>
+        <div class="form-group">
+            <label for="mediaUrl">Media Url</label>
+            <input type="text" class="form-control" name="mediaUrl" @bind="@Hazard.MediaUrl">
+        </div>
+
+        <div class="form-group">
+            <label for="beforeSafetyDetails">Before Safety Details</label>
+            <Editor Id="beforeSafetyDetails" Conf="@EditorConfig" ApiKey="@tinyMCEApiKey" @bind-Value="@Hazard.BeforeSafetyDetails" />
+        </div>
+
+        <div class="form-group">
+            <label for="duringSafetyDetails">DuringSafety Details</label>
+            <Editor Id="duringSafetyDetails" Conf="@EditorConfig" ApiKey="@tinyMCEApiKey" @bind-Value="@Hazard.DuringSafetyDetails" />
+        </div>
 
+        <div class="form-group">
+            <label for="afterSafetyDetails">Before Safety Details</label>
+            <Editor Id="afterSafetyDetails" Conf="@EditorConfig" ApiKey="@tinyMCEApiKey" @bind-Value="@Hazard.AfterSafetyDetails" />
+        </div>
+
+
+        <div class="form-group">
+            <label for="externalLinks">External Links (One link per line)</label>
+            <textarea rows="6" class="form-control" name="externalLinks" @bind="@ExternalLinks"></textarea>
+        </div>
+
+        <button type="button" class="btn btn-primary" @onclick="@Save">Submit</button>
+    </form>
 }
 
 @code {
 
+    public Dictionary<string, object> EditorConfig = new Dictionary<string, object>
+{
+        { "plugins", "image" },
+        { "toolbar", "image" },
+        {"image_list", new []
+        {
+            // TODO: Figure out a strategy for loading a list of images from assets availabe within the app
+            new { title = "Image 1", value = "http://localhost:8080/images/hazards/earthquake.png"}
+        } }
+
+    };
+
     [Parameter]
     public string Id { get; set; }
 
@@ -30,17 +84,47 @@ else
 
     private HazardInfo Hazard { get; set; }
 
+    private string ExternalLinks
+    {
+        get
+        {
+            return string.Join(Environment.NewLine, Hazard?.ExternalLinks ?? new string[0]);
+        }
+        set
+        {
+            var links = value.Split(new string[] { "\n", Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries).Select(s => s.Trim()).Where(s => !string.IsNullOrEmpty(s));
+            Hazard.ExternalLinks = links.ToArray();
+        }
+    }
+
 
     protected override async Task OnInitializedAsync()
     {
-        Hazard = await repository.GetHazardInfoById(Id);
+        if (string.IsNullOrEmpty(Id))
+        {
+            Hazard = new HazardInfo();
+
+        }
+        else
+        {
+            Hazard = await repository.GetHazardInfoById(Id);
+        }
+
     }
 
 
     public async Task Save()
     {
-        await repository.SaveHazardInfo(Hazard);
-        await OnSave.InvokeAsync(Hazard);
+        if (string.IsNullOrEmpty(Hazard.Id))
+        {
+            Hazard = await repository.CreateHazardInfo(Hazard);
+        }
+        else
+        {
+            Hazard = await repository.SaveHazardInfo(Hazard);
+        }
+
+        //await OnSave.InvokeAsync(Hazard);
 
         await JS.InvokeVoidAsync("alert", new object[] { "Hazard Info Saved" });
 
diff --git a/admin/TwoWeeksReady.Admin/Pages/HazardInfos/List.razor b/admin/TwoWeeksReady.Admin/Pages/HazardInfos/List.razor
index 99058b9..938e39e 100644
--- a/admin/TwoWeeksReady.Admin/Pages/HazardInfos/List.razor
+++ b/admin/TwoWeeksReady.Admin/Pages/HazardInfos/List.razor
@@ -1,17 +1,15 @@
 @page  "/HazardInfos/"
 @attribute [Authorize(Roles = "admin")]
 @inject IRepository Repository
-<h1>Administer Hazard Info for Two Weeks Ready</h1>
-
-<h3>Current Hazards Defined:</h3>
+<h1>Administer Hazard Info</h1>
 
 @if (_HazardInfos != null && _HazardInfos.Any())
 {
 
-    <table>
+    <table class="table table-bordered">
         <thead>
             <tr>
-                <th>Name</th>               
+                <th>Name</th>
             </tr>
         </thead>
         <tbody>
@@ -21,7 +19,7 @@
                 <tr>
                     <td>
                         <a href="/HazardInfos/@hazard.Id">
-                           @hazard.Name
+                            @hazard.Name
                         </a>
                     </td>
                 </tr>
@@ -29,11 +27,16 @@
         </tbody>
 
     </table>
+    <a class="btn btn-primary" href="/HazardInfos/new">Add New Hazard</a>
 
 }
+else if (_HazardInfos == null)
+{
+    <p>Loading....</p>
+}
 else
 {
-    <p>No Hazards defined.</p>
+    <p>No hazard infos defined</p>
 }
 
 @code {
diff --git a/admin/TwoWeeksReady.Admin/Pages/_Host.cshtml b/admin/TwoWeeksReady.Admin/Pages/_Host.cshtml
index 0835b62..39752eb 100644
--- a/admin/TwoWeeksReady.Admin/Pages/_Host.cshtml
+++ b/admin/TwoWeeksReady.Admin/Pages/_Host.cshtml
@@ -21,7 +21,7 @@
 </head>
 
 <body>
-    @{  
+    @{
         var token = new TokenProvider
         {
             AccessToken = await HttpContext.GetTokenAsync("access_token")
@@ -43,5 +43,6 @@
     </div>
 
     <script src="_framework/blazor.server.js"></script>
+    <script src="_content/TinyMCE.Blazor/tinymce-blazor.js"></script>
 </body>
 </html>
diff --git a/admin/TwoWeeksReady.Admin/Startup.cs b/admin/TwoWeeksReady.Admin/Startup.cs
index fcab282..615d905 100644
--- a/admin/TwoWeeksReady.Admin/Startup.cs
+++ b/admin/TwoWeeksReady.Admin/Startup.cs
@@ -60,7 +60,6 @@ public void ConfigureServices(IServiceCollection services)
                 options.Scope.Clear();
                 options.Scope.Add("openid");
                 options.Scope.Add("profile");
-                options.Scope.Add("roles");
 
                 options.CallbackPath = new PathString("/callback");
                 options.ClaimsIssuer = "Auth0";
diff --git a/admin/TwoWeeksReady.Admin/TwoWeeksReady.Admin.csproj b/admin/TwoWeeksReady.Admin/TwoWeeksReady.Admin.csproj
index c11916e..f0ae042 100644
--- a/admin/TwoWeeksReady.Admin/TwoWeeksReady.Admin.csproj
+++ b/admin/TwoWeeksReady.Admin/TwoWeeksReady.Admin.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.6" />
+    <PackageReference Include="TinyMCE.Blazor" Version="0.0.8" />
   </ItemGroup>
 
 </Project>
diff --git a/admin/TwoWeeksReady.Admin/appsettings.Development.json b/admin/TwoWeeksReady.Admin/appsettings.Development.json
index 4d9cb9b..fe79527 100644
--- a/admin/TwoWeeksReady.Admin/appsettings.Development.json
+++ b/admin/TwoWeeksReady.Admin/appsettings.Development.json
@@ -7,10 +7,5 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AllowedHosts": "*", 
-  "Auth0": {
-    "Domain": "YOUR_AUTH0_DOMAIN",
-    "ClientId": "YOUR_CLIENT_ID",
-    "ClientSecret": "YOUR_CLIENT_SECRET"
-  }
+  "AllowedHosts": "*"
 }
diff --git a/admin/TwoWeeksReady.Admin/appsettings.json b/admin/TwoWeeksReady.Admin/appsettings.json
index af88b20..0106276 100644
--- a/admin/TwoWeeksReady.Admin/appsettings.json
+++ b/admin/TwoWeeksReady.Admin/appsettings.json
@@ -7,6 +7,7 @@
     }
   },
   "AllowedHosts": "*",
+  "TinyMCEApiKey": "your-api-key",
   "ApiUrl": "http://localhost:7071/api/",
   "Auth0": {
     "Domain": "YOUR_AUTH0_DOMAIN",