diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 5e840610a5..373cd65436 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -172,6 +172,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\WebPages\System.Web.Helpers.dll</HintPath>
     </Reference>
+    <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\WebPages\System.Web.Razor.dll</HintPath>
@@ -1663,6 +1664,7 @@
     <None Include="umbraco_client\CodeMirror\js\mode\r\LICENSE" />
     <None Include="umbraco_client\CodeMirror\js\mode\xquery\LICENSE" />
     <Content Include="Views\web.config" />
+    <Content Include="Views\TestSurface\Index.cshtml" />
     <None Include="web.Template.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
       <SubType>Designer</SubType>
diff --git a/src/Umbraco.Web.UI/Web.config b/src/Umbraco.Web.UI/Web.config
index a860662208..3dd62de184 100644
--- a/src/Umbraco.Web.UI/Web.config
+++ b/src/Umbraco.Web.UI/Web.config
@@ -36,7 +36,7 @@
 		<add key="umbracoDbDSN" value="server=.\sqlexpress;database=v4;user id=sa;password=test;Application Name=Umbraco41"/>
 		<add key="umbracoConfigurationStatus" value="4.10.0"/>
 		<add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
-		<add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
+		<add key="umbracoReservedPaths" value="~/umbraco,~/install/,~/account/" />
 		<add key="umbracoContentXML" value="~/App_Data/umbraco.config"/>
 		<add key="umbracoStorageDirectory" value="~/App_Data"/>
 		<add key="umbracoPath" value="~/umbraco" />
diff --git a/src/Umbraco.Web/AreaRegistrationExtensions.cs b/src/Umbraco.Web/AreaRegistrationExtensions.cs
index ba9697246f..539b8efc16 100644
--- a/src/Umbraco.Web/AreaRegistrationExtensions.cs
+++ b/src/Umbraco.Web/AreaRegistrationExtensions.cs
@@ -14,29 +14,24 @@ namespace Umbraco.Web
 		/// Creates a custom individual route for the specified controller plugin. Individual routes
 		/// are required by controller plugins to map to a unique URL based on ID.
 		/// </summary>
-		/// <typeparam name="T">An PluginAttribute</typeparam>
 		/// <param name="controllerName"></param>
 		/// <param name="controllerType"></param>
 		/// <param name="routes">An existing route collection</param>
-		/// <param name="routeIdParameterName">the data token name for the controller plugin</param>
 		/// <param name="controllerSuffixName">
 		/// The suffix name that the controller name must end in before the "Controller" string for example:
-		/// ContentTreeController has a controllerSuffixName of "Tree"
-		/// </param>
-		/// <param name="baseUrlPath">
-		/// The base name of the URL to create for example: Umbraco/[PackageName]/Trees/ContentTree/1 has a baseUrlPath of "Trees"
+		/// ContentTreeController has a controllerSuffixName of "Tree", this is used for route constraints.
 		/// </param>
 		/// <param name="defaultAction"></param>
 		/// <param name="defaultId"></param>
 		/// <param name="area"></param>
-		/// <param name="controllerId"></param>
 		/// <param name="umbracoTokenValue">The DataToken value to set for the 'umbraco' key, this defaults to 'backoffice' </param>
-		internal static void RouteControllerPlugin(this AreaRegistration area, Guid controllerId, string controllerName, Type controllerType, RouteCollection routes,
-		                                           string routeIdParameterName, string controllerSuffixName, string baseUrlPath, string defaultAction, object defaultId,
+		/// <remarks>
+		/// </remarks>
+		internal static void RouteControllerPlugin(this AreaRegistration area, string controllerName, Type controllerType, RouteCollection routes,
+		                                           string controllerSuffixName, string defaultAction, object defaultId,
 		                                           string umbracoTokenValue = "backoffice")
 		{
 			Mandate.ParameterNotNullOrEmpty(controllerName, "controllerName");
-			Mandate.ParameterNotNullOrEmpty(routeIdParameterName, "routeIdParameterName");
 			Mandate.ParameterNotNullOrEmpty(controllerSuffixName, "controllerSuffixName");
 			Mandate.ParameterNotNullOrEmpty(defaultAction, "defaultAction");
 			Mandate.ParameterNotNull(controllerType, "controllerType");
@@ -45,30 +40,24 @@ namespace Umbraco.Web
 
 			var umbracoArea = GlobalSettings.UmbracoMvcArea;
 
-			//routes are explicitly name with controller names.
-			var url = baseUrlPath.IsNullOrWhiteSpace()
-			          	? umbracoArea + "/" + area.AreaName + "/" + controllerName + "/{action}/{id}"
-			          	: umbracoArea + "/" + area.AreaName + "/" + baseUrlPath + "/" + controllerName + "/{action}/{id}";
+			//routes are explicitly name with controller names and IDs
+			var url = umbracoArea + "/" + area.AreaName + "/" + controllerName + "/{action}/{id}"; 
 
 			//create a new route with custom name, specified url, and the namespace of the controller plugin
 			var controllerPluginRoute = routes.MapRoute(
 				//name
-				string.Format("umbraco-{0}-{1}", controllerName, controllerId),
+				string.Format("umbraco-{0}", controllerType.FullName),
 				//url format
 				url,
 				//set the namespace of the controller to match
 				new[] { controllerType.Namespace });
-
-			//TODO: FIx this!!
-			//By setting the default this will always route even without specifying the surfaceId syntax in the URL,
-			// we need to unit test this and ensure it is correct
-
+			
 			//set defaults
 			controllerPluginRoute.Defaults = new RouteValueDictionary(
 				new Dictionary<string, object>
 					{
 						{ "controller", controllerName },
-						{ routeIdParameterName, controllerId.ToString("N") },
+						{ "controllerType", controllerType.FullName },
 						{ "action", defaultAction },
 						{ "id", defaultId }    
 					});
@@ -78,7 +67,7 @@ namespace Umbraco.Web
 				new Dictionary<string, object>
 					{
 						{ "controller", @"(\w+)" + controllerSuffixName },
-						{ routeIdParameterName, Regex.Escape(controllerId.ToString("N")) }
+						{ "controllerType", controllerType.FullName }
 					});
 			
 			
diff --git a/src/Umbraco.Web/Mvc/PluginController.cs b/src/Umbraco.Web/Mvc/PluginController.cs
new file mode 100644
index 0000000000..355aca89e6
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/PluginController.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Concurrent;
+using System.Web.Mvc;
+using Umbraco.Core;
+
+namespace Umbraco.Web.Mvc
+{
+	/// <summary>
+	/// A base class for all plugin controllers to inherit from
+	/// </summary>
+	public abstract class PluginController : Controller, IRequiresUmbracoContext
+	{
+		/// <summary>
+		/// stores the metadata about plugin controllers
+		/// </summary>
+		private static readonly ConcurrentDictionary<Type, PluginControllerMetadata> Metadata = new ConcurrentDictionary<Type, PluginControllerMetadata>();
+
+		/// <summary>
+		/// Default constructor
+		/// </summary>
+		/// <param name="umbracoContext"></param>
+		protected PluginController(UmbracoContext umbracoContext)
+		{
+			UmbracoContext = umbracoContext;
+			InstanceId = Guid.NewGuid();
+		}
+
+		/// <summary>
+		/// Useful for debugging
+		/// </summary>
+		internal Guid InstanceId { get; private set; }
+
+		public UmbracoContext UmbracoContext { get; set; }
+
+		/// <summary>
+		/// Returns the metadata for this instance
+		/// </summary>
+		internal PluginControllerMetadata GetMetadata()
+		{
+			PluginControllerMetadata meta;
+			if (Metadata.TryGetValue(this.GetType(), out meta))
+			{
+				return meta;
+			}
+
+			var attribute = this.GetType().GetCustomAttribute<PluginControllerAttribute>(false);
+
+			meta = new PluginControllerMetadata()
+			{
+				AreaName = attribute == null ? null : attribute.AreaName,
+				ControllerName = ControllerExtensions.GetControllerName(this.GetType()),
+				ControllerNamespace = this.GetType().Namespace,
+				ControllerType = this.GetType()
+			};
+
+			Metadata.TryAdd(this.GetType(), meta);
+
+			return meta;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/PluginControllerArea.cs b/src/Umbraco.Web/Mvc/PluginControllerArea.cs
new file mode 100644
index 0000000000..fe981b815a
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/PluginControllerArea.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Mvc;
+using System.Web.Routing;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Web.Mvc
+{
+	/// <summary>
+	/// A custom area for controllers that are plugins
+	/// </summary>	
+	internal class PluginControllerArea : AreaRegistration
+	{
+		private readonly IEnumerable<SurfaceController> _surfaceControllers;
+		private readonly string _areaName;
+
+		/// <summary>
+		/// The constructor accepts all types of plugin controllers and will verify that ALL of them have the same areaName assigned to them 
+		/// based on their PluginControllerAttribute. If they are not the same an exception will be thrown.
+		/// </summary>
+		/// <param name="pluginControllers"></param>		
+		public PluginControllerArea(IEnumerable<PluginController> pluginControllers)
+		{
+			//TODO: When we have other future plugin controllers we need to combine them all into one list here to do our validation.
+			var controllers = pluginControllers.ToArray();
+
+			if (controllers.Any(x => x.GetMetadata().AreaName.IsNullOrWhiteSpace()))
+			{
+				throw new InvalidOperationException("Cannot create a PluginControllerArea unless all plugin controllers assigned have a PluginControllerAttribute assigned");
+			}
+			_areaName = controllers.First().GetMetadata().AreaName;
+			foreach(var c in controllers)
+			{
+				if (c.GetMetadata().AreaName != _areaName)
+				{
+					throw new InvalidOperationException("Cannot create a PluginControllerArea unless all plugin controllers assigned have the same AreaName. The first AreaName found was " + _areaName + " however, the controller of type " + c.GetType().FullName + " has an AreaName of " + c.GetMetadata().AreaName);
+				}
+			}
+
+			//get the surface controllers
+			_surfaceControllers = controllers.OfType<SurfaceController>();
+		}
+
+		public override void RegisterArea(AreaRegistrationContext context)
+		{
+			MapRouteSurfaceControllers(context.Routes, _surfaceControllers);
+		}
+
+		public override string AreaName
+		{
+			get { return _areaName; }
+		}
+
+		/// <summary>
+		/// Registers all surface controller routes
+		/// </summary>
+		/// <param name="routes"></param>
+		/// <param name="surfaceControllers"></param>
+		private void MapRouteSurfaceControllers(RouteCollection routes, IEnumerable<SurfaceController> surfaceControllers)
+		{
+			foreach (var s in surfaceControllers)
+			{
+				var meta = s.GetMetadata();
+				this.RouteControllerPlugin(meta.ControllerName, meta.ControllerType, routes, "Surface", "Index", UrlParameter.Optional, "surface");
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/PluginControllerAttribute.cs b/src/Umbraco.Web/Mvc/PluginControllerAttribute.cs
new file mode 100644
index 0000000000..064f39826d
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/PluginControllerAttribute.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Linq;
+
+namespace Umbraco.Web.Mvc
+{
+	/// <summary>
+	/// An attribute applied to a plugin controller that requires that it is routed to its own area
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+	public class PluginControllerAttribute : Attribute
+	{
+		public string AreaName { get; private set; }
+
+		public PluginControllerAttribute(string areaName)
+		{
+			//validate this, only letters and digits allowed.
+			if (areaName.Any(c => !Char.IsLetterOrDigit(c)))
+			{
+				throw new FormatException("The areaName specified " + areaName + " can only contains letters and digits");
+			}
+
+			AreaName = areaName;
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/SurfaceControllerMetadata.cs b/src/Umbraco.Web/Mvc/PluginControllerMetadata.cs
similarity index 73%
rename from src/Umbraco.Web/Mvc/SurfaceControllerMetadata.cs
rename to src/Umbraco.Web/Mvc/PluginControllerMetadata.cs
index ca95965de8..257fc25fe5 100644
--- a/src/Umbraco.Web/Mvc/SurfaceControllerMetadata.cs
+++ b/src/Umbraco.Web/Mvc/PluginControllerMetadata.cs
@@ -5,11 +5,11 @@ namespace Umbraco.Web.Mvc
 	/// <summary>
 	/// Represents some metadata about the surface controller
 	/// </summary>
-	internal class SurfaceControllerMetadata
+	internal class PluginControllerMetadata
 	{
 		internal Type ControllerType { get; set; }
 		internal string ControllerName { get; set; }
 		internal string ControllerNamespace { get; set; }
-		internal Guid? ControllerId { get; set; }
+		internal string AreaName { get; set; }
 	}
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/SurfaceController.cs b/src/Umbraco.Web/Mvc/SurfaceController.cs
index a4ceeed4f6..6d13f3b130 100644
--- a/src/Umbraco.Web/Mvc/SurfaceController.cs
+++ b/src/Umbraco.Web/Mvc/SurfaceController.cs
@@ -6,12 +6,13 @@ using Umbraco.Core;
 
 namespace Umbraco.Web.Mvc
 {
-	[SurfaceController("DD307F95-6D90-4593-8C97-093AC7C12573")]
+	[PluginController("MyTestSurfaceController")]
 	public class TestSurfaceController : SurfaceController
 	{
 		public ActionResult Index()
 		{
-			return Content("<html><body>hello</body></html>");
+			return View();
+			//return Content("<html><body>hello</body></html>");
 		}
 	}
 
@@ -19,37 +20,24 @@ namespace Umbraco.Web.Mvc
 	/// The base controller that all Presentation Add-in controllers should inherit from
 	/// </summary>
 	[MergeModelStateToChildAction]
-	public abstract class SurfaceController : Controller, IRequiresUmbracoContext
-	{
-		///// <summary>
-		///// stores the metadata about surface controllers
-		///// </summary>
-		//private static ConcurrentDictionary<Type, SurfaceControllerMetadata> _metadata = new ConcurrentDictionary<Type, SurfaceControllerMetadata>();
-
-		public UmbracoContext UmbracoContext { get; set; }
-
-		/// <summary>
-		/// Useful for debugging
-		/// </summary>
-		internal Guid InstanceId { get; private set; }
+	public abstract class SurfaceController : PluginController
+	{		
 
 		/// <summary>
 		/// Default constructor
 		/// </summary>
 		/// <param name="umbracoContext"></param>
 		protected SurfaceController(UmbracoContext umbracoContext)
-		{
-			UmbracoContext = umbracoContext;
-			InstanceId = Guid.NewGuid();
+			: base(umbracoContext)
+		{			
 		}
 
 		/// <summary>
 		/// Empty constructor, uses Singleton to resolve the UmbracoContext
 		/// </summary>
 		protected SurfaceController()
-		{
-			UmbracoContext = UmbracoContext.Current;
-			InstanceId = Guid.NewGuid();
+			: base(UmbracoContext.Current)
+		{			
 		}
 
 		/// <summary>
@@ -105,20 +93,6 @@ namespace Umbraco.Web.Mvc
 			}
 		}
 
-		/// <summary>
-		/// Returns the metadata for this instance
-		/// </summary>
-		internal SurfaceControllerMetadata GetMetadata()
-		{
-			var controllerId = this.GetType().GetCustomAttribute<SurfaceControllerAttribute>(false);
-
-			return new SurfaceControllerMetadata()
-				{
-					ControllerId = controllerId == null ? null : (Guid?) controllerId.Id,
-					ControllerName = ControllerExtensions.GetControllerName(this.GetType()),
-					ControllerNamespace = this.GetType().Namespace,
-					ControllerType = this.GetType()
-				};
-		}
+		
 	}
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/SurfaceControllerArea.cs b/src/Umbraco.Web/Mvc/SurfaceControllerArea.cs
deleted file mode 100644
index 7ac8b29ee8..0000000000
--- a/src/Umbraco.Web/Mvc/SurfaceControllerArea.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Mvc;
-using System.Web.Routing;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-
-namespace Umbraco.Web.Mvc
-{
-	/// <summary>
-	/// A custom area for surface controller routes
-	/// </summary>
-	internal class SurfaceControllerArea : AreaRegistration
-	{
-		private readonly IEnumerable<SurfaceController> _surfaceControllers;
-
-		public SurfaceControllerArea(IEnumerable<SurfaceController> surfaceControllers)
-		{
-			_surfaceControllers = surfaceControllers;
-		}
-
-		public override void RegisterArea(AreaRegistrationContext context)
-		{
-			MapRouteSurfaceControllers(context.Routes, _surfaceControllers);
-		}
-
-		public override string AreaName
-		{
-			get { return "Surface"; }
-		}
-
-		/// <summary>
-		/// Registers all surface controller routes
-		/// </summary>
-		/// <param name="routes"></param>
-		/// <param name="surfaceControllers"></param>
-		private void MapRouteSurfaceControllers(RouteCollection routes, IEnumerable<SurfaceController> surfaceControllers)
-		{
-			var areaName = GlobalSettings.UmbracoMvcArea;
-
-			//local surface controllers do not contain the attribute 			
-			var localSurfaceControlleres = surfaceControllers.Where(x => x.GetType().GetCustomAttribute<SurfaceControllerAttribute>(false) == null);
-			foreach (var s in localSurfaceControlleres)
-			{
-				var meta = s.GetMetadata();
-				var route = routes.MapRoute(
-					string.Format("umbraco-{0}-{1}", "surface", meta.ControllerName),
-					areaName + "/Surface/" + meta.ControllerName + "/{action}/{id}",//url to match
-					new { controller = meta.ControllerName, action = "Index", id = UrlParameter.Optional },
-					new[] { meta.ControllerNamespace }); //only match this namespace
-				route.DataTokens.Add("area", areaName); //only match this area
-				route.DataTokens.Add("umbraco", "surface"); //ensure the umbraco token is set
-			}
-
-			var pluginSurfaceControllers = surfaceControllers.Where(x => x.GetType().GetCustomAttribute<SurfaceControllerAttribute>(false) != null);
-			foreach (var s in pluginSurfaceControllers)
-			{
-				var meta = s.GetMetadata();
-				this.RouteControllerPlugin(meta.ControllerId.Value, meta.ControllerName, meta.ControllerType, routes, "surfaceId", "Surface", "", "Index", UrlParameter.Optional, "surface");
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/SurfaceControllerAttribute.cs b/src/Umbraco.Web/Mvc/SurfaceControllerAttribute.cs
deleted file mode 100644
index ac08ca9886..0000000000
--- a/src/Umbraco.Web/Mvc/SurfaceControllerAttribute.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-
-namespace Umbraco.Web.Mvc
-{
-	/// <summary>
-	/// An attribute applied to surface controllers that are not locally declared (i.e. they are shipped as part of a package)
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-	public class SurfaceControllerAttribute : Attribute
-	{
-		public Guid Id { get; private set; }
-
-		public SurfaceControllerAttribute(string id)
-		{
-			Guid gid;
-			if (Guid.TryParse(id, out gid))
-			{
-				Id = gid;
-			}
-			else
-			{
-				throw new InvalidCastException("Cannot convert the value " + id + " to a Guid");	
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index cce5ce9568..caea0cb4ea 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -273,6 +273,7 @@
     <Compile Include="Mvc\HtmlTagWrapperTextNode.cs" />
     <Compile Include="Mvc\IHtmlTagWrapper.cs" />
     <Compile Include="Mvc\MergeModelStateToChildActionAttribute.cs" />
+    <Compile Include="Mvc\PluginController.cs" />
     <Compile Include="Mvc\PostedDataProxyInfo.cs" />
     <Compile Include="Mvc\RedirectToUmbracoPageResult.cs" />
     <Compile Include="Mvc\Strings.Designer.cs">
@@ -281,10 +282,10 @@
       <DependentUpon>Strings.resx</DependentUpon>
     </Compile>
     <Compile Include="Mvc\SurfaceController.cs" />
-    <Compile Include="Mvc\SurfaceControllerArea.cs" />
-    <Compile Include="Mvc\SurfaceControllerAttribute.cs" />
+    <Compile Include="Mvc\PluginControllerArea.cs" />
+    <Compile Include="Mvc\PluginControllerAttribute.cs" />
     <Compile Include="Mvc\SurfaceControllerFactory.cs" />
-    <Compile Include="Mvc\SurfaceControllerMetadata.cs" />
+    <Compile Include="Mvc\PluginControllerMetadata.cs" />
     <Compile Include="Mvc\UmbracoPageResult.cs" />
     <Compile Include="PropertyEditors\RteMacroRenderingPropertyEditorValueConverter.cs" />
     <Compile Include="PublishedMediaStoreResolver.cs" />
diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index 483a3b090f..e44528525c 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Web.Mvc;
 using System.Web.Routing;
 using Umbraco.Core;
@@ -124,12 +125,42 @@ namespace Umbraco.Web
 				);
 			defaultRoute.RouteHandler = new RenderRouteHandler(ControllerBuilder.Current.GetControllerFactory());
 
-			//now we need to find the surface controllers and route them too
-			var surfaceControllers = SurfaceControllerResolver.Current.SurfaceControllers;
-			//create a custom area for them
-			var surfaceControllerArea = new SurfaceControllerArea(surfaceControllers);
-			//register it
-			RouteTable.Routes.RegisterArea(surfaceControllerArea);
+			var umbracoPath = GlobalSettings.UmbracoMvcArea;
+
+			//we need to find the surface controllers and route them
+			var surfaceControllers = SurfaceControllerResolver.Current.SurfaceControllers.ToArray();
+
+			//local surface controllers do not contain the attribute 			
+			var localSurfaceControlleres = surfaceControllers.Where(x => x.GetType().GetCustomAttribute<PluginControllerAttribute>(false) == null);
+			foreach (var s in localSurfaceControlleres)
+			{
+				var meta = s.GetMetadata();
+				var route = RouteTable.Routes.MapRoute(
+					string.Format("umbraco-{0}-{1}", "surface", meta.ControllerName),
+					umbracoPath + "/Surface/" + meta.ControllerName + "/{action}/{id}",//url to match
+					new { controller = meta.ControllerName, action = "Index", id = UrlParameter.Optional },
+					new[] { meta.ControllerNamespace }); //only match this namespace
+				route.DataTokens.Add("area", umbracoPath); //only match this area
+				route.DataTokens.Add("umbraco", "surface"); //ensure the umbraco token is set
+			}
+			
+			//need to get the plugin controllers that are unique to each area (group by)
+			//TODO: One day when we have more plugin controllers, we will need to do a group by on ALL of them to pass into the ctor of PluginControllerArea
+			var groupedAreas = surfaceControllers.GroupBy(controller => controller.GetMetadata().AreaName);
+			//loop through each area defined amongst the controllers
+			foreach(var g in groupedAreas)
+			{
+				//create an area for the controllers (this will throw an exception if all controllers are not in the same area)
+				var pluginControllerArea = new PluginControllerArea(g);
+				//register it
+				RouteTable.Routes.RegisterArea(pluginControllerArea);
+			}
+
+			RouteTable.Routes.MapRoute(
+				"Account",
+				"account/{action}/{id}",
+				new { controller = "Account", action = "Index", id = UrlParameter.Optional }
+				);
 		}