tatus

diff --git a/src/Models/EndpointPage.cs b/src/Models/EndpointPage.cs
index e289f3c..1fdfb8b 100644
--- a/src/Models/EndpointPage.cs
+++ b/src/Models/EndpointPage.cs
@@ -1,5 +1,8 @@
-using Alloy.Liquid.Liquid.Models.Blocks;
+using DeaneBarker.Optimizely.Endpoints.TreeQL;

 using EPiServer.Shell.ObjectEditing;
+using Fluid;

+using Optimizely.CMS.Labs.LiquidTemplating.ViewEngine;

+using System.ComponentModel.DataAnnotations;

 
 namespace DeaneBarker.Optimizely.Endpoints.Models
 {
@@ -10,7 +13,7 @@ namespace DeaneBarker.Optimizely.Endpoints.Models
         DisplayName = "Content Endpoint"
         )
     ]
-    public class EndpointPage : PageData
+    public class EndpointPage : PageData, IEndpoint

     {
         [ClientEditor(ClientEditingClass = "/js/editor.js")]
         public virtual string Query { get; set; }
@@ -24,5 +27,55 @@ namespace DeaneBarker.Optimizely.Endpoints.Models
             base.SetDefaultValues(contentType);
             VisibleInMenu = false;
         }
+

+        public string QuerySource => Query;

+        public IQueryProcessor QueryProcessor => new TreeQlQueryProcessor();

     }
+

+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]

+    public class ValidateLiquidParse : ValidationAttribute

+    {

+        public ValidateLiquidParse()

+        {

+

+        }

+

+        public override bool IsValid(object value)

+        {

+            return GetParseException(value.ToString()) == null;

+        }

+

+        protected override ValidationResult IsValid(object value, ValidationContext validationContext)

+        {

+            if (string.IsNullOrWhiteSpace(value?.ToString()))

+            {

+                return ValidationResult.Success;

+            }

+

+            var message = GetParseException(value?.ToString());

+            if (message != null)

+            {

+                return new ValidationResult($"Liquid parse error: {message}");

+            }

+

+            return ValidationResult.Success;

+        }

+

+        private string GetParseException(string liquidCode)

+        {

+            var parser = new CmsFluidViewParser(new FluidParserOptions() { AllowFunctions = true });

+

+            try

+            {

+                var template = parser.Parse(liquidCode);

+            }

+            catch (Exception e)

+            {

+                return e.Message;

+            }

+

+            return null;

+        }

+    }

+

 }