diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs
index 8cbb3bf0b5..efb020aac2 100644
--- a/src/Umbraco.Core/CoreBootManager.cs
+++ b/src/Umbraco.Core/CoreBootManager.cs
@@ -113,6 +113,9 @@ namespace Umbraco.Core
 			ActionsResolver.Current = new ActionsResolver(
 				PluginManager.Current.ResolveActions());
 
+            MacroPropertyTypeResolver.Current = new MacroPropertyTypeResolver(
+                PluginManager.Current.ResolveMacroPropertyTypes());
+
 			PropertyEditorValueConvertersResolver.Current = new PropertyEditorValueConvertersResolver(
 				new []
 					{
diff --git a/src/Umbraco.Core/DataTypesResolver.cs b/src/Umbraco.Core/DataTypesResolver.cs
index 024fecc1ee..c9eba4f074 100644
--- a/src/Umbraco.Core/DataTypesResolver.cs
+++ b/src/Umbraco.Core/DataTypesResolver.cs
@@ -10,8 +10,6 @@ namespace Umbraco.Core
 	/// </summary>
 	internal sealed class DataTypesResolver : LegacyTransientObjectsResolver<DataTypesResolver, IDataType>
 	{
-
-	
 		/// <summary>
 		/// Constructor
 		/// </summary>
diff --git a/src/Umbraco.Core/MacroPropertyTypeResolver.cs b/src/Umbraco.Core/MacroPropertyTypeResolver.cs
new file mode 100644
index 0000000000..bc4bc786ae
--- /dev/null
+++ b/src/Umbraco.Core/MacroPropertyTypeResolver.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+using Umbraco.Core.ObjectResolution;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// A resolver to return all <see cref="IMacroPropertyType"/> objects
+    /// </summary>
+    internal sealed class MacroPropertyTypeResolver : ManyObjectsResolverBase<MacroPropertyTypeResolver, IMacroPropertyType>
+    {
+        /// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="macroPropertyTypes"></param>		
+        internal MacroPropertyTypeResolver(IEnumerable<Type> macroPropertyTypes)
+			: base(macroPropertyTypes)
+		{
+
+		}
+
+		/// <summary>
+		/// Gets the <see cref="IMacroPropertyType"/> implementations.
+		/// </summary>
+		public IEnumerable<IMacroPropertyType> MacroPropertyTypes
+		{
+			get
+			{
+				return Values;
+			}
+		}
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/IMacro.cs b/src/Umbraco.Core/Models/IMacro.cs
index c46a32c790..a35784aa8b 100644
--- a/src/Umbraco.Core/Models/IMacro.cs
+++ b/src/Umbraco.Core/Models/IMacro.cs
@@ -89,6 +89,6 @@ namespace Umbraco.Core.Models
         /// Returns an enum <see cref="MacroTypes"/> based on the properties on the Macro
         /// </summary>
         /// <returns><see cref="MacroTypes"/></returns>
-        MacroTypes FindMacroType();
+        MacroTypes MacroType();
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs
index 23d60c0d9e..c5829831ab 100644
--- a/src/Umbraco.Core/Models/Macro.cs
+++ b/src/Umbraco.Core/Models/Macro.cs
@@ -105,7 +105,7 @@ namespace Umbraco.Core.Models
         /// Returns an enum <see cref="MacroTypes"/> based on the properties on the Macro
         /// </summary>
         /// <returns><see cref="MacroTypes"/></returns>
-        public MacroTypes FindMacroType()
+        public MacroTypes MacroType()
         {
             if (!string.IsNullOrEmpty(Xslt))
                 return MacroTypes.Xslt;
diff --git a/src/Umbraco.Core/PluginManager.cs b/src/Umbraco.Core/PluginManager.cs
index 5523ecefc6..02e51a0e84 100644
--- a/src/Umbraco.Core/PluginManager.cs
+++ b/src/Umbraco.Core/PluginManager.cs
@@ -6,6 +6,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
 using umbraco.interfaces;
 
 namespace Umbraco.Core
@@ -103,6 +104,15 @@ namespace Umbraco.Core
 			return ResolveTypes<IAction>();
 		}
 
+        /// <summary>
+        /// Returns all available IMacroPropertyTypes in application
+        /// </summary>
+        /// <returns></returns>
+        internal IEnumerable<Type> ResolveMacroPropertyTypes()
+        {
+            return ResolveTypes<IMacroPropertyType>();
+        }
+
 		/// <summary>
 		/// Gets/sets which assemblies to scan when type finding, generally used for unit testing, if not explicitly set
 		/// this will search all assemblies known to have plugins and exclude ones known to not have them.
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 3ac230829e..beb813000e 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -71,6 +71,7 @@
     <Compile Include="Dictionary\CultureDictionaryFactoryResolver.cs" />
     <Compile Include="Dictionary\ICultureDictionaryFactory.cs" />
     <Compile Include="EventArgs.cs" />
+    <Compile Include="MacroPropertyTypeResolver.cs" />
     <Compile Include="Models\ContentBase.cs" />
     <Compile Include="Models\ContentExtensions.cs" />
     <Compile Include="Enum.cs" />
diff --git a/src/Umbraco.Web/Services/FileService.cs b/src/Umbraco.Web/Services/FileService.cs
index 7470ec81c8..f9587a05cd 100644
--- a/src/Umbraco.Web/Services/FileService.cs
+++ b/src/Umbraco.Web/Services/FileService.cs
@@ -6,11 +6,14 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Web.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
     {
         private readonly IUnitOfWorkProvider _provider;
 
-        public FileService() : this(new PetaPocoUnitOfWorkProvider())
+        public FileService() : this(new FileUnitOfWorkProvider())
         {
         }
 
diff --git a/src/Umbraco.Web/Services/IMacroService.cs b/src/Umbraco.Web/Services/IMacroService.cs
new file mode 100644
index 0000000000..8a5089daba
--- /dev/null
+++ b/src/Umbraco.Web/Services/IMacroService.cs
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Web.Services
+{
+    /// <summary>
+    /// Defines the ContentService, which is an easy access to operations involving <see cref="IMacro"/>
+    /// </summary>
+    public interface IMacroService : IService
+    {
+        //TODO Possibly create import macro method and ToXml?
+
+        /// <summary>
+        /// Gets an <see cref="IMacro"/> object by its alias
+        /// </summary>
+        /// <param name="alias">Alias to retrieve an <see cref="IMacro"/> for</param>
+        /// <returns>An <see cref="IMacro"/> object</returns>
+        IMacro GetByAlias(string alias);
+        
+        /// <summary>
+        /// Gets a list all available <see cref="IMacro"/> objects
+        /// </summary>
+        /// <param name="aliases">Optional array of aliases to limit the results</param>
+        /// <returns>An enumerable list of <see cref="IMacro"/> objects</returns>
+        IEnumerable<IMacro> GetAll(params string[] aliases);
+        
+        /// <summary>
+        /// Deletes an <see cref="IMacro"/>
+        /// </summary>
+        /// <param name="macro"><see cref="IMacro"/> to delete</param>
+        void Delete(IMacro macro);
+
+        /// <summary>
+        /// Saves an <see cref="IMacro"/>
+        /// </summary>
+        /// <param name="macro"><see cref="IMacro"/> to save</param>
+        void Save(IMacro macro);
+
+        /// <summary>
+        /// Gets a list all available <see cref="IMacroPropertyType"/> plugins
+        /// </summary>
+        /// <returns>An enumerable list of <see cref="IMacroPropertyType"/> objects</returns>
+        IEnumerable<IMacroPropertyType> GetMacroPropertyTypes();
+
+        /// <summary>
+        /// Gets an <see cref="IMacroPropertyType"/> by its alias
+        /// </summary>
+        /// <param name="alias">Alias to retrieve an <see cref="IMacroPropertyType"/> for</param>
+        /// <returns>An <see cref="IMacroPropertyType"/> object</returns>
+        IMacroPropertyType GetMacroPropertyTypeByAlias(string alias);
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Services/MacroService.cs b/src/Umbraco.Web/Services/MacroService.cs
new file mode 100644
index 0000000000..530c1e1e75
--- /dev/null
+++ b/src/Umbraco.Web/Services/MacroService.cs
@@ -0,0 +1,105 @@
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Web.Services
+{
+    /// <summary>
+    /// Represents the Macro Service, which is an easy access to operations involving <see cref="IMacro"/>
+    /// </summary>
+    public class MacroService : IMacroService
+    {
+        private readonly IUnitOfWorkProvider _provider;
+
+        public MacroService()
+            : this(new FileUnitOfWorkProvider())
+        {
+        }
+
+        public MacroService(IUnitOfWorkProvider provider)
+        {
+            _provider = provider;
+            EnsureMacroCache();
+        }
+
+        /// <summary>
+        /// Ensures the macro cache by getting all macros
+        /// from the repository and thus caching them.
+        /// </summary>
+        private void EnsureMacroCache()
+        {
+            IEnumerable<IMacro> macros = GetAll();
+        }
+
+        /// <summary>
+        /// Gets an <see cref="IMacro"/> object by its alias
+        /// </summary>
+        /// <param name="alias">Alias to retrieve an <see cref="IMacro"/> for</param>
+        /// <returns>An <see cref="IMacro"/> object</returns>
+        public IMacro GetByAlias(string alias)
+        {
+            var unitOfWork = _provider.GetUnitOfWork();
+            var repository = RepositoryResolver.ResolveByType<IMacroRepository, IMacro, string>(unitOfWork);
+            return repository.Get(alias);
+        }
+
+        /// <summary>
+        /// Gets a list all available <see cref="IMacro"/> objects
+        /// </summary>
+        /// <param name="aliases">Optional array of aliases to limit the results</param>
+        /// <returns>An enumerable list of <see cref="IMacro"/> objects</returns>
+        public IEnumerable<IMacro> GetAll(params string[] aliases)
+        {
+            var unitOfWork = _provider.GetUnitOfWork();
+            var repository = RepositoryResolver.ResolveByType<IMacroRepository, IMacro, string>(unitOfWork);
+            return repository.GetAll(aliases);
+        }
+
+        /// <summary>
+        /// Deletes an <see cref="IMacro"/>
+        /// </summary>
+        /// <param name="macro"><see cref="IMacro"/> to delete</param>
+        public void Delete(IMacro macro)
+        {
+            var unitOfWork = _provider.GetUnitOfWork();
+            var repository = RepositoryResolver.ResolveByType<IMacroRepository, IMacro, string>(unitOfWork);
+            repository.Delete(macro);
+            unitOfWork.Commit();
+        }
+
+        /// <summary>
+        /// Saves an <see cref="IMacro"/>
+        /// </summary>
+        /// <param name="macro"><see cref="IMacro"/> to save</param>
+        public void Save(IMacro macro)
+        {
+            var unitOfWork = _provider.GetUnitOfWork();
+            var repository = RepositoryResolver.ResolveByType<IMacroRepository, IMacro, string>(unitOfWork);
+            repository.AddOrUpdate(macro);
+            unitOfWork.Commit();
+        }
+
+        /// <summary>
+        /// Gets a list all available <see cref="IMacroPropertyType"/> plugins
+        /// </summary>
+        /// <returns>An enumerable list of <see cref="IMacroPropertyType"/> objects</returns>
+        public IEnumerable<IMacroPropertyType> GetMacroPropertyTypes()
+        {
+            return MacroPropertyTypeResolver.Current.MacroPropertyTypes;
+        }
+
+        /// <summary>
+        /// Gets an <see cref="IMacroPropertyType"/> by its alias
+        /// </summary>
+        /// <param name="alias">Alias to retrieve an <see cref="IMacroPropertyType"/> for</param>
+        /// <returns>An <see cref="IMacroPropertyType"/> object</returns>
+        public IMacroPropertyType GetMacroPropertyTypeByAlias(string alias)
+        {
+            return MacroPropertyTypeResolver.Current.MacroPropertyTypes.FirstOrDefault(x => x.Alias == alias);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Services/ServiceContext.cs b/src/Umbraco.Web/Services/ServiceContext.cs
index 6cd7016e3c..0ccade4292 100644
--- a/src/Umbraco.Web/Services/ServiceContext.cs
+++ b/src/Umbraco.Web/Services/ServiceContext.cs
@@ -34,6 +34,7 @@ namespace Umbraco.Web.Services
         private void BuildServiceCache()
         {
             var provider = new PetaPocoUnitOfWorkProvider();
+            var fileProvider = new FileUnitOfWorkProvider();
             var publishingStrategy = new PublishingStrategy();
 
             var contentService = new ContentService(provider, publishingStrategy);
@@ -42,13 +43,16 @@ namespace Umbraco.Web.Services
             var mediaService = new MediaService(provider);
             _cache.AddOrUpdate(typeof(IMediaService).Name, mediaService, (x, y) => mediaService);
 
+            var macroService = new MacroService(fileProvider);
+            _cache.AddOrUpdate(typeof (IMacroService).Name, macroService, (x, y) => macroService);
+
             var contentTypeService = new ContentTypeService(contentService, mediaService, provider);
             _cache.AddOrUpdate(typeof(IContentTypeService).Name, contentTypeService, (x, y) => contentTypeService);
 
             var dataTypeService = new DataTypeService(provider);
             _cache.AddOrUpdate(typeof(IDataTypeService).Name, dataTypeService, (x, y) => dataTypeService);
 
-            var fileService = new FileService(provider);
+            var fileService = new FileService(fileProvider);
             _cache.AddOrUpdate(typeof(IFileService).Name, fileService, (x, y) => fileService);
             
             var localizationService = new LocalizationService(provider);
@@ -102,5 +106,13 @@ namespace Umbraco.Web.Services
         {
             get { return _cache[typeof(IMediaService).Name] as IMediaService; }
         }
+
+        /// <summary>
+        /// Gets the <see cref="IMacroService"/>
+        /// </summary>
+        public IMacroService MacroService
+        {
+            get { return _cache[typeof(IMacroService).Name] as IMacroService; }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Services/ServiceFactory.cs b/src/Umbraco.Web/Services/ServiceFactory.cs
new file mode 100644
index 0000000000..db4432d869
--- /dev/null
+++ b/src/Umbraco.Web/Services/ServiceFactory.cs
@@ -0,0 +1,65 @@
+namespace Umbraco.Web.Services
+{
+    /// <summary>
+    /// Represents the ServiceFactory, which provides access to the various services in
+    /// a non-singleton way.
+    /// </summary>
+    public static class ServiceFactory
+    {
+        /// <summary>
+        /// Gets the <see cref="IContentService"/>
+        /// </summary>
+        public static IContentService ContentService
+        {
+            get { return ServiceContext.Current.ContentService; }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="IContentTypeService"/>
+        /// </summary>
+        public static IContentTypeService ContentTypeService
+        {
+            get { return ServiceContext.Current.ContentTypeService; }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="IDataTypeService"/>
+        /// </summary>
+        public static IDataTypeService DataTypeService
+        {
+            get { return ServiceContext.Current.DataTypeService; }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="IFileService"/>
+        /// </summary>
+        public static IFileService FileService
+        {
+            get { return ServiceContext.Current.FileService; }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ILocalizationService"/>
+        /// </summary>
+        public static ILocalizationService LocalizationService
+        {
+            get { return ServiceContext.Current.LocalizationService; }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="IMediaService"/>
+        /// </summary>
+        public static IMediaService MediaService
+        {
+            get { return ServiceContext.Current.MediaService; }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="IMacroService"/>
+        /// </summary>
+        public static IMacroService MacroService
+        {
+            get { return ServiceContext.Current.MacroService; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 9f3080b756..e34bfa989d 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -323,11 +323,14 @@
     <Compile Include="Services\IDataTypeService.cs" />
     <Compile Include="Services\IFileService.cs" />
     <Compile Include="Services\ILocalizationService.cs" />
+    <Compile Include="Services\IMacroService.cs" />
     <Compile Include="Services\IMediaService.cs" />
     <Compile Include="Services\IService.cs" />
     <Compile Include="Services\LocalizationService.cs" />
+    <Compile Include="Services\MacroService.cs" />
     <Compile Include="Services\MediaService.cs" />
     <Compile Include="Services\ServiceContext.cs" />
+    <Compile Include="Services\ServiceFactory.cs" />
     <Compile Include="Templates\TemplateUtilities.cs" />
     <Compile Include="umbraco.presentation\Default.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>