diff --git a/Carter.HtmlNegotiator.sln b/Carter.HtmlNegotiator.sln
new file mode 100644
index 0000000..7ff2a9c
--- /dev/null
+++ b/Carter.HtmlNegotiator.sln
@@ -0,0 +1,76 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Carter.HtmlNegotiator", "src\Carter.HtmlNegotiator\Carter.HtmlNegotiator.csproj", "{486553EF-81DD-401C-AA24-A7A360DDC1F7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Carter.HtmlNegotiator.Sample", "sample\Carter.HtmlNegotiator.Sample\Carter.HtmlNegotiator.Sample.csproj", "{00A6A897-5C02-46E6-B333-8F605BE4145A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Carter", "dependencies\Carter\src\Carter\Carter.csproj", "{8D717F79-9A5C-45FE-8B39-86A651563ADB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Carter.HtmlNegotiator.Tests", "src\Carter.HtmlNegotiator.Tests\Carter.HtmlNegotiator.Tests.csproj", "{A6631AB5-2720-4DBC-A2F7-D00E8A70F9F0}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{486553EF-81DD-401C-AA24-A7A360DDC1F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{486553EF-81DD-401C-AA24-A7A360DDC1F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{486553EF-81DD-401C-AA24-A7A360DDC1F7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{486553EF-81DD-401C-AA24-A7A360DDC1F7}.Debug|x64.Build.0 = Debug|Any CPU
+		{486553EF-81DD-401C-AA24-A7A360DDC1F7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{486553EF-81DD-401C-AA24-A7A360DDC1F7}.Debug|x86.Build.0 = Debug|Any CPU
+		{486553EF-81DD-401C-AA24-A7A360DDC1F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{486553EF-81DD-401C-AA24-A7A360DDC1F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{486553EF-81DD-401C-AA24-A7A360DDC1F7}.Release|x64.ActiveCfg = Release|Any CPU
+		{486553EF-81DD-401C-AA24-A7A360DDC1F7}.Release|x64.Build.0 = Release|Any CPU
+		{486553EF-81DD-401C-AA24-A7A360DDC1F7}.Release|x86.ActiveCfg = Release|Any CPU
+		{486553EF-81DD-401C-AA24-A7A360DDC1F7}.Release|x86.Build.0 = Release|Any CPU
+		{00A6A897-5C02-46E6-B333-8F605BE4145A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00A6A897-5C02-46E6-B333-8F605BE4145A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00A6A897-5C02-46E6-B333-8F605BE4145A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{00A6A897-5C02-46E6-B333-8F605BE4145A}.Debug|x64.Build.0 = Debug|Any CPU
+		{00A6A897-5C02-46E6-B333-8F605BE4145A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{00A6A897-5C02-46E6-B333-8F605BE4145A}.Debug|x86.Build.0 = Debug|Any CPU
+		{00A6A897-5C02-46E6-B333-8F605BE4145A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00A6A897-5C02-46E6-B333-8F605BE4145A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00A6A897-5C02-46E6-B333-8F605BE4145A}.Release|x64.ActiveCfg = Release|Any CPU
+		{00A6A897-5C02-46E6-B333-8F605BE4145A}.Release|x64.Build.0 = Release|Any CPU
+		{00A6A897-5C02-46E6-B333-8F605BE4145A}.Release|x86.ActiveCfg = Release|Any CPU
+		{00A6A897-5C02-46E6-B333-8F605BE4145A}.Release|x86.Build.0 = Release|Any CPU
+		{8D717F79-9A5C-45FE-8B39-86A651563ADB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D717F79-9A5C-45FE-8B39-86A651563ADB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D717F79-9A5C-45FE-8B39-86A651563ADB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8D717F79-9A5C-45FE-8B39-86A651563ADB}.Debug|x64.Build.0 = Debug|Any CPU
+		{8D717F79-9A5C-45FE-8B39-86A651563ADB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8D717F79-9A5C-45FE-8B39-86A651563ADB}.Debug|x86.Build.0 = Debug|Any CPU
+		{8D717F79-9A5C-45FE-8B39-86A651563ADB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D717F79-9A5C-45FE-8B39-86A651563ADB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D717F79-9A5C-45FE-8B39-86A651563ADB}.Release|x64.ActiveCfg = Release|Any CPU
+		{8D717F79-9A5C-45FE-8B39-86A651563ADB}.Release|x64.Build.0 = Release|Any CPU
+		{8D717F79-9A5C-45FE-8B39-86A651563ADB}.Release|x86.ActiveCfg = Release|Any CPU
+		{8D717F79-9A5C-45FE-8B39-86A651563ADB}.Release|x86.Build.0 = Release|Any CPU
+		{A6631AB5-2720-4DBC-A2F7-D00E8A70F9F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6631AB5-2720-4DBC-A2F7-D00E8A70F9F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6631AB5-2720-4DBC-A2F7-D00E8A70F9F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6631AB5-2720-4DBC-A2F7-D00E8A70F9F0}.Debug|x64.Build.0 = Debug|Any CPU
+		{A6631AB5-2720-4DBC-A2F7-D00E8A70F9F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A6631AB5-2720-4DBC-A2F7-D00E8A70F9F0}.Debug|x86.Build.0 = Debug|Any CPU
+		{A6631AB5-2720-4DBC-A2F7-D00E8A70F9F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6631AB5-2720-4DBC-A2F7-D00E8A70F9F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6631AB5-2720-4DBC-A2F7-D00E8A70F9F0}.Release|x64.ActiveCfg = Release|Any CPU
+		{A6631AB5-2720-4DBC-A2F7-D00E8A70F9F0}.Release|x64.Build.0 = Release|Any CPU
+		{A6631AB5-2720-4DBC-A2F7-D00E8A70F9F0}.Release|x86.ActiveCfg = Release|Any CPU
+		{A6631AB5-2720-4DBC-A2F7-D00E8A70F9F0}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/dependencies/Carter b/dependencies/Carter
index 71ac6c5..3eff444 160000
--- a/dependencies/Carter
+++ b/dependencies/Carter
@@ -1 +1 @@
-Subproject commit 71ac6c595dba14057cb6a2dc8a94bd0b671a6ed7
+Subproject commit 3eff4447730f723f6c34688eb80414f55ba60af9
diff --git a/sample/Carter.HtmlNegotiator.Sample/Carter.HtmlNegotiator.Sample.csproj b/sample/Carter.HtmlNegotiator.Sample/Carter.HtmlNegotiator.Sample.csproj
new file mode 100644
index 0000000..5cfab1b
--- /dev/null
+++ b/sample/Carter.HtmlNegotiator.Sample/Carter.HtmlNegotiator.Sample.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\dependencies\Carter\src\Carter\Carter.csproj" />
+    <ProjectReference Include="..\..\src\Carter.HtmlNegotiator\Carter.HtmlNegotiator.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="wwwroot\css" />
+    <Folder Include="wwwroot\js" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Remove="wwwroot\css\style.css" />
+  </ItemGroup>
+
+</Project>
diff --git a/sample/Carter.HtmlNegotiator.Sample/Features/Home/Echo.hbs b/sample/Carter.HtmlNegotiator.Sample/Features/Home/Echo.hbs
new file mode 100644
index 0000000..80366f0
--- /dev/null
+++ b/sample/Carter.HtmlNegotiator.Sample/Features/Home/Echo.hbs
@@ -0,0 +1,5 @@
+{{#*inline "content"}}
+    <div class="container">
+        <h3>Echo: {{Message}}</h3>
+    </div>
+{{/inline}}
\ No newline at end of file
diff --git a/sample/Carter.HtmlNegotiator.Sample/Features/Home/EchoViewModel.cs b/sample/Carter.HtmlNegotiator.Sample/Features/Home/EchoViewModel.cs
new file mode 100644
index 0000000..ec0ca1e
--- /dev/null
+++ b/sample/Carter.HtmlNegotiator.Sample/Features/Home/EchoViewModel.cs
@@ -0,0 +1,7 @@
+namespace Carter.HtmlNegotiator.Sample.Features.Home
+{
+    public class EchoViewModel
+    {
+        public string Message { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/sample/Carter.HtmlNegotiator.Sample/Features/Home/HomeModule.cs b/sample/Carter.HtmlNegotiator.Sample/Features/Home/HomeModule.cs
new file mode 100644
index 0000000..fab73ce
--- /dev/null
+++ b/sample/Carter.HtmlNegotiator.Sample/Features/Home/HomeModule.cs
@@ -0,0 +1,25 @@
+using Carter.Request;
+using Carter.Response;
+
+namespace Carter.HtmlNegotiator.Sample.Features.Home
+{
+    public class HomeModule : CarterModule
+    {
+        public HomeModule()
+        {
+            Get("/", (request, response) => response.Negotiate(new
+            {
+                Title = "Welcome To Carter", 
+                Message = "Hello From Carter!"
+            }));
+
+            Get("/echo", (request, response) => response
+                .WithView("Echo.hbs")
+                .Negotiate(new EchoViewModel
+                {
+                    Message = request.Query.As<string>("msg")
+                })
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/sample/Carter.HtmlNegotiator.Sample/Features/Home/Index.hbs b/sample/Carter.HtmlNegotiator.Sample/Features/Home/Index.hbs
new file mode 100644
index 0000000..f2b089c
--- /dev/null
+++ b/sample/Carter.HtmlNegotiator.Sample/Features/Home/Index.hbs
@@ -0,0 +1,5 @@
+{{#*inline "content"}}
+    <div class="container">
+        <h1 class="mt-5">{{Message}}</h1>
+    </div>
+{{/inline}}
diff --git a/sample/Carter.HtmlNegotiator.Sample/Features/Shared/Footer.hbs b/sample/Carter.HtmlNegotiator.Sample/Features/Shared/Footer.hbs
new file mode 100644
index 0000000..c0841fe
--- /dev/null
+++ b/sample/Carter.HtmlNegotiator.Sample/Features/Shared/Footer.hbs
@@ -0,0 +1,3 @@
+<div class="container">
+    <span class="text-muted">Footer content here.</span>
+</div>
\ No newline at end of file
diff --git a/sample/Carter.HtmlNegotiator.Sample/Features/Shared/Layout.hbs b/sample/Carter.HtmlNegotiator.Sample/Features/Shared/Layout.hbs
new file mode 100644
index 0000000..badf114
--- /dev/null
+++ b/sample/Carter.HtmlNegotiator.Sample/Features/Shared/Layout.hbs
@@ -0,0 +1,48 @@
+<!doctype html>
+<html lang="en" class="h-100">
+    <head>
+        <title>
+            {{#if title}}
+                {{title}}
+            {{else}}
+                Base Page Title
+            {{/if}}
+        </title>
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
+        <style>
+            .bd-placeholder-img {
+                font-size: 1.125rem;
+                text-anchor: middle;
+                -webkit-user-select: none;
+                -moz-user-select: none;
+                -ms-user-select: none;
+                user-select: none;
+            }
+
+            @media (min-width: 768px) {
+                .bd-placeholder-img-lg {
+                    font-size: 3.5rem;
+                }
+            }
+            
+            .container {
+                width: auto;
+                max-width: 680px;
+                padding: 0 15px;
+            }
+
+            .footer {
+                background-color: #f5f5f5;
+            }
+        </style>
+    </head>
+    <body class="d-flex flex-column h-100">
+        <main role="main" class="flex-shrink-0">
+            {{> content}}
+        </main>
+        <footer class="footer mt-auto py-3">
+            {{> Footer }}
+        </footer>        
+        {{> Scripts }}
+    </body>
+</html>
\ No newline at end of file
diff --git a/sample/Carter.HtmlNegotiator.Sample/Features/Shared/Scripts.hbs b/sample/Carter.HtmlNegotiator.Sample/Features/Shared/Scripts.hbs
new file mode 100644
index 0000000..cf828e2
--- /dev/null
+++ b/sample/Carter.HtmlNegotiator.Sample/Features/Shared/Scripts.hbs
@@ -0,0 +1,2 @@
+<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>
\ No newline at end of file
diff --git a/sample/Carter.HtmlNegotiator.Sample/Program.cs b/sample/Carter.HtmlNegotiator.Sample/Program.cs
new file mode 100644
index 0000000..451a8e7
--- /dev/null
+++ b/sample/Carter.HtmlNegotiator.Sample/Program.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace Carter.HtmlNegotiator.Sample
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            CreateHostBuilder(args).Build().Run();
+        }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.UseStartup<Startup>();
+                });
+    }
+}
diff --git a/sample/Carter.HtmlNegotiator.Sample/Startup.cs b/sample/Carter.HtmlNegotiator.Sample/Startup.cs
new file mode 100644
index 0000000..109bc64
--- /dev/null
+++ b/sample/Carter.HtmlNegotiator.Sample/Startup.cs
@@ -0,0 +1,31 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace Carter.HtmlNegotiator.Sample
+{
+    public class Startup
+    {
+        // This method gets called by the runtime. Use this method to add services to the container.
+        // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddCarter();
+            services.AddHtmlNegotiator();
+        }
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        {
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+
+            app.UseStaticFiles();
+            app.UseRouting();
+            app.UseEndpoints(builder => builder.MapCarter());
+        }
+    }
+}
diff --git a/sample/Carter.HtmlNegotiator.Sample/appsettings.Development.json b/sample/Carter.HtmlNegotiator.Sample/appsettings.Development.json
new file mode 100644
index 0000000..8983e0f
--- /dev/null
+++ b/sample/Carter.HtmlNegotiator.Sample/appsettings.Development.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
diff --git a/sample/Carter.HtmlNegotiator.Sample/appsettings.json b/sample/Carter.HtmlNegotiator.Sample/appsettings.json
new file mode 100644
index 0000000..d9d9a9b
--- /dev/null
+++ b/sample/Carter.HtmlNegotiator.Sample/appsettings.json
@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/src/Carter.HtmlNegotiator.Tests/Carter.HtmlNegotiator.Tests.csproj b/src/Carter.HtmlNegotiator.Tests/Carter.HtmlNegotiator.Tests.csproj
new file mode 100644
index 0000000..8551958
--- /dev/null
+++ b/src/Carter.HtmlNegotiator.Tests/Carter.HtmlNegotiator.Tests.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+        <PackageReference Include="Shouldly" Version="4.0.3" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="1.3.0">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Carter.HtmlNegotiator\Carter.HtmlNegotiator.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/Carter.HtmlNegotiator.Tests/HandlebarsViewEngineTests.cs b/src/Carter.HtmlNegotiator.Tests/HandlebarsViewEngineTests.cs
new file mode 100644
index 0000000..92a08fb
--- /dev/null
+++ b/src/Carter.HtmlNegotiator.Tests/HandlebarsViewEngineTests.cs
@@ -0,0 +1,91 @@
+using System.Collections.Generic;
+using Carter.HtmlNegotiator.Tests.Stubs;
+using HandlebarsDotNet;
+using Microsoft.AspNetCore.Http;
+using Xunit;
+
+namespace Carter.HtmlNegotiator.Tests
+{
+    public class HandlebarsViewEngineTests
+    {
+        [Fact]
+        public void Should_Return_Compiled_HTML()
+        {
+            var handlebars = Handlebars.Create();
+            var viewResolver = new StubViewResolver(new Dictionary<string, string>
+            {
+                ["Index.hbs"] = "<h3>Hello from {{Name}}!</h3>"
+            });
+            
+            var configuration = new HtmlNegotiatorConfiguration(new []{ "Views/{Resource}/{View}" });
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Path = "/";
+
+            var subject = new HandlebarsViewEngine(handlebars, viewResolver, new ViewNameResolver(configuration), configuration);
+
+            var result = subject.GetView(httpContext, new { Name = "Carter" });
+
+            Assert.Equal("<h3>Hello from Carter!</h3>", result);
+        }
+        
+        [Fact]
+        public void Should_Return_Compiled_HTML_Using_A_Layout()
+        {
+            var handlebars = Handlebars.Create();
+            var viewLocator = new StubViewResolver(new Dictionary<string, string>
+            {
+                ["Index.hbs"] = "{{#*inline \"content\"}}<h3>Hello from Carter!</h3>{{/inline}}",
+                ["Layout.hbs"] = "<div>{{> content}}</div>"
+            });
+            
+            var configuration = new HtmlNegotiatorConfiguration(new []
+            {
+                "Views/{Resource}/{View}",
+                "Views/Shared/{View}"
+            });
+            
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Path = "/";
+            
+            var subject = new HandlebarsViewEngine(handlebars, viewLocator, new ViewNameResolver(configuration), configuration);
+        
+            var result = subject.GetView(httpContext, new { Name = "Carter" });
+        
+            Assert.Equal("<div><h3>Hello from Carter!</h3></div>", result);
+        }
+        
+        [Fact]
+        public void Should_Return_Compiled_HTML_Using_A_Layout_With_A_Partial()
+        {
+            var handlebars = Handlebars.Create(new HandlebarsConfiguration
+            {
+                PartialTemplateResolver = new StubPartialResolver(new Dictionary<string, string>
+                {
+                    ["Footer"] = "<div>I'm A Footer</div>"
+                })
+            });
+            
+            var viewLocator = new StubViewResolver(new Dictionary<string, string>
+            {
+                ["Index.hbs"] = "{{#*inline \"content\"}}<h3>Hello from Carter!</h3>{{/inline}}",
+                ["Layout.hbs"] = "<div>{{> content}}</div>{{> Footer}}"
+            });
+            
+            var configuration = new HtmlNegotiatorConfiguration(new []
+            {
+                "Views/{Resource}/{View}",
+                "Views/Shared/{View}"
+            });
+            
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Path = "/";
+            
+            var subject = new HandlebarsViewEngine(handlebars, viewLocator, new ViewNameResolver(configuration), configuration);
+        
+            var result = subject.GetView(httpContext, new { Name = "Carter" });
+        
+            Assert.Equal("<div><h3>Hello from Carter!</h3></div><div>I'm A Footer</div>", result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator.Tests/HtmlNegotiatorTests.cs b/src/Carter.HtmlNegotiator.Tests/HtmlNegotiatorTests.cs
new file mode 100644
index 0000000..2158694
--- /dev/null
+++ b/src/Carter.HtmlNegotiator.Tests/HtmlNegotiatorTests.cs
@@ -0,0 +1,74 @@
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Carter.HtmlNegotiator.Tests.Stubs;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Net.Http.Headers;
+using Shouldly;
+using Xunit;
+
+namespace Carter.HtmlNegotiator.Tests
+{
+    public class HtmlNegotiatorTests
+    {
+        [Fact]
+        public void Should_Be_Able_To_Handle_Requests_With_A_HTML_MediaType()
+        {
+            var headerValue = new MediaTypeHeaderValue("text/html");
+            var htmlNegotiator = new HtmlNegotiator(new StubViewEngine());
+
+            var result = htmlNegotiator.CanHandle(headerValue);
+
+            result.ShouldBeTrue();
+        }
+
+        [Fact]
+        public void Should_Not_Be_Able_To_Handle_Requests_Other_MediaTypes()
+        {
+            var headerValue = new MediaTypeHeaderValue("application/json");
+            var htmlNegotiator = new HtmlNegotiator(new StubViewEngine());
+
+            var result = htmlNegotiator.CanHandle(headerValue);
+
+            result.ShouldBeFalse();
+        }
+
+        [Fact]
+        public async Task Should_Return_A_HTML_Response_When_A_View_Has_Been_Found()
+        { 
+            var httpContext = new DefaultHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+            var htmlNegotiator = new HtmlNegotiator(new StubViewEngine());            
+
+            await htmlNegotiator.Handle(httpContext.Request, httpContext.Response, "Hello from Carter!", CancellationToken.None);
+            
+            httpContext.Response.StatusCode.ShouldBe(200);
+            httpContext.Response.ContentType.ShouldBe("text/html");
+            
+            httpContext.Response.Body.Position = 0;
+            using var streamReader = new StreamReader(httpContext.Response.Body);
+            var actualResponseText = await streamReader.ReadToEndAsync();
+            actualResponseText.ShouldContain("<h1>Hello from Carter!</h1>");
+        }
+        
+        [Fact]
+        public async Task Should_Return_A_404_Response_When_A_View_Has_Not_Been_Found()
+        { 
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Path = "/not-found";
+            httpContext.Response.Body = new MemoryStream();
+            var htmlNegotiator = new HtmlNegotiator(new StubViewEngine(true));
+
+            await htmlNegotiator.Handle(httpContext.Request, httpContext.Response, "Hello from Carter!", CancellationToken.None);
+            
+            httpContext.Response.StatusCode.ShouldBe(404);
+            httpContext.Response.ContentType.ShouldBe("text/plain");
+            
+            httpContext.Response.Body.Position = 0;
+            using var streamReader = new StreamReader(httpContext.Response.Body);
+            var actualResponseText = await streamReader.ReadToEndAsync();
+            
+            actualResponseText.ShouldContain("The view 'not-found.hbs' was not found.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator.Tests/PartialTemplateResolverTests.cs b/src/Carter.HtmlNegotiator.Tests/PartialTemplateResolverTests.cs
new file mode 100644
index 0000000..a7777a7
--- /dev/null
+++ b/src/Carter.HtmlNegotiator.Tests/PartialTemplateResolverTests.cs
@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using Carter.HtmlNegotiator.Tests.Stubs;
+using Microsoft.AspNetCore.Http;
+using Shouldly;
+using Xunit;
+
+namespace Carter.HtmlNegotiator.Tests
+{
+    public class PartialTemplateResolverTests
+    {
+        [Fact]
+        public void ShouldBeAbleToResolveSharedPartials()
+        {
+            var stubHandlebarsEnvironment = new StubHandlebarsEnvironment();
+            var locationConventions = new []
+            {
+                "Features/Shared/{View}"
+            };
+            
+            var context = new DefaultHttpContext();
+            context.Request.Path = "/";
+            var httpContextAccessor = new HttpContextAccessor
+            {
+                HttpContext = context
+            };
+
+            var stubFileSystem = new StubFileSystem(new Dictionary<string, string>{ ["Features/Shared/Footer.hbs"] = "<div>A Footer</div>" });
+            var subject = new PartialTemplateResolver(new HtmlNegotiatorConfiguration(locationConventions),new StubWebHostEnvironment(), stubFileSystem);
+
+            var result = subject.TryRegisterPartial(stubHandlebarsEnvironment, "Footer", null);
+            
+            result.ShouldBeTrue();
+            stubHandlebarsEnvironment.Templates.ContainsKey("Footer").ShouldBeTrue();
+            stubHandlebarsEnvironment.Templates["Footer"].ShouldBe("<div>A Footer</div>");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator.Tests/Stubs/StubFileSystem.cs b/src/Carter.HtmlNegotiator.Tests/Stubs/StubFileSystem.cs
new file mode 100644
index 0000000..8bbc9d7
--- /dev/null
+++ b/src/Carter.HtmlNegotiator.Tests/Stubs/StubFileSystem.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+
+namespace Carter.HtmlNegotiator.Tests.Stubs
+{
+    public class StubFileSystem : IFileSystem
+    {
+        private readonly IDictionary<string, string> viewTemplates;
+        
+        public StubFileSystem(IDictionary<string, string> viewTemplates)
+        {
+            this.viewTemplates = viewTemplates;
+        }
+        
+        public bool FileExists(string path)
+        {
+            return viewTemplates.ContainsKey(path);
+        }
+
+        public string ReadFileContents(string path)
+        {
+            viewTemplates.TryGetValue(path, out var source);
+            return source;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator.Tests/Stubs/StubHandlebarsEnvironment.cs b/src/Carter.HtmlNegotiator.Tests/Stubs/StubHandlebarsEnvironment.cs
new file mode 100644
index 0000000..0356a99
--- /dev/null
+++ b/src/Carter.HtmlNegotiator.Tests/Stubs/StubHandlebarsEnvironment.cs
@@ -0,0 +1,95 @@
+using System.Collections.Generic;
+using System.IO;
+using HandlebarsDotNet;
+using HandlebarsDotNet.Helpers;
+using HandlebarsDotNet.Runtime;
+
+namespace Carter.HtmlNegotiator.Tests.Stubs
+{
+    public class StubHandlebarsEnvironment : IHandlebars
+    {
+        public Dictionary<string, string> Templates { get; }
+
+        public StubHandlebarsEnvironment()
+        {
+            Templates = new Dictionary<string, string>();
+        }
+        
+        public HandlebarsTemplate<TextWriter, object, object> Compile(TextReader template)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public HandlebarsTemplate<object, object> Compile(string template)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public HandlebarsTemplate<object, object> CompileView(string templatePath)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public HandlebarsTemplate<TextWriter, object, object> CompileView(string templatePath, ViewReaderFactory readerFactoryFactory)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void RegisterTemplate(string templateName, HandlebarsTemplate<TextWriter, object, object> template)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void RegisterTemplate(string templateName, string template)
+        {
+            Templates.Add(templateName, template);
+        }
+
+        public void RegisterHelper(string helperName, HandlebarsHelper helperFunction)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void RegisterHelper(string helperName, HandlebarsHelperWithOptions helperFunction)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void RegisterHelper(string helperName, HandlebarsReturnHelper helperFunction)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void RegisterHelper(string helperName, HandlebarsReturnWithOptionsHelper helperFunction)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void RegisterHelper(string helperName, HandlebarsBlockHelper helperFunction)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void RegisterHelper(string helperName, HandlebarsReturnBlockHelper helperFunction)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void RegisterHelper(IHelperDescriptor<BlockHelperOptions> helperObject)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void RegisterHelper(IHelperDescriptor<HelperOptions> helperObject)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public DisposableContainer Configure()
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public HandlebarsConfiguration Configuration { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator.Tests/Stubs/StubPartialResolver.cs b/src/Carter.HtmlNegotiator.Tests/Stubs/StubPartialResolver.cs
new file mode 100644
index 0000000..fd5f313
--- /dev/null
+++ b/src/Carter.HtmlNegotiator.Tests/Stubs/StubPartialResolver.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using HandlebarsDotNet;
+
+namespace Carter.HtmlNegotiator.Tests.Stubs
+{
+    public class StubPartialResolver : IPartialTemplateResolver
+    {
+        private readonly Dictionary<string, string> partials;
+
+        public StubPartialResolver(Dictionary<string, string> partials)
+        {
+            this.partials = partials;
+        }
+
+        public bool TryRegisterPartial(IHandlebars env, string partialName, string templatePath)
+        {
+            if (partials.TryGetValue(partialName, out var partial))
+            {
+                env.RegisterTemplate(partialName, partial);
+                return true;
+            }
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator.Tests/Stubs/StubViewEngine.cs b/src/Carter.HtmlNegotiator.Tests/Stubs/StubViewEngine.cs
new file mode 100644
index 0000000..a6a5aaa
--- /dev/null
+++ b/src/Carter.HtmlNegotiator.Tests/Stubs/StubViewEngine.cs
@@ -0,0 +1,28 @@
+using System;
+using Microsoft.AspNetCore.Http;
+
+namespace Carter.HtmlNegotiator.Tests.Stubs
+{
+    public class StubViewEngine : IViewEngine
+    {
+        private readonly bool viewNotFound;
+
+        public StubViewEngine(bool viewNotFound = false)
+        {
+            this.viewNotFound = viewNotFound;
+        }
+        
+        public string Extension => "hbs";
+
+        public string GetView(HttpContext httpContext, object model)
+        {
+            if (viewNotFound)
+            {
+                var viewName = httpContext.Request.Path.ToString().TrimStart('/');
+                throw new ViewNotFoundException($"{viewName}.hbs", Array.Empty<string>());
+            }
+
+            return $"<!doctype html><html><body><h1>{model}</h1></body></html>";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator.Tests/Stubs/StubViewResolver.cs b/src/Carter.HtmlNegotiator.Tests/Stubs/StubViewResolver.cs
new file mode 100644
index 0000000..25a4e0f
--- /dev/null
+++ b/src/Carter.HtmlNegotiator.Tests/Stubs/StubViewResolver.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+
+namespace Carter.HtmlNegotiator.Tests.Stubs
+{
+    public class StubViewResolver : IViewResolver
+    {
+        private readonly Dictionary<string, string> views;
+
+        public StubViewResolver(Dictionary<string, string> views)
+        {
+            this.views = views;
+        }
+        
+        public string GetView(HttpContext httpContext, string viewName)
+        {
+            return this.views.TryGetValue(viewName, out var view)
+                ? view
+                : null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator.Tests/Stubs/StubWebHostEnvironment.cs b/src/Carter.HtmlNegotiator.Tests/Stubs/StubWebHostEnvironment.cs
new file mode 100644
index 0000000..37cd337
--- /dev/null
+++ b/src/Carter.HtmlNegotiator.Tests/Stubs/StubWebHostEnvironment.cs
@@ -0,0 +1,21 @@
+using System;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.FileProviders;
+
+namespace Carter.HtmlNegotiator.Tests.Stubs
+{
+    public class StubWebHostEnvironment : IWebHostEnvironment
+    {
+        public StubWebHostEnvironment()
+        {
+            ContentRootPath = String.Empty;
+        }
+        
+        public string ApplicationName { get; set; }
+        public IFileProvider ContentRootFileProvider { get; set; }
+        public string ContentRootPath { get; set; }
+        public string EnvironmentName { get; set; }
+        public IFileProvider WebRootFileProvider { get; set; }
+        public string WebRootPath { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator.Tests/ViewNameResolverTests.cs b/src/Carter.HtmlNegotiator.Tests/ViewNameResolverTests.cs
new file mode 100644
index 0000000..a4a500b
--- /dev/null
+++ b/src/Carter.HtmlNegotiator.Tests/ViewNameResolverTests.cs
@@ -0,0 +1,64 @@
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Shouldly;
+using Xunit;
+
+namespace Carter.HtmlNegotiator.Tests
+{
+    public class ViewNameResolverTests
+    {
+        [Fact]
+        public void Should_Return_Default_View_Name_With_Extension()
+        {
+            var subject = new ViewNameResolver(new HtmlNegotiatorConfiguration(new List<string>()));
+
+            var result = subject.Resolve(new DefaultHttpContext(), "hbs");
+            
+            result.ShouldBe("Index.hbs");
+        }
+        
+        [Fact]
+        public void Should_Return_View_Name_From_HTTP_Context_With_Extension()
+        {
+            var subject = new ViewNameResolver(new HtmlNegotiatorConfiguration(new List<string>()));
+
+            var context = new DefaultHttpContext();
+            context.Items.Add(Constants.ViewNameKey, "my-view");
+            
+            var result = subject.Resolve(context, "hbs");
+            
+            result.ShouldBe("my-view.hbs");
+        }
+        
+        [Fact]
+        public void Should_Not_Append_Extension_When_Included_In_HttpContext()
+        {
+            var subject = new ViewNameResolver(new HtmlNegotiatorConfiguration(new List<string>()));
+
+            var context = new DefaultHttpContext();
+            context.Items.Add(Constants.ViewNameKey, "my-view.hbs");
+            
+            var result = subject.Resolve(context, "hbs");
+            
+            result.ShouldBe("my-view.hbs");
+        }
+        
+        [Theory]
+        [InlineData(null, "Index.hbs")]
+        [InlineData("", "Index.hbs")]
+        [InlineData("/", "Index.hbs")]
+        [InlineData("/about", "about.hbs")]
+        [InlineData("/orders/checkout", "checkout.hbs")]
+        public void Should_Return_View_Name_From_Request_Path_With_Extension(string path, string expected)
+        {
+            var subject = new ViewNameResolver(new HtmlNegotiatorConfiguration(new List<string>()));
+
+            var context = new DefaultHttpContext();
+            context.Request.Path = path;
+            
+            var result = subject.Resolve(context, "hbs");
+            
+            result.ShouldBe(expected);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator.Tests/ViewResolverTests.cs b/src/Carter.HtmlNegotiator.Tests/ViewResolverTests.cs
new file mode 100644
index 0000000..afa344e
--- /dev/null
+++ b/src/Carter.HtmlNegotiator.Tests/ViewResolverTests.cs
@@ -0,0 +1,114 @@
+using System.Collections.Generic;
+using Carter.HtmlNegotiator.Tests.Stubs;
+using Microsoft.AspNetCore.Http;
+using Shouldly;
+using Xunit;
+
+namespace Carter.HtmlNegotiator.Tests
+{
+    public class ViewResolverTests
+    {
+        [Fact]
+        public void Should_Return_Null_When_View_Name_Is_Null()
+        {
+            var subject = new ViewResolver(new StubFileSystem(new Dictionary<string, string>()), new StubWebHostEnvironment(), new HtmlNegotiatorConfiguration(new List<string>()));
+
+            var result  = subject.GetView(new DefaultHttpContext(), null);
+            
+            result.ShouldBeNull();
+        }
+        
+        [Fact]
+        public void Should_Return_Null_When_View_Name_Is_Empty()
+        {
+            var subject = new ViewResolver(new StubFileSystem(new Dictionary<string, string>()), new StubWebHostEnvironment(), new HtmlNegotiatorConfiguration(new List<string>()));
+
+            var result  = subject.GetView(new DefaultHttpContext(), string.Empty);
+            
+            result.ShouldBeNull();
+        }
+
+        [Fact]
+        public void Should_Use_View_Location_Conventions_To_Resolve_View()
+        {
+            var fileSystem = new StubFileSystem(new Dictionary<string, string>{ ["Views/Home/Index.hbs"] = "<div>Hello World!</div>" });
+            var subject = new ViewResolver(fileSystem, new StubWebHostEnvironment(), new HtmlNegotiatorConfiguration(new[] { "Views/{Resource}/{View}" }));
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Path = "/";
+            
+            var result  = subject.GetView(httpContext, "Index.hbs");
+            
+            result.ShouldNotBeNull();
+            result.ShouldBe("<div>Hello World!</div>");
+        }
+
+        [Theory]
+        [InlineData("/Products", "Index.hbs", "<div>Index</div>")]
+        [InlineData("/Orders/Checkout", "Checkout.hbs", "<div>Checkout</div>")]
+        [InlineData("/Echo", "Echo.hbs", "<div>Echo</div>")]
+        public void Should_Be_Able_To_Resolve_Resource_Name_From_Request_Path(string requestPath, string viewName, string expected)
+        {
+            var fileSystem = new StubFileSystem(new Dictionary<string, string>
+            {
+                ["Views/Home/Echo.hbs"] = "<div>Echo</div>",
+                ["Views/Products/Index.hbs"] = "<div>Index</div>",
+                ["Views/Orders/Checkout.hbs"] = "<div>Checkout</div>"
+            });
+            
+            var locationConventions = new []
+            {
+                "Views/{Resource}/{View}"
+            };
+            
+            var context = new DefaultHttpContext();
+            context.Request.Path = requestPath;
+            
+            var subject = new ViewResolver(fileSystem, new StubWebHostEnvironment(), new HtmlNegotiatorConfiguration(locationConventions));
+            
+            var result  = subject.GetView(context, viewName);
+            
+            result.ShouldNotBeNull();
+            result.ShouldBe(expected);
+        }
+        
+        [Fact]
+        public void Should_Be_Throw_An_AmbiguousViewsException_When_Multiple_View_Are_Found()
+        {
+            var fileSystem = new StubFileSystem(new Dictionary<string, string>
+            {
+                ["Features/Products/Index.hbs"] = string.Empty,
+                ["Views/Products/Index.hbs"] = string.Empty
+            });
+            
+            var locationConventions = new []
+            {
+                "Features/{Resource}/{View}",
+                "Views/{Resource}/{View}"
+            };
+            
+            var context = new DefaultHttpContext();
+            context.Request.Path = "/Products";
+            
+            var subject = new ViewResolver(fileSystem, new StubWebHostEnvironment(), new HtmlNegotiatorConfiguration(locationConventions));
+
+            var ex = Should.Throw<AmbiguousViewsException>(() => subject.GetView(context, "Index.hbs"));
+            
+            ex.Message.ShouldContain("Views (2)");
+        }
+        
+        [Fact]
+        public void Should_Be_Throw_An_ViewNotFoundException_When_No_Views_Are_Found()
+        {
+            var fileSystem = new StubFileSystem(new Dictionary<string, string>());
+            var subject = new ViewResolver(fileSystem, new StubWebHostEnvironment(), new HtmlNegotiatorConfiguration(new List<string>()));
+
+            var context = new DefaultHttpContext();
+            context.Request.Path = "/Products";
+
+            var ex = Should.Throw<ViewNotFoundException>(() => subject.GetView(context, "Index.hbs"));
+            
+            ex.Message.ShouldContain("The view 'Index.hbs' was not found");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator.csproj b/src/Carter.HtmlNegotiator.csproj
deleted file mode 100644
index 9f5c4f4..0000000
--- a/src/Carter.HtmlNegotiator.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/Carter.HtmlNegotiator/AmbiguousViewsException.cs b/src/Carter.HtmlNegotiator/AmbiguousViewsException.cs
new file mode 100644
index 0000000..c08ae70
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/AmbiguousViewsException.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Carter.HtmlNegotiator
+{
+    public class AmbiguousViewsException : Exception
+    {
+        private static readonly string message = "Multiple views found. Views ({0})," +
+                                                 Environment.NewLine + "{1}";
+
+        public AmbiguousViewsException(IEnumerable<string> views) 
+            : base(string.Format(message, views.Count(), string.Join(Environment.NewLine, views)))
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator/Carter.HtmlNegotiator.csproj b/src/Carter.HtmlNegotiator/Carter.HtmlNegotiator.csproj
new file mode 100644
index 0000000..16f1f10
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/Carter.HtmlNegotiator.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Handlebars.Net" Version="2.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\dependencies\Carter\src\Carter\Carter.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Carter.HtmlNegotiator/Constants.cs b/src/Carter.HtmlNegotiator/Constants.cs
new file mode 100644
index 0000000..b7e20c6
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/Constants.cs
@@ -0,0 +1,8 @@
+namespace Carter.HtmlNegotiator
+{
+    public class Constants
+    {
+        public const string ViewNameKey = "View";
+        public const string ResourceNameKey = "Resource";
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator/FileSystem.cs b/src/Carter.HtmlNegotiator/FileSystem.cs
new file mode 100644
index 0000000..f2ff5d4
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/FileSystem.cs
@@ -0,0 +1,23 @@
+using System.IO;
+using System.Text;
+
+namespace Carter.HtmlNegotiator
+{
+    public class FileSystem : IFileSystem
+    {
+        public bool FileExists(string path)
+        {
+            return File.Exists(path);
+        }
+
+        public string ReadFileContents(string path)
+        {
+            return File.ReadAllText(path, Encoding.UTF8);
+        }
+
+        public string[] GetFilesInDirectory(string path, string extension)
+        {
+            return Directory.GetFiles(path, $"*.{extension}");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator/HandlebarsViewEngine.cs b/src/Carter.HtmlNegotiator/HandlebarsViewEngine.cs
new file mode 100644
index 0000000..fc7ce59
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/HandlebarsViewEngine.cs
@@ -0,0 +1,34 @@
+using HandlebarsDotNet;
+using Microsoft.AspNetCore.Http;
+
+namespace Carter.HtmlNegotiator
+{
+    public class HandlebarsViewEngine : IViewEngine
+    {
+        private readonly IHandlebars handlebars;
+        private readonly IViewResolver viewResolver;
+        private readonly ViewNameResolver viewNameResolver;
+        private readonly HtmlNegotiatorConfiguration configuration;
+        
+
+        public HandlebarsViewEngine(IHandlebars handlebars, IViewResolver viewResolver,
+            ViewNameResolver viewNameResolver, HtmlNegotiatorConfiguration configuration)
+        {
+            this.handlebars = handlebars;            
+            this.viewResolver = viewResolver;
+            this.viewNameResolver = viewNameResolver;
+            this.configuration = configuration;
+        }
+        
+        public string Extension => "hbs";
+
+        public string GetView(HttpContext httpContext, object model)
+        {
+            var layout = viewResolver.GetView(httpContext, $"{configuration.DefaultLayoutName}.{Extension}");
+            var view = viewResolver.GetView(httpContext, viewNameResolver.Resolve(httpContext, Extension));
+            var template = handlebars.Compile(string.Concat(view, layout));
+            
+            return template(model);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator/HtmlNegotiator.cs b/src/Carter.HtmlNegotiator/HtmlNegotiator.cs
new file mode 100644
index 0000000..d617a9a
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/HtmlNegotiator.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Net.Http.Headers;
+
+namespace Carter.HtmlNegotiator
+{
+    public class HtmlNegotiator : IResponseNegotiator
+    {
+        private readonly IViewEngine viewEngine;
+
+        public HtmlNegotiator(IViewEngine viewEngine)
+        {
+            this.viewEngine = viewEngine;
+        }
+
+        public bool CanHandle(MediaTypeHeaderValue accept)
+        {
+            return accept.MediaType.Equals("text/html");
+        }
+
+        public async Task Handle(HttpRequest req, HttpResponse res, object model, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var html = viewEngine.GetView(req.HttpContext, model);
+                res.ContentType = "text/html";
+                res.StatusCode = (int)HttpStatusCode.OK;
+                await res.WriteAsync(html, cancellationToken: cancellationToken);
+            }
+            catch (ViewNotFoundException e)
+            {
+                res.ContentType = "text/plain";
+                res.StatusCode = (int)HttpStatusCode.NotFound;
+                await res.WriteAsync(e.Message, cancellationToken: cancellationToken);
+            }
+        }
+    }
+}
diff --git a/src/Carter.HtmlNegotiator/HtmlNegotiatorConfiguration.cs b/src/Carter.HtmlNegotiator/HtmlNegotiatorConfiguration.cs
new file mode 100644
index 0000000..15d94ac
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/HtmlNegotiatorConfiguration.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+
+namespace Carter.HtmlNegotiator
+{
+    public class HtmlNegotiatorConfiguration
+    {
+        public HtmlNegotiatorConfiguration(IEnumerable<string> viewLocationConventions)
+        {
+            DefaultViewName = "Index";
+            RootResourceName = "Home";
+            DefaultLayoutName = "Layout";
+            ViewLocationConventions = viewLocationConventions;
+        }
+
+        public string DefaultViewName { get; }
+        
+        public string RootResourceName { get; }
+        
+        public string DefaultLayoutName { get; }
+        
+        public IEnumerable<string> ViewLocationConventions { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator/HttpResponseExtensions.cs b/src/Carter.HtmlNegotiator/HttpResponseExtensions.cs
new file mode 100644
index 0000000..932975e
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/HttpResponseExtensions.cs
@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Http;
+
+namespace Carter.HtmlNegotiator
+{
+    public static class HttpResponseExtensions
+    {
+        public static HttpResponse WithView(this HttpResponse response, string viewPath)
+        {
+            response.HttpContext.Items.Add(Constants.ViewNameKey, viewPath);
+            return response;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator/IFileSystem.cs b/src/Carter.HtmlNegotiator/IFileSystem.cs
new file mode 100644
index 0000000..a835b97
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/IFileSystem.cs
@@ -0,0 +1,8 @@
+namespace Carter.HtmlNegotiator
+{
+    public interface IFileSystem
+    {
+        bool FileExists(string path);
+        string ReadFileContents(string path);
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator/IViewEngine.cs b/src/Carter.HtmlNegotiator/IViewEngine.cs
new file mode 100644
index 0000000..6fa202f
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/IViewEngine.cs
@@ -0,0 +1,11 @@
+using Microsoft.AspNetCore.Http;
+
+namespace Carter.HtmlNegotiator
+{
+    public interface IViewEngine
+    {
+        string Extension { get; }
+        
+        string GetView(HttpContext httpContext, object model);
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator/IViewResolver.cs b/src/Carter.HtmlNegotiator/IViewResolver.cs
new file mode 100644
index 0000000..bdb8650
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/IViewResolver.cs
@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Http;
+
+namespace Carter.HtmlNegotiator
+{
+    public interface IViewResolver
+    {
+        string GetView(HttpContext httpContext, string viewName);
+    }
+}
diff --git a/src/Carter.HtmlNegotiator/PartialTemplateResolver.cs b/src/Carter.HtmlNegotiator/PartialTemplateResolver.cs
new file mode 100644
index 0000000..eaf3341
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/PartialTemplateResolver.cs
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using HandlebarsDotNet;
+using Microsoft.AspNetCore.Hosting;
+
+namespace Carter.HtmlNegotiator
+{
+    public class PartialTemplateResolver : IPartialTemplateResolver
+    {
+        private readonly HtmlNegotiatorConfiguration configuration;
+        private readonly IWebHostEnvironment environment;
+        private readonly IFileSystem fileSystem;
+
+        public PartialTemplateResolver(HtmlNegotiatorConfiguration configuration, IWebHostEnvironment environment, IFileSystem fileSystem)
+        {
+            this.configuration = configuration;
+            this.environment = environment;
+            this.fileSystem = fileSystem;
+        }
+        
+        public bool TryRegisterPartial(IHandlebars env, string partialName, string templatePath)
+        {
+            var locatedTemplates = new List<string>();
+            
+            foreach (var convention in configuration.ViewLocationConventions)
+            {
+                var path = convention
+                    .Replace($"{{{Constants.ViewNameKey}}}", $"{partialName}.hbs");
+                
+                var fullPath = Path.Combine(environment.ContentRootPath, path);
+                if (this.fileSystem.FileExists(fullPath))
+                {
+                    locatedTemplates.Add(fullPath);
+                }
+            }
+            
+            if (!locatedTemplates.Any())
+            {
+                return false;
+            }
+
+            if (locatedTemplates.Count > 1)
+            {
+                throw new AmbiguousViewsException(locatedTemplates);
+            }
+            
+            env.RegisterTemplate(partialName, fileSystem.ReadFileContents(locatedTemplates.First()));
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator/ServiceCollectionExtensions.cs b/src/Carter.HtmlNegotiator/ServiceCollectionExtensions.cs
new file mode 100644
index 0000000..dfb9b13
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/ServiceCollectionExtensions.cs
@@ -0,0 +1,35 @@
+using HandlebarsDotNet;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Carter.HtmlNegotiator
+{
+    public static class ServiceCollectionExtensions
+    {
+        public static void AddHtmlNegotiator(this IServiceCollection services)
+        {
+            services.AddScoped(p => new HtmlNegotiatorConfiguration(new[]
+            {
+                "Views/{View}",
+                "Views/Shared/{View}",
+                "Views/{Resource}/{View}",
+                "Features/{View}",
+                "Features/Shared/{View}",
+                "Features/{Resource}/{View}"
+            }));
+            
+            services.AddScoped<ViewNameResolver>();
+            services.AddScoped<IViewResolver, ViewResolver>();
+            services.AddScoped<IFileSystem, FileSystem>();
+            services.AddScoped<IPartialTemplateResolver, PartialTemplateResolver>();
+
+            services.AddScoped(p => Handlebars.Create(new HandlebarsConfiguration
+            {
+                PartialTemplateResolver = p.GetService<IPartialTemplateResolver>()
+            }));
+            
+            services.AddScoped<IViewEngine, HandlebarsViewEngine>();
+            services.AddScoped<IResponseNegotiator, HtmlNegotiator>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator/ViewNameResolver.cs b/src/Carter.HtmlNegotiator/ViewNameResolver.cs
new file mode 100644
index 0000000..4dcb47c
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/ViewNameResolver.cs
@@ -0,0 +1,40 @@
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+
+namespace Carter.HtmlNegotiator
+{
+    public class ViewNameResolver
+    {
+        private readonly HtmlNegotiatorConfiguration configuration;
+
+        public ViewNameResolver(HtmlNegotiatorConfiguration configuration)
+        {
+            this.configuration = configuration;
+        }
+        
+        public string Resolve(HttpContext context, string extension)
+        {
+            context.Items.TryGetValue(Constants.ViewNameKey, out var value);
+
+            value ??= GetViewFromPath(context.Request.Path) ?? configuration.DefaultViewName;
+
+            var viewName = value as string;
+            return viewName.EndsWith(extension) 
+            ? viewName
+            : $"{viewName}.{extension}";
+        }
+
+        private string GetViewFromPath(PathString path)
+        {
+            if (!path.HasValue || path.Value.All(x => x != '/'))
+                return null;
+
+            var segments = path.Value.Split("/");
+
+            var viewName = segments.Last();
+            return string.IsNullOrWhiteSpace(viewName)
+                ? null
+                : viewName;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator/ViewNotFoundException.cs b/src/Carter.HtmlNegotiator/ViewNotFoundException.cs
new file mode 100644
index 0000000..44e0bd9
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/ViewNotFoundException.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+
+namespace Carter.HtmlNegotiator
+{
+    public class ViewNotFoundException : Exception
+    {
+        private static readonly string message = "The view '{0}' was not found. The following locations were searched:" +
+                                                 Environment.NewLine +
+                                                 "{1}";
+
+        public ViewNotFoundException(string viewName, IEnumerable<string> locations) 
+            : base(string.Format(message, viewName, string.Join(Environment.NewLine, locations)))
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Carter.HtmlNegotiator/ViewResolver.cs b/src/Carter.HtmlNegotiator/ViewResolver.cs
new file mode 100644
index 0000000..6b9cc65
--- /dev/null
+++ b/src/Carter.HtmlNegotiator/ViewResolver.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+
+namespace Carter.HtmlNegotiator
+{
+    public class ViewResolver : IViewResolver
+    {
+        private readonly IFileSystem fileSystem;
+        private readonly IWebHostEnvironment env;
+        private readonly HtmlNegotiatorConfiguration configuration;
+
+        public ViewResolver(IFileSystem fileSystem, IWebHostEnvironment env, HtmlNegotiatorConfiguration configuration)
+        {
+            this.fileSystem = fileSystem;
+            this.env = env;
+            this.configuration = configuration;
+        }
+
+        public string GetView(HttpContext httpContext, string viewName)
+        {
+            if (string.IsNullOrEmpty(viewName))
+                return null;
+
+            var resource = GetResourceNameFromPath(httpContext.Request.Path);
+            resource ??= configuration.RootResourceName;
+            
+            if (viewName.StartsWith(resource, StringComparison.InvariantCultureIgnoreCase))
+            {
+                resource = configuration.RootResourceName;
+            }
+            
+            var locatedViews = new List<string>();
+            var searchedLocations = new List<string>();
+            
+            foreach (var convention in configuration.ViewLocationConventions)
+            {
+                var path = convention
+                    .Replace($"{{{Constants.ResourceNameKey}}}", resource)
+                    .Replace($"{{{Constants.ViewNameKey}}}", viewName);
+
+                var fullPath = Path.Combine(env.ContentRootPath, path);
+                if (this.fileSystem.FileExists(fullPath))
+                {
+                    locatedViews.Add(fullPath);
+                }
+                searchedLocations.Add(path);
+            }
+
+            if (!locatedViews.Any())
+            {
+                throw new ViewNotFoundException(viewName, searchedLocations);
+            }
+
+            if (locatedViews.Count > 1)
+            {
+                throw new AmbiguousViewsException(locatedViews);
+            }
+            
+            return fileSystem.ReadFileContents(locatedViews.First());
+        }
+
+        private string GetResourceNameFromPath(PathString path)
+        {
+            if (!path.HasValue || path.Value.All(x => x != '/'))
+                return null;
+
+            var segments = path.Value.Split("/");
+
+            var resource = segments[1];
+            return string.IsNullOrWhiteSpace(resource)
+                ? null
+                : resource;
+        }
+    }
+}
diff --git a/src/DefaultViewLocator.cs b/src/DefaultViewLocator.cs
deleted file mode 100644
index a89e056..0000000
--- a/src/DefaultViewLocator.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-namespace HtmlNegotiator
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using Microsoft.AspNetCore.Hosting;
-    using Microsoft.AspNetCore.Http;
-
-    public class DefaultViewLocator : IViewLocator
-    {
-        private readonly IDictionary<Type, string> mappings;
-
-        private readonly IDictionary<Type, string> htmlMappings;
-
-        public DefaultViewLocator(IDictionary<Type, string> mappings)
-        {
-            this.mappings = mappings;
-            this.htmlMappings = new Dictionary<Type, string>();
-        }
-
-        public string GetView(object model, HttpContext httpContext)
-        {
-            string viewName = string.Empty;
-            try
-            {
-                viewName = this.mappings[model.GetType()];
-            }
-            catch (Exception)
-            {
-                return string.Empty;
-            }
-
-            if (this.htmlMappings.ContainsKey(model.GetType()))
-            {
-                return this.htmlMappings[model.GetType()];
-            }
-
-            var env = (IHostingEnvironment)httpContext.RequestServices.GetService(typeof(IHostingEnvironment));
-
-            try
-            {
-                var html = File.ReadAllText(Path.Combine(env.ContentRootPath, viewName));
-
-                this.htmlMappings.Add(model.GetType(), html);
-
-                return html;
-            }
-            catch (FileNotFoundException)
-            {
-                return string.Empty;
-            }
-        }
-    }
-}
diff --git a/src/HtmlNegotiator.cs b/src/HtmlNegotiator.cs
deleted file mode 100644
index 89f46b1..0000000
--- a/src/HtmlNegotiator.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-namespace HtmlNegotiator
-{
-    using System.Net;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Carter;
-    using HandlebarsDotNet;
-    using Microsoft.AspNetCore.Http;
-
-    public class HtmlNegotiator : IResponseNegotiator
-    {
-        private readonly IViewLocator viewLocator;
-
-        public HtmlNegotiator(IViewLocator viewLocator)
-        {
-            this.viewLocator = viewLocator;
-        }
-
-        public bool CanHandle(Microsoft.Net.Http.Headers.MediaTypeHeaderValue accept)
-        {
-            return accept.MediaType.Equals("text/html");
-        }
-
-        public async Task Handle(HttpRequest req, HttpResponse res, object model, CancellationToken cancellationToken)
-        {
-            var source = viewLocator.GetView(model, res.HttpContext);
-            if (string.IsNullOrEmpty(source))
-            {
-                res.StatusCode = 500;
-                res.ContentType = "text/plain";
-                await res.WriteAsync("View not found", cancellationToken);
-            }
-
-            var template = Handlebars.Compile(source);
-
-            res.ContentType = "text/html";
-            res.StatusCode = (int)HttpStatusCode.OK;
-
-            await res.WriteAsync(template(model), cancellationToken);
-        }
-    }
-}
diff --git a/src/IViewLocator.cs b/src/IViewLocator.cs
deleted file mode 100644
index c72c9c9..0000000
--- a/src/IViewLocator.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace HtmlNegotiator
-{
-    using Microsoft.AspNetCore.Http;
-
-    public interface IViewLocator
-    {
-        string GetView(object model, HttpContext httpContext);
-    }
-}