diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 7baa382e24..554ab0c2e6 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Models.EntityBase;
 namespace Umbraco.Core.Models
 {
     /// <summary>
-    /// Defines a Content object
+    /// Represents a Content object
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
diff --git a/src/Umbraco.Core/Models/ContentType.cs b/src/Umbraco.Core/Models/ContentType.cs
index 579721901c..623334d0e8 100644
--- a/src/Umbraco.Core/Models/ContentType.cs
+++ b/src/Umbraco.Core/Models/ContentType.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.Models.EntityBase;
 namespace Umbraco.Core.Models
 {
     /// <summary>
-    /// Defines the type of a <see cref="Content"/> object
+    /// Represents the type of a <see cref="Content"/> object
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
diff --git a/src/Umbraco.Core/Models/IMacro.cs b/src/Umbraco.Core/Models/IMacro.cs
new file mode 100644
index 0000000000..c46a32c790
--- /dev/null
+++ b/src/Umbraco.Core/Models/IMacro.cs
@@ -0,0 +1,94 @@
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Defines a Macro
+    /// </summary>
+    public interface IMacro : IAggregateRoot
+    {
+        /// <summary>
+        /// Gets or sets the alias of the Macro
+        /// </summary>
+        [DataMember]
+        string Alias { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the Macro
+        /// </summary>
+        [DataMember]
+        string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro can be used in an Editor
+        /// </summary>
+        [DataMember]
+        bool UseInEditor { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Cache Duration for the Macro
+        /// </summary>
+        [DataMember]
+        int CacheDuration { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro should be Cached by Page
+        /// </summary>
+        [DataMember]
+        bool CacheByPage { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro should be Cached Personally
+        /// </summary>
+        [DataMember]
+        bool CacheByMember { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro should be rendered in an Editor
+        /// </summary>
+        [DataMember]
+        bool DontRender { get; set; }
+
+        /// <summary>
+        /// Gets or sets the path to the script file in use
+        /// </summary>
+        /// <remarks>Optional: Can only be one of three Script, Python or Xslt</remarks>
+        [DataMember]
+        string ScriptFile { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the assembly, which should be used by the Macro
+        /// </summary>
+        /// <remarks>Will usually only be filled if the ScriptFile is a Usercontrol</remarks>
+        [DataMember]
+        string ScriptAssembly { get; set; }
+
+        /// <summary>
+        /// Gets or set the path to the Python file in use
+        /// </summary>
+        /// <remarks>Optional: Can only be one of three Script, Python or Xslt</remarks>
+        [DataMember]
+        string Python { get; set; }
+
+        /// <summary>
+        /// Gets or sets the path to the Xslt file in use
+        /// </summary>
+        /// <remarks>Optional: Can only be one of three Script, Python or Xslt</remarks>
+        [DataMember]
+        string Xslt { get; set; }
+
+        /// <summary>
+        /// Gets or sets a list of Macro Properties
+        /// </summary>
+        [DataMember]
+        List<IMacroProperty> Properties { get; set; }
+
+        /// <summary>
+        /// Returns an enum <see cref="MacroTypes"/> based on the properties on the Macro
+        /// </summary>
+        /// <returns><see cref="MacroTypes"/></returns>
+        MacroTypes FindMacroType();
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/IMacroProperty.cs b/src/Umbraco.Core/Models/IMacroProperty.cs
new file mode 100644
index 0000000000..91e80716dc
--- /dev/null
+++ b/src/Umbraco.Core/Models/IMacroProperty.cs
@@ -0,0 +1,39 @@
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Defines a Property for a Macro
+    /// </summary>
+    public interface IMacroProperty : IValueObject
+    {
+        /// <summary>
+        /// Gets or sets the Alias of the Property
+        /// </summary>
+        [DataMember]
+        string Alias { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Name of the Property
+        /// </summary>
+        [DataMember]
+        string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Sort Order of the Property
+        /// </summary>
+        [DataMember]
+        int SortOrder { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Type for this Property
+        /// </summary>
+        /// <remarks>
+        /// The MacroPropertyTypes acts as a plugin for Macros.
+        /// All types was previously contained in the database, but has been ported to code.
+        /// </remarks>
+        [DataMember]
+        IMacroPropertyType PropertyType { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/IMacroPropertyType.cs b/src/Umbraco.Core/Models/IMacroPropertyType.cs
new file mode 100644
index 0000000000..acbc9ec6ef
--- /dev/null
+++ b/src/Umbraco.Core/Models/IMacroPropertyType.cs
@@ -0,0 +1,28 @@
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Defines a PropertyType (plugin) for a Macro
+    /// </summary>
+    public interface IMacroPropertyType
+    {
+        /// <summary>
+        /// Gets the unique Alias of the Property Type
+        /// </summary>
+        string Alias { get; }
+
+        /// <summary>
+        /// Gets the name of the Assembly used to render the Property Type
+        /// </summary>
+        string RenderingAssembly { get; }
+        
+        /// <summary>
+        /// Gets the name of the Type used to render the Property Type
+        /// </summary>
+        string RenderingType { get; }
+        
+        /// <summary>
+        /// Gets the Base Type for storing the PropertyType (Int32, String, Boolean)
+        /// </summary>
+        MacroPropertyTypeBaseTypes BaseType { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs
new file mode 100644
index 0000000000..916b804e40
--- /dev/null
+++ b/src/Umbraco.Core/Models/Macro.cs
@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Represents a Macro
+    /// </summary>
+    [Serializable]
+    [DataContract(IsReference = true)]
+    public class Macro : Entity, IMacro
+    {
+        /// <summary>
+        /// Gets or sets the alias of the Macro
+        /// </summary>
+        [DataMember]
+        public string Alias { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the Macro
+        /// </summary>
+        [DataMember]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro can be used in an Editor
+        /// </summary>
+        [DataMember]
+        public bool UseInEditor { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Cache Duration for the Macro
+        /// </summary>
+        [DataMember]
+        public int CacheDuration { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro should be Cached by Page
+        /// </summary>
+        [DataMember]
+        public bool CacheByPage { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro should be Cached Personally
+        /// </summary>
+        [DataMember]
+        public bool CacheByMember { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro should be rendered in an Editor
+        /// </summary>
+        [DataMember]
+        public bool DontRender { get; set; }
+
+        /// <summary>
+        /// Gets or sets the path to the script file in use
+        /// </summary>
+        /// <remarks>Optional: Can only be one of three Script, Python or Xslt</remarks>
+        [DataMember]
+        public string ScriptFile { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the assembly, which should be used by the Macro
+        /// </summary>
+        /// <remarks>Will usually only be filled if the ScriptFile is a Usercontrol</remarks>
+        [DataMember]
+        public string ScriptAssembly { get; set; }
+
+        /// <summary>
+        /// Gets or set the path to the Python file in use
+        /// </summary>
+        /// <remarks>Optional: Can only be one of three Script, Python or Xslt</remarks>
+        [DataMember]
+        public string Python { get; set; }
+
+        /// <summary>
+        /// Gets or sets the path to the Xslt file in use
+        /// </summary>
+        /// <remarks>Optional: Can only be one of three Script, Python or Xslt</remarks>
+        [DataMember]
+        public string Xslt { get; set; }
+
+        /// <summary>
+        /// Gets or sets a list of Macro Properties
+        /// </summary>
+        [DataMember]
+        public List<IMacroProperty> Properties { get; set; }
+
+        /// <summary>
+        /// Overridden this method in order to set a random Id
+        /// </summary>
+        internal override void AddingEntity()
+        {
+            base.AddingEntity();
+
+            var random = new Random();
+            Id = random.Next(10000, int.MaxValue);
+        }
+
+        /// <summary>
+        /// Returns an enum <see cref="MacroTypes"/> based on the properties on the Macro
+        /// </summary>
+        /// <returns><see cref="MacroTypes"/></returns>
+        public MacroTypes FindMacroType()
+        {
+            if (!string.IsNullOrEmpty(Xslt))
+                return MacroTypes.Xslt;
+            
+            if (!string.IsNullOrEmpty(Python))
+                return MacroTypes.Python;
+            
+            if (!string.IsNullOrEmpty(ScriptFile))
+                return MacroTypes.Script;
+            
+            if (!string.IsNullOrEmpty(ScriptFile) && ScriptFile.ToLower().IndexOf(".ascx", StringComparison.InvariantCultureIgnoreCase) > -1)
+            {
+                return MacroTypes.UserControl;
+            }
+            
+            if (!string.IsNullOrEmpty(ScriptFile) && !string.IsNullOrEmpty(ScriptAssembly))
+                return MacroTypes.CustomControl;
+
+            return MacroTypes.Unknown;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/MacroProperty.cs b/src/Umbraco.Core/Models/MacroProperty.cs
new file mode 100644
index 0000000000..bc183fbf7d
--- /dev/null
+++ b/src/Umbraco.Core/Models/MacroProperty.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Represents a Macro Property
+    /// </summary>
+    [Serializable]
+    [DataContract(IsReference = true)]
+    public class MacroProperty : IMacroProperty
+    {
+        /// <summary>
+        /// Gets or sets the Alias of the Property
+        /// </summary>
+        [DataMember]
+        public string Alias { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Name of the Property
+        /// </summary>
+        [DataMember]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Sort Order of the Property
+        /// </summary>
+        [DataMember]
+        public int SortOrder { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Type for this Property
+        /// </summary>
+        /// <remarks>
+        /// The MacroPropertyTypes acts as a plugin for Macros.
+        /// All types was previously contained in the database, but has been ported to code.
+        /// </remarks>
+        [DataMember]
+        public IMacroPropertyType PropertyType { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs b/src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs
new file mode 100644
index 0000000000..0380f1df63
--- /dev/null
+++ b/src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs
@@ -0,0 +1,12 @@
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Enum for the three allowed BaseTypes
+    /// </summary>
+    public enum MacroPropertyTypeBaseTypes
+    {
+        Int32,
+        Boolean,
+        String
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/MacroTypes.cs b/src/Umbraco.Core/Models/MacroTypes.cs
new file mode 100644
index 0000000000..ef1083afe9
--- /dev/null
+++ b/src/Umbraco.Core/Models/MacroTypes.cs
@@ -0,0 +1,15 @@
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Enum for the various types of Macros
+    /// </summary>
+    public enum MacroTypes
+    {
+        Xslt = 1,
+        CustomControl = 2,
+        UserControl = 3,
+        Unknown = 4,
+        Python = 5,
+        Script = 6
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 8cd8d273bc..cb61131871 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -107,8 +107,15 @@
     <Compile Include="Models\IContentType.cs" />
     <Compile Include="Models\IContentTypeBase.cs" />
     <Compile Include="Models\IContentTypeComposition.cs" />
+    <Compile Include="Models\IMacro.cs" />
+    <Compile Include="Models\IMacroProperty.cs" />
+    <Compile Include="Models\IMacroPropertyType.cs" />
     <Compile Include="Models\IMedia.cs" />
     <Compile Include="Models\IMediaType.cs" />
+    <Compile Include="Models\Macro.cs" />
+    <Compile Include="Models\MacroProperty.cs" />
+    <Compile Include="Models\MacroPropertyTypeBaseTypes.cs" />
+    <Compile Include="Models\MacroTypes.cs" />
     <Compile Include="Models\Property.cs" />
     <Compile Include="Models\PropertyCollection.cs" />
     <Compile Include="Models\PropertyGroup.cs" />