diff --git a/src/Umbraco.Core/Services/FileService.cs b/src/Umbraco.Core/Services/FileService.cs
index cbda2fce80..def10c0051 100644
--- a/src/Umbraco.Core/Services/FileService.cs
+++ b/src/Umbraco.Core/Services/FileService.cs
@@ -23,34 +23,22 @@ namespace Umbraco.Core.Services
     /// <summary>
     /// Represents the File Service, which is an easy access to operations involving <see cref="IFile"/> objects like Scripts, Stylesheets and Templates
     /// </summary>
-    public class FileService : IFileService
+    public class FileService : RepositoryService, IFileService
     {
-        private readonly RepositoryFactory _repositoryFactory;
         private readonly IUnitOfWorkProvider _fileUowProvider;
-        private readonly IDatabaseUnitOfWorkProvider _dataUowProvider;
 
         private const string PartialViewHeader = "@inherits Umbraco.Web.Mvc.UmbracoTemplatePage";
         private const string PartialViewMacroHeader = "@inherits Umbraco.Web.Macros.PartialViewMacroPage";
 
-        [Obsolete("Use the constructors that specify all dependencies instead")]
-        public FileService()
-            : this(new RepositoryFactory())
-        { }
-
-        [Obsolete("Use the constructors that specify all dependencies instead")]
-        public FileService(RepositoryFactory repositoryFactory)
-            : this(new FileUnitOfWorkProvider(), new PetaPocoUnitOfWorkProvider(), repositoryFactory)
+        public FileService(
+            IUnitOfWorkProvider fileProvider, 
+            IDatabaseUnitOfWorkProvider dataProvider, 
+            RepositoryFactory repositoryFactory,
+            ILogger logger,
+            IEventMessagesFactory eventMessagesFactory)
+            : base(dataProvider, repositoryFactory, logger, eventMessagesFactory)
         {
-        }
-
-        public FileService(IUnitOfWorkProvider fileProvider, IDatabaseUnitOfWorkProvider dataProvider, RepositoryFactory repositoryFactory)
-        {
-            if (fileProvider == null) throw new ArgumentNullException("fileProvider");
-            if (dataProvider == null) throw new ArgumentNullException("dataProvider");
-            if (repositoryFactory == null) throw new ArgumentNullException("repositoryFactory");
-            _repositoryFactory = repositoryFactory;
-            _fileUowProvider = fileProvider;
-            _dataUowProvider = dataProvider;
+            _fileUowProvider = fileProvider;         
         }
 
 
@@ -62,7 +50,7 @@ namespace Umbraco.Core.Services
         /// <returns>An enumerable list of <see cref="Stylesheet"/> objects</returns>
         public IEnumerable<Stylesheet> GetStylesheets(params string[] names)
         {
-            using (var repository = _repositoryFactory.CreateStylesheetRepository(_fileUowProvider.GetUnitOfWork(), _dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateStylesheetRepository(_fileUowProvider.GetUnitOfWork(), UowProvider.GetUnitOfWork()))
             {
                 return repository.GetAll(names);
             }
@@ -75,7 +63,7 @@ namespace Umbraco.Core.Services
         /// <returns>A <see cref="Stylesheet"/> object</returns>
         public Stylesheet GetStylesheetByName(string name)
         {
-            using (var repository = _repositoryFactory.CreateStylesheetRepository(_fileUowProvider.GetUnitOfWork(), _dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateStylesheetRepository(_fileUowProvider.GetUnitOfWork(), UowProvider.GetUnitOfWork()))
             {
                 return repository.Get(name);
             }
@@ -92,7 +80,7 @@ namespace Umbraco.Core.Services
                 return;
 
             var uow = _fileUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreateStylesheetRepository(uow, _dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateStylesheetRepository(uow, UowProvider.GetUnitOfWork()))
             {
                 repository.AddOrUpdate(stylesheet);
                 uow.Commit();
@@ -111,7 +99,7 @@ namespace Umbraco.Core.Services
         public void DeleteStylesheet(string path, int userId = 0)
         {
             var uow = _fileUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreateStylesheetRepository(uow, _dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateStylesheetRepository(uow, UowProvider.GetUnitOfWork()))
             {
                 var stylesheet = repository.Get(path);
                 if (stylesheet == null) return;
@@ -137,7 +125,7 @@ namespace Umbraco.Core.Services
         {
 
             var uow = _fileUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreateStylesheetRepository(uow, _dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateStylesheetRepository(uow, UowProvider.GetUnitOfWork()))
             {
                 return repository.ValidateStylesheet(stylesheet);
             }
@@ -152,7 +140,7 @@ namespace Umbraco.Core.Services
         /// <returns>An enumerable list of <see cref="Script"/> objects</returns>
         public IEnumerable<Script> GetScripts(params string[] names)
         {
-            using (var repository = _repositoryFactory.CreateScriptRepository(_fileUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateScriptRepository(_fileUowProvider.GetUnitOfWork()))
             {
                 return repository.GetAll(names);
             }
@@ -165,7 +153,7 @@ namespace Umbraco.Core.Services
         /// <returns>A <see cref="Script"/> object</returns>
         public Script GetScriptByName(string name)
         {
-            using (var repository = _repositoryFactory.CreateScriptRepository(_fileUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateScriptRepository(_fileUowProvider.GetUnitOfWork()))
             {
                 return repository.Get(name);
             }
@@ -182,7 +170,7 @@ namespace Umbraco.Core.Services
                 return;
 
             var uow = _fileUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreateScriptRepository(uow))
+            using (var repository = RepositoryFactory.CreateScriptRepository(uow))
             {
                 repository.AddOrUpdate(script);
                 uow.Commit();
@@ -201,7 +189,7 @@ namespace Umbraco.Core.Services
         public void DeleteScript(string path, int userId = 0)
         {
             var uow = _fileUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreateScriptRepository(uow))
+            using (var repository = RepositoryFactory.CreateScriptRepository(uow))
             {
                 var script = repository.Get(path);
                 if (script == null) return;
@@ -226,7 +214,7 @@ namespace Umbraco.Core.Services
         public bool ValidateScript(Script script)
         {
             var uow = _fileUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreateScriptRepository(uow))
+            using (var repository = RepositoryFactory.CreateScriptRepository(uow))
             {
                 return repository.ValidateScript(script);
             }
@@ -235,7 +223,7 @@ namespace Umbraco.Core.Services
         public void CreateScriptFolder(string folderPath)
         {
             var uow = _fileUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreateScriptRepository(uow))
+            using (var repository = RepositoryFactory.CreateScriptRepository(uow))
             {
                 ((ScriptRepository)repository).AddFolder(folderPath);
                 uow.Commit();
@@ -245,7 +233,7 @@ namespace Umbraco.Core.Services
         public void DeleteScriptFolder(string folderPath)
         {
             var uow = _fileUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreateScriptRepository(uow))
+            using (var repository = RepositoryFactory.CreateScriptRepository(uow))
             {
                 ((ScriptRepository)repository).DeleteFolder(folderPath);
                 uow.Commit();
@@ -256,6 +244,42 @@ namespace Umbraco.Core.Services
 
         #region Templates
 
+        /// <summary>
+        /// Creates a template for a content type
+        /// </summary>
+        /// <param name="contentTypeAlias"></param>
+        /// <param name="contentTypeName"></param>
+        /// <param name="userId"></param>
+        /// <returns>
+        /// The template created
+        /// </returns>
+        public Attempt<OperationStatus<ITemplate, OperationStatusType>> CreateTemplateForContentType(string contentTypeAlias, string contentTypeName, int userId = 0)
+        {
+            var template = new Template(contentTypeName, contentTypeAlias);
+
+            var evtMsgs = EventMessagesFactory.Get();
+
+            if (SavingTemplate.IsRaisedEventCancelled(
+                  new SaveEventArgs<ITemplate>(template, evtMsgs),
+                  this))
+            {
+                return Attempt.Fail(new OperationStatus<ITemplate, OperationStatusType>(template, OperationStatusType.FailedCancelledByEvent, evtMsgs));
+            }
+
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreateTemplateRepository(uow))
+            {
+                repository.AddOrUpdate(template);
+                uow.Commit();
+
+                SavedTemplate.RaiseEvent(new SaveEventArgs<ITemplate>(template, false, evtMsgs), this);
+            }
+
+            Audit(AuditType.Save, string.Format("Save Template performed by user"), userId, template.Id);
+
+            return Attempt.Succeed(new OperationStatus<ITemplate, OperationStatusType>(template, OperationStatusType.Success, evtMsgs));
+        }
+
         public ITemplate CreateTemplateWithIdentity(string name, string content, ITemplate masterTemplate = null, int userId = 0)
         {
             var template = new Template(name, name)
@@ -276,7 +300,7 @@ namespace Umbraco.Core.Services
         /// <returns>An enumerable list of <see cref="ITemplate"/> objects</returns>
         public IEnumerable<ITemplate> GetTemplates(params string[] aliases)
         {
-            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateTemplateRepository(UowProvider.GetUnitOfWork()))
             {
                 return repository.GetAll(aliases).OrderBy(x => x.Name);
             }
@@ -288,7 +312,7 @@ namespace Umbraco.Core.Services
         /// <returns>An enumerable list of <see cref="ITemplate"/> objects</returns>
         public IEnumerable<ITemplate> GetTemplates(int masterTemplateId)
         {
-            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateTemplateRepository(UowProvider.GetUnitOfWork()))
             {
                 return repository.GetChildren(masterTemplateId).OrderBy(x => x.Name);
             }
@@ -301,7 +325,7 @@ namespace Umbraco.Core.Services
         /// <returns>The <see cref="ITemplate"/> object matching the alias, or null.</returns>
         public ITemplate GetTemplate(string alias)
         {
-            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateTemplateRepository(UowProvider.GetUnitOfWork()))
             {
                 return repository.Get(alias);
             }
@@ -314,7 +338,7 @@ namespace Umbraco.Core.Services
         /// <returns>The <see cref="ITemplate"/> object matching the identifier, or null.</returns>
         public ITemplate GetTemplate(int id)
         {
-            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateTemplateRepository(UowProvider.GetUnitOfWork()))
             {
                 return repository.Get(id);
             }
@@ -327,7 +351,7 @@ namespace Umbraco.Core.Services
         /// <returns>The <see cref="ITemplate"/> object matching the identifier, or null.</returns>
         public ITemplate GetTemplate(Guid id)
         {
-            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateTemplateRepository(UowProvider.GetUnitOfWork()))
             {
                 var query = Query<ITemplate>.Builder.Where(x => x.Key == id);
                 return repository.GetByQuery(query).SingleOrDefault();
@@ -336,7 +360,7 @@ namespace Umbraco.Core.Services
 
         public IEnumerable<ITemplate> GetTemplateDescendants(string alias)
         {
-            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateTemplateRepository(UowProvider.GetUnitOfWork()))
             {
                 return repository.GetDescendants(alias);
             }
@@ -349,7 +373,7 @@ namespace Umbraco.Core.Services
         /// <returns></returns>
         public IEnumerable<ITemplate> GetTemplateDescendants(int masterTemplateId)
         {
-            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateTemplateRepository(UowProvider.GetUnitOfWork()))
             {
                 return repository.GetDescendants(masterTemplateId);
             }
@@ -362,7 +386,7 @@ namespace Umbraco.Core.Services
         /// <returns></returns>
         public IEnumerable<ITemplate> GetTemplateChildren(string alias)
         {
-            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateTemplateRepository(UowProvider.GetUnitOfWork()))
             {
                 return repository.GetChildren(alias);
             }
@@ -375,7 +399,7 @@ namespace Umbraco.Core.Services
         /// <returns></returns>
         public IEnumerable<ITemplate> GetTemplateChildren(int masterTemplateId)
         {
-            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateTemplateRepository(UowProvider.GetUnitOfWork()))
             {
                 return repository.GetChildren(masterTemplateId);
             }
@@ -390,7 +414,7 @@ namespace Umbraco.Core.Services
         [EditorBrowsable(EditorBrowsableState.Never)]
         public TemplateNode GetTemplateNode(string alias)
         {
-            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateTemplateRepository(UowProvider.GetUnitOfWork()))
             {
                 return repository.GetTemplateNode(alias);
             }
@@ -406,7 +430,7 @@ namespace Umbraco.Core.Services
         [EditorBrowsable(EditorBrowsableState.Never)]
         public TemplateNode FindTemplateInTree(TemplateNode anyNode, string alias)
         {
-            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreateTemplateRepository(UowProvider.GetUnitOfWork()))
             {
                 return repository.FindTemplateInTree(anyNode, alias);
             }
@@ -422,8 +446,8 @@ namespace Umbraco.Core.Services
             if (SavingTemplate.IsRaisedEventCancelled(new SaveEventArgs<ITemplate>(template), this))
                 return;
 
-            var uow = _dataUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreateTemplateRepository(uow))
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreateTemplateRepository(uow))
             {
                 repository.AddOrUpdate(template);
                 uow.Commit();
@@ -444,8 +468,8 @@ namespace Umbraco.Core.Services
             if (SavingTemplate.IsRaisedEventCancelled(new SaveEventArgs<ITemplate>(templates), this))
                 return;
 
-            var uow = _dataUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreateTemplateRepository(uow))
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreateTemplateRepository(uow))
             {
                 foreach (var template in templates)
                 {
@@ -474,8 +498,8 @@ namespace Umbraco.Core.Services
         /// </remarks>
         public RenderingEngine DetermineTemplateRenderingEngine(ITemplate template)
         {
-            var uow = _dataUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreateTemplateRepository(uow))
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreateTemplateRepository(uow))
             {
                 return repository.DetermineTemplateRenderingEngine(template);
             }
@@ -488,8 +512,8 @@ namespace Umbraco.Core.Services
         /// <param name="userId"></param>
         public void DeleteTemplate(string alias, int userId = 0)
         {
-            var uow = _dataUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreateTemplateRepository(uow))
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreateTemplateRepository(uow))
             {
                 var template = repository.Get(alias);
                 if (template == null) return;
@@ -513,8 +537,8 @@ namespace Umbraco.Core.Services
         /// <returns>True if Script is valid, otherwise false</returns>
         public bool ValidateTemplate(ITemplate template)
         {
-            var uow = _dataUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreateTemplateRepository(uow))
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreateTemplateRepository(uow))
             {
                 return repository.ValidateTemplate(template);
             }
@@ -543,7 +567,7 @@ namespace Umbraco.Core.Services
         public void DeletePartialViewFolder(string folderPath)
         {
             var uow = _fileUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreatePartialViewRepository(uow))
+            using (var repository = RepositoryFactory.CreatePartialViewRepository(uow))
             {
                 ((PartialViewRepository)repository).DeleteFolder(folderPath);
                 uow.Commit();
@@ -553,7 +577,7 @@ namespace Umbraco.Core.Services
         public void DeletePartialViewMacroFolder(string folderPath)
         {
             var uow = _fileUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreatePartialViewMacroRepository(uow))
+            using (var repository = RepositoryFactory.CreatePartialViewMacroRepository(uow))
             {
                 ((PartialViewMacroRepository)repository).DeleteFolder(folderPath);
                 uow.Commit();
@@ -562,7 +586,7 @@ namespace Umbraco.Core.Services
 
         public IPartialView GetPartialView(string path)
         {
-            using (var repository = _repositoryFactory.CreatePartialViewRepository(_fileUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreatePartialViewRepository(_fileUowProvider.GetUnitOfWork()))
             {
                 return repository.Get(path);
             }
@@ -570,7 +594,7 @@ namespace Umbraco.Core.Services
 
         public IPartialView GetPartialViewMacro(string path)
         {
-            using (var repository = _repositoryFactory.CreatePartialViewMacroRepository(_fileUowProvider.GetUnitOfWork()))
+            using (var repository = RepositoryFactory.CreatePartialViewMacroRepository(_fileUowProvider.GetUnitOfWork()))
             {
                 return repository.Get(path);
             }
@@ -706,8 +730,8 @@ namespace Umbraco.Core.Services
 
         public bool ValidatePartialView(PartialView partialView)
         {
-            var uow = _dataUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreatePartialViewRepository(uow))
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreatePartialViewRepository(uow))
             {
                 return repository.ValidatePartialView(partialView);
             }
@@ -715,8 +739,8 @@ namespace Umbraco.Core.Services
 
         public bool ValidatePartialViewMacro(PartialView partialView)
         {
-            var uow = _dataUowProvider.GetUnitOfWork();
-            using (var repository = _repositoryFactory.CreatePartialViewMacroRepository(uow))
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreatePartialViewMacroRepository(uow))
             {
                 return repository.ValidatePartialView(partialView);
             }
@@ -746,9 +770,9 @@ namespace Umbraco.Core.Services
             switch (partialViewType)
             {
                 case PartialViewType.PartialView:
-                    return _repositoryFactory.CreatePartialViewRepository(uow);
+                    return RepositoryFactory.CreatePartialViewRepository(uow);
                 case PartialViewType.PartialViewMacro:
-                    return _repositoryFactory.CreatePartialViewMacroRepository(uow);
+                    return RepositoryFactory.CreatePartialViewMacroRepository(uow);
             }
             throw new ArgumentOutOfRangeException("partialViewType");
         }
@@ -757,8 +781,8 @@ namespace Umbraco.Core.Services
 
         private void Audit(AuditType type, string message, int userId, int objectId)
         {
-            var uow = _dataUowProvider.GetUnitOfWork();
-            using (var auditRepo = _repositoryFactory.CreateAuditRepository(uow))
+            var uow = UowProvider.GetUnitOfWork();
+            using (var auditRepo = RepositoryFactory.CreateAuditRepository(uow))
             {
                 auditRepo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
                 uow.Commit();
diff --git a/src/Umbraco.Core/Services/IFileService.cs b/src/Umbraco.Core/Services/IFileService.cs
index 18318de1db..35f158903f 100644
--- a/src/Umbraco.Core/Services/IFileService.cs
+++ b/src/Umbraco.Core/Services/IFileService.cs
@@ -187,6 +187,17 @@ namespace Umbraco.Core.Services
         /// <param name="userId">Optional id of the user saving the template</param>
         void SaveTemplate(ITemplate template, int userId = 0);
 
+        /// <summary>
+        /// Creates a template for a content type
+        /// </summary>
+        /// <param name="contentTypeAlias"></param>
+        /// <param name="contentTypeName"></param>
+        /// <param name="userId"></param>
+        /// <returns>
+        /// The template created
+        /// </returns>
+        Attempt<OperationStatus<ITemplate, OperationStatusType>> CreateTemplateForContentType(string contentTypeAlias, string contentTypeName, int userId = 0);
+
         ITemplate CreateTemplateWithIdentity(string name, string content, ITemplate masterTemplate = null, int userId = 0);
 
         /// <summary>
diff --git a/src/Umbraco.Core/Services/ServiceContext.cs b/src/Umbraco.Core/Services/ServiceContext.cs
index 395cb23e32..10601a30fa 100644
--- a/src/Umbraco.Core/Services/ServiceContext.cs
+++ b/src/Umbraco.Core/Services/ServiceContext.cs
@@ -274,7 +274,7 @@ namespace Umbraco.Core.Services
                 _dataTypeService = new Lazy<IDataTypeService>(() => new DataTypeService(provider, repositoryFactory, logger, eventMessagesFactory));
 
             if (_fileService == null)
-                _fileService = new Lazy<IFileService>(() => new FileService(fileProvider, provider, repositoryFactory));
+                _fileService = new Lazy<IFileService>(() => new FileService(fileProvider, provider, repositoryFactory, logger, eventMessagesFactory));
 
             if (_localizationService == null)
                 _localizationService = new Lazy<ILocalizationService>(() => new LocalizationService(provider, repositoryFactory, logger, eventMessagesFactory));
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index 8d6ab726d1..5d83f66f6e 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -17,6 +17,7 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Strings;
 using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Web.Editors
 {
@@ -184,28 +185,37 @@ namespace Umbraco.Web.Editors
                 beforeCreateNew: ctSave =>
                 {
                     //create a default template if it doesnt exist -but only if default template is == to the content type
-                    //TODO: Is this really what we want? What if we don't want any template assigned at all ?
                     if (ctSave.DefaultTemplate.IsNullOrWhiteSpace() == false && ctSave.DefaultTemplate == ctSave.Alias)
                     {
-
                         var template = Services.FileService.GetTemplate(ctSave.Alias);
                         if (template == null)
                         {
-                            string className = null;
-
-                            //TODO: HACK until this is done: http://issues.umbraco.org/issue/U4-7747
-                            bool enabled = false;
-                            if (ConfigurationManager.AppSettings["Umbraco.ModelsBuilder.Enable"] != null &&
-                                bool.TryParse(ConfigurationManager.AppSettings["Umbraco.ModelsBuilder.Enable"], out enabled)
-                                && enabled)
+                            var tryCreateTemplate = Services.FileService.CreateTemplateForContentType(ctSave.Alias, ctSave.Name);
+                            if (tryCreateTemplate == false)
                             {
-                                //ensure is safe and always pascal cased, per razor standard
-                                className = ctSave.Name.ToCleanString(CleanStringType.Alias | CleanStringType.PascalCase);
+                                Logger.Warn<ContentTypeController>(
+                                    "Could not create a template for the Content Type: {0}, status: {1}",
+                                    () => ctSave.Alias,
+                                    () => tryCreateTemplate.Result.StatusType);
                             }
+                            template = tryCreateTemplate.Result.Entity;
 
-                            template = new Template(ctSave.Name, ctSave.Alias);
-                            template.Content = ViewHelper.GetDefaultFileContent(modelClassName: className);
-                            Services.FileService.SaveTemplate(template);
+
+                            //string className = null;
+
+                            ////TODO: HACK until this is done: http://issues.umbraco.org/issue/U4-7747
+                            //bool enabled = false;
+                            //if (ConfigurationManager.AppSettings["Umbraco.ModelsBuilder.Enable"] != null &&
+                            //    bool.TryParse(ConfigurationManager.AppSettings["Umbraco.ModelsBuilder.Enable"], out enabled)
+                            //    && enabled)
+                            //{
+                            //    //ensure is safe and always pascal cased, per razor standard
+                            //    className = ctSave.Name.ToCleanString(CleanStringType.Alias | CleanStringType.PascalCase);
+                            //}
+
+                            //template = new Template(ctSave.Name, ctSave.Alias);
+                            //template.Content = ViewHelper.GetDefaultFileContent(modelClassName: className);
+                            //Services.FileService.SaveTemplate(template);
                         }
 
                         //make sure the template alias is set on the default and allowed template so we can map it back