diff --git a/src/Umbraco.Core/Services/EntityService.cs b/src/Umbraco.Core/Services/EntityService.cs
index 5d11898d97..a56d3a2f55 100644
--- a/src/Umbraco.Core/Services/EntityService.cs
+++ b/src/Umbraco.Core/Services/EntityService.cs
@@ -51,6 +51,7 @@ namespace Umbraco.Core.Services
                 }
             }
 
+            //TODO Implementing loading from the various services
             throw new NotImplementedException();
         }
 
@@ -74,6 +75,7 @@ namespace Umbraco.Core.Services
                 }
             }
 
+            //TODO Implementing loading from the various services
             throw new NotImplementedException();
         }
 
@@ -151,6 +153,8 @@ namespace Umbraco.Core.Services
         /// <returns></returns>
         public virtual IEnumerable<IUmbracoEntity> GetAll<T>() where T : IUmbracoEntity
         {
+            //TODO Implement this so the type passed in is verified against types on UmbracoObjectTypes
+            //and then used to get all through the method below.
             throw new NotImplementedException();
         }
 
@@ -188,6 +192,7 @@ namespace Umbraco.Core.Services
         /// <returns></returns>
         public virtual UmbracoObjectTypes GetObjectType(int id)
         {
+            //TODO Implement so the entity is fetched from the db and then the Guid is used to resolve the UmbracoObjectType
             throw new NotImplementedException();
         }
 
@@ -198,6 +203,8 @@ namespace Umbraco.Core.Services
         /// <returns></returns>
         public virtual UmbracoObjectTypes GetObjectType(IUmbracoEntity entity)
         {
+            //TODO Implement this so the entity is cast to UmbracoEntity - if valid get the guid id and then resolve the UmbracoObjectType
+            //otherwise fetch the IUmbracoEntity from the db and do it similar to above.
             throw new NotImplementedException();
         }
 
@@ -208,6 +215,7 @@ namespace Umbraco.Core.Services
         /// <returns></returns>
         public virtual Type GetModelType(int id)
         {
+            //TODO Implement so the IUmbracoEntity is fetched from the db and then used to resolve the real type, ie. IContent, IMedia etc.
             throw new NotImplementedException();
         }
 
@@ -218,6 +226,7 @@ namespace Umbraco.Core.Services
         /// <returns></returns>
         public virtual Type GetModelType(UmbracoObjectTypes objectType)
         {
+            //TODO Implement so the real type is returned fro the UmbracoObjectType's attribute.
             throw new NotImplementedException();
         }
     }
diff --git a/src/Umbraco.Core/Services/ServiceContext.cs b/src/Umbraco.Core/Services/ServiceContext.cs
index 7d7d877a86..9c53b989e0 100644
--- a/src/Umbraco.Core/Services/ServiceContext.cs
+++ b/src/Umbraco.Core/Services/ServiceContext.cs
@@ -21,6 +21,7 @@ namespace Umbraco.Core.Services
         private Lazy<FileService> _fileService;
         private Lazy<LocalizationService> _localizationService;
         private Lazy<ServerRegistrationService> _serverRegistrationService;
+        private Lazy<EntityService> _entityService;
 
 		/// <summary>
 		/// Constructor
@@ -74,6 +75,9 @@ namespace Umbraco.Core.Services
 
             if(_localizationService == null)
 				_localizationService = new Lazy<LocalizationService>(() => new LocalizationService(provider, repositoryFactory.Value));
+
+            if (_entityService == null)
+                _entityService = new Lazy<EntityService>(() => new EntityService(provider, repositoryFactory.Value));
         }
 
         /// <summary>
@@ -84,6 +88,14 @@ namespace Umbraco.Core.Services
             get { return _serverRegistrationService.Value; }
         }
 
+        /// <summary>
+        /// Gets the <see cref="EntityService"/>
+        /// </summary>
+        internal EntityService EntityService
+        {
+            get { return _entityService.Value; }
+        }
+
         /// <summary>
         /// Gets the <see cref="IContentService"/>
         /// </summary>