diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Activities/FormSubmittedActivity.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Activities/FormSubmittedActivity.cs
new file mode 100644
index 000000000..f051ebcbe
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Activities/FormSubmittedActivity.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Orchard.DynamicForms.Elements;
+using Orchard.Localization;
+using Orchard.Workflows.Models;
+using Orchard.Workflows.Services;
+
+namespace Orchard.DynamicForms.Activities {
+    public class FormSubmittedActivity : Event {
+
+        public const string EventName = "DynamicFormSubmitted";
+
+        public Localizer T { get; set; }
+
+        public override bool CanStartWorkflow {
+            get { return true; }
+        }
+
+        public override bool CanExecute(WorkflowContext workflowContext, ActivityContext activityContext) {
+            var state = activityContext.GetState<string>("DynamicForms");
+
+            // "" means 'any'.
+            if (String.IsNullOrEmpty(state)) {
+                return true;
+            }
+
+            var form = workflowContext.Tokens["DynamicForm"] as Form;
+
+            if (form == null) {
+                return false;
+            }
+
+            var formNames = state.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+            return formNames.Any(x => x == form.Name);
+        }
+
+        public override IEnumerable<LocalizedString> GetPossibleOutcomes(WorkflowContext workflowContext, ActivityContext activityContext) {
+            return new[] { T("Done") };
+        }
+
+        public override IEnumerable<LocalizedString> Execute(WorkflowContext workflowContext, ActivityContext activityContext) {
+            yield return T("Done");
+        }
+
+        public override string Form {
+            get {
+                return "SelectDynamicForms";
+            }
+        }
+
+        public override string Name {
+            get { return EventName; }
+        }
+
+        public override LocalizedString Category {
+            get { return T("Forms"); }
+        }
+
+        public override LocalizedString Description {
+            get { return T("A dynamic form is submitted."); }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Activities/SelectDynamicForms.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Activities/SelectDynamicForms.cs
new file mode 100644
index 000000000..e7ce09fb8
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Activities/SelectDynamicForms.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Linq;
+using System.Web.Mvc;
+using Orchard.ContentManagement;
+using Orchard.DisplayManagement;
+using Orchard.Forms.Services;
+using Orchard.Localization;
+
+namespace Orchard.DynamicForms.Activities {
+    public class SelectDynamicForms : IFormProvider {
+        protected dynamic Shape { get; set; }
+        public Localizer T { get; set; }
+
+        public SelectDynamicForms(IShapeFactory shapeFactory) {
+            Shape = shapeFactory;
+            T = NullLocalizer.Instance;
+        }
+
+        public void Describe(DescribeContext context) {
+            context.Form("SelectDynamicForms", factory => {
+                var shape = (dynamic)factory;
+                 var form = shape.Form(
+                    Id: "AnyOfDynamicForms",
+                    _Parts: Shape.Textbox(
+                        Id: "dynamicforms",
+                        Name: "DynamicForms",
+                        Title: T("Dynamic Forms"),
+                        Description: T("Enter a comma separated list of dynamic form names. Leave empty to handle all forms."),
+                        Classes: new[] { "text", "large" })
+                    );
+
+                return form;
+            });
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/AdminMenu.cs
new file mode 100644
index 000000000..9b6a0de82
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/AdminMenu.cs
@@ -0,0 +1,18 @@
+using Orchard.UI.Navigation;
+
+namespace Orchard.DynamicForms {
+    public class AdminMenu : Component, INavigationProvider {
+        public string MenuName { get { return "admin"; } }
+
+        public void GetNavigation(NavigationBuilder builder) {
+            builder
+                .AddImageSet("dynamicforms")
+                .Add(T("Dynamic Forms"), "4", menu => menu
+                    .Add(T("Manage Forms"), "1.0",
+                        item => item
+                            .Action("Index", "Admin", new { area = "Orchard.DynamicForms" })
+                            .Permission(Permissions.ManageForms))
+            );
+        }
+    }
+}
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Bindings/BodyPartBindings.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Bindings/BodyPartBindings.cs
new file mode 100644
index 000000000..c5d0b7d92
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Bindings/BodyPartBindings.cs
@@ -0,0 +1,12 @@
+using Orchard.Core.Common.Models;
+using Orchard.DynamicForms.Services;
+using Orchard.DynamicForms.Services.Models;
+
+namespace Orchard.DynamicForms.Bindings {
+    public class BodyPartBindings : Component, IBindingProvider {
+        public void Describe(BindingDescribeContext context) {
+            context.For<BodyPart>()
+                .Binding("Text", (part, s) => part.Text = s);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Bindings/TextFieldBindings.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Bindings/TextFieldBindings.cs
new file mode 100644
index 000000000..eb81f1dc6
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Bindings/TextFieldBindings.cs
@@ -0,0 +1,12 @@
+using Orchard.Core.Common.Fields;
+using Orchard.DynamicForms.Services;
+using Orchard.DynamicForms.Services.Models;
+
+namespace Orchard.DynamicForms.Bindings {
+    public class TextFieldBindings : Component, IBindingProvider {
+        public void Describe(BindingDescribeContext context) {
+            context.For<TextField>()
+                .Binding("Text", (field, s) => field.Value = s);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Bindings/TitlePartBindings.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Bindings/TitlePartBindings.cs
new file mode 100644
index 000000000..b4cadb80f
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Bindings/TitlePartBindings.cs
@@ -0,0 +1,12 @@
+using Orchard.Core.Title.Models;
+using Orchard.DynamicForms.Services;
+using Orchard.DynamicForms.Services.Models;
+
+namespace Orchard.DynamicForms.Bindings {
+    public class TitlePartBindings : Component, IBindingProvider {
+        public void Describe(BindingDescribeContext context) {
+            context.For<TitlePart>()
+                .Binding("Title", (part, s) => part.Title = s);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Bindings/UserPartBindings.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Bindings/UserPartBindings.cs
new file mode 100644
index 000000000..ec0d3e9cb
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Bindings/UserPartBindings.cs
@@ -0,0 +1,14 @@
+using Orchard.DynamicForms.Services;
+using Orchard.DynamicForms.Services.Models;
+using Orchard.Users.Models;
+
+namespace Orchard.DynamicForms.Bindings {
+    public class UserPartBindings : Component, IBindingProvider {
+        public void Describe(BindingDescribeContext context) {
+            context.For<UserPart>()
+                .Binding("UserName", (part, s) => part.UserName = s)
+                .Binding("Email", (part, s) => part.Email = s)
+                .Binding("Password", (part, s) => part.Password = s);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/AdminController.cs
new file mode 100644
index 000000000..e576341f7
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/AdminController.cs
@@ -0,0 +1,21 @@
+using System.Linq;
+using System.Web.Mvc;
+using Orchard.DynamicForms.Services;
+using Orchard.DynamicForms.ViewModels;
+
+namespace Orchard.DynamicForms.Controllers {
+    public class AdminController : Controller {
+        private readonly IFormService _formService;
+        public AdminController(IFormService formService) {
+            _formService = formService;
+        }
+
+        public ActionResult Index() {
+            var forms = _formService.GetSubmissions().ToArray().GroupBy(x => x.FormName).ToArray();
+            var viewModel = new FormsIndexViewModel {
+                Forms = forms
+            };
+            return View(viewModel);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/FormController.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/FormController.cs
new file mode 100644
index 000000000..4034f562a
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/FormController.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Web.Mvc;
+using Orchard.DynamicForms.Helpers;
+using Orchard.DynamicForms.Services;
+using Orchard.Layouts.Services;
+using Orchard.Localization;
+using Orchard.Logging;
+using Orchard.UI.Notify;
+using IController = Orchard.DynamicForms.Services.IController;
+
+namespace Orchard.DynamicForms.Controllers {
+    public class FormController : Controller, IController {
+        private readonly INotifier _notifier;
+        private readonly ILayoutManager _layoutManager;
+        private readonly IFormService _formService;
+
+        public FormController(
+            INotifier notifier, 
+            ILayoutManager layoutManager, 
+            IFormService formService) {
+
+            _notifier = notifier;
+            _layoutManager = layoutManager;
+            _formService = formService;
+            T = NullLocalizer.Instance;
+            Logger = NullLogger.Instance;
+        }
+
+        public Localizer T { get; set; }
+        public ILogger Logger { get; set; }
+
+        public ActionResult Submit(int contentId, string formName) {
+            var layoutPart = _layoutManager.GetLayout(contentId);
+            var form = _formService.FindForm(layoutPart, formName);
+            var urlReferrer = HttpContext.Request.UrlReferrer != null ? HttpContext.Request.UrlReferrer.ToString() : "~/";
+
+            if (form == null) {
+                Logger.Warning("The specified form \"{0}\" could not be found.", formName);
+                _notifier.Warning(T("The specified form \"{0}\" could not be found."));
+                return Redirect(urlReferrer);
+            }
+
+            var values = _formService.SubmitForm(form, ValueProvider, ModelState);
+            this.TransferFormSubmission(form, values);
+
+            if(Response.IsRequestBeingRedirected)
+                return new EmptyResult();
+
+            var redirectUrl = !String.IsNullOrWhiteSpace(form.RedirectUrl) ? form.RedirectUrl : urlReferrer;
+            return Redirect(redirectUrl);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/SubmissionAdminController.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/SubmissionAdminController.cs
new file mode 100644
index 000000000..956d78c35
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/SubmissionAdminController.cs
@@ -0,0 +1,78 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Mvc;
+using Orchard.DynamicForms.Helpers;
+using Orchard.DynamicForms.Services;
+using Orchard.DynamicForms.ViewModels;
+using Orchard.Localization;
+using Orchard.Mvc;
+using Orchard.UI.Admin;
+using Orchard.UI.Navigation;
+using Orchard.UI.Notify;
+
+namespace Orchard.DynamicForms.Controllers {
+    [Admin]
+    public class SubmissionAdminController : Controller {
+        private readonly IFormService _formService;
+        private readonly IOrchardServices _services;
+
+        public SubmissionAdminController(IFormService formService, IOrchardServices services) {
+            _formService = formService;
+            _services = services;
+            T = NullLocalizer.Instance;
+        }
+
+        public Localizer T { get; set; }
+
+        public ActionResult Index(string id, PagerParameters pagerParameters) {
+            var pager = new Pager(_services.WorkContext.CurrentSite, pagerParameters);
+            var submissions = _formService.GetSubmissions(id, pager.GetStartIndex(), pager.PageSize);
+            var pagerShape = _services.New.Pager(pager).TotalItemCount(submissions.TotalItemCount);
+            var viewModel = new SubmissionsIndexViewModel {
+                FormName = id,
+                Submissions = _formService.GenerateDataTable(submissions),
+                Pager = pagerShape
+            };
+            return View(viewModel);
+        }
+
+        public ActionResult Details(int id) {
+            var submission = _formService.GetSubmission(id);
+
+            if (submission == null)
+                return HttpNotFound();
+
+            var viewModel = new SubmissionViewModel {
+                Submission = submission,
+                NameValues = submission.ToNameValues()
+            };
+            return View(viewModel);
+        }
+
+        public ActionResult Delete(int id) {
+            var submission = _formService.GetSubmission(id);
+
+            if (submission == null)
+                return HttpNotFound();
+
+            _formService.DeleteSubmission(submission);
+            _services.Notifier.Information(T("That submission has been deleted."));
+            return Redirect(Request.UrlReferrer.ToString());
+        }
+
+        [FormValueRequired("submit.BulkEdit")]
+        [ActionName("Index")]
+        public ActionResult BulkDelete(IEnumerable<int> submissionIds) {
+            if (submissionIds == null || !submissionIds.Any()) {
+                _services.Notifier.Error(T("Please select the submissions to delete."));
+
+            }
+            else {
+                var numDeletedSubmissions = _formService.DeleteSubmissions(submissionIds);
+                _services.Notifier.Information(T("{0} submissions have been deleted.", numDeletedSubmissions));
+            }
+
+            return Redirect(Request.UrlReferrer.ToString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/BindingsElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/BindingsElementDriver.cs
new file mode 100644
index 000000000..8f4fd3553
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/BindingsElementDriver.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Linq;
+using Orchard.ContentManagement.MetaData;
+using Orchard.ContentManagement.MetaData.Models;
+using Orchard.DynamicForms.Elements;
+using Orchard.DynamicForms.Services;
+using Orchard.DynamicForms.ViewModels;
+using Orchard.Layouts.Framework.Drivers;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class BindingsElementDriver : ElementDriver<FormElement> {
+        private readonly IBindingManager _bindingManager;
+        private readonly IContentDefinitionManager _contentDefinitionManager;
+
+        public BindingsElementDriver(
+            IBindingManager bindingManager, 
+            IContentDefinitionManager contentDefinitionManager) {
+
+            _bindingManager = bindingManager;
+            _contentDefinitionManager = contentDefinitionManager;
+        }
+
+        protected override EditorResult OnBuildEditor(FormElement element, ElementEditorContext context) {
+            var contentType = element.FormBindingContentType;
+            var contentTypeDefinition = !String.IsNullOrWhiteSpace(contentType) ? _contentDefinitionManager.GetTypeDefinition(contentType) : default(ContentTypeDefinition);
+
+            if (contentTypeDefinition == null)
+                return null;
+
+            var viewModel = new FormBindingSettings {
+                AvailableBindings = _bindingManager.DescribeBindingsFor(contentTypeDefinition).ToArray()
+            };
+
+            if (context.Updater != null) {
+                context.Updater.TryUpdateModel(viewModel, null, null, new[] {"AvailableBindings"});
+            }
+
+            var bindingsEditor = context.ShapeFactory.EditorTemplate(TemplateName: "FormBindings", Model: viewModel);
+
+            bindingsEditor.Metadata.Position = "Bindings:10";
+            
+            return Editor(context, bindingsEditor);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ButtonDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ButtonDriver.cs
new file mode 100644
index 000000000..f6c06b287
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ButtonDriver.cs
@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using Orchard.DynamicForms.Elements;
+using Orchard.Forms.Services;
+using Orchard.Layouts.Framework.Drivers;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class ButtonDriver : FormsElementDriver<Button> {
+        public ButtonDriver(IFormManager formManager) : base(formManager) { }
+
+        protected override IEnumerable<string> FormNames {
+            get { yield return "Button"; }
+        }
+
+        protected override void DescribeForm(DescribeContext context) {
+            context.Form("Button", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "Form",
+                    _ButtonText: shape.Textbox(
+                        Id: "ButtonText",
+                        Name: "ButtonText",
+                        Title: "Text",
+                        Value: "Submit",
+                        Classes: new[] { "text", "medium" },
+                        Description: T("The button text.")));
+
+                return form;
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxDriver.cs
new file mode 100644
index 000000000..0977d8836
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxDriver.cs
@@ -0,0 +1,71 @@
+using Orchard.DynamicForms.Elements;
+using Orchard.Forms.Services;
+using Orchard.Layouts.Framework.Display;
+using Orchard.Layouts.Framework.Drivers;
+using Orchard.Tokens;
+using DescribeContext = Orchard.Forms.Services.DescribeContext;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class CheckboxDriver : FormsElementDriver<CheckBox> {
+        private readonly ITokenizer _tokenizer;
+
+        public CheckboxDriver(IFormManager formManager, ITokenizer tokenizer)
+            : base(formManager) {
+            _tokenizer = tokenizer;
+        }
+
+        protected override EditorResult OnBuildEditor(CheckBox element, ElementEditorContext context) {
+            var autoLabelEditor = BuildForm(context, "AutoLabel");
+            var checkBoxEditor = BuildForm(context, "CheckBox");
+            var checkBoxValidation = BuildForm(context, "CheckBoxValidation", "Validation:10");
+
+            return Editor(context, autoLabelEditor, checkBoxEditor, checkBoxValidation);
+        }
+
+        protected override void DescribeForm(DescribeContext context) {
+            context.Form("CheckBox", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "CheckBox",
+                    _Value: shape.Textbox(
+                        Id: "Value",
+                        Name: "Value",
+                        Title: "Value",
+                        Classes: new[] { "text", "large", "tokenized" },
+                        Description: T("The value of this checkbox.")));
+
+                return form;
+            });
+
+            context.Form("CheckBoxValidation", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "CheckBoxValidation",
+                    _IsRequired: shape.Checkbox(
+                        Id: "IsMandatory",
+                        Name: "IsMandatory",
+                        Title: "Mandatory",
+                        Value: "true",
+                        Description: T("Tick this checkbox to make this check box element mandatory.")),
+                    _CustomValidationMessage: shape.Textbox(
+                        Id: "CustomValidationMessage",
+                        Name: "CustomValidationMessage",
+                        Title: "Custom Validation Message",
+                        Classes: new[] { "text", "large", "tokenized" },
+                        Description: T("Optionally provide a custom validation message.")),
+                    _ShowValidationMessage: shape.Checkbox(
+                        Id: "ShowValidationMessage",
+                        Name: "ShowValidationMessage",
+                        Title: "Show Validation Message",
+                        Value: "true",
+                        Description: T("Autogenerate a validation message when a validation error occurs for the current field. Alternatively, to control the placement of the validation message you can use the ValidationMessage element instead.")));
+
+                return form;
+            });
+        }
+
+        protected override void OnDisplaying(CheckBox element, ElementDisplayContext context) {
+            context.ElementShape.TokenizedValue = _tokenizer.Replace(element.Value, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CommonFormElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CommonFormElementDriver.cs
new file mode 100644
index 000000000..61e709acb
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CommonFormElementDriver.cs
@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+using Orchard.DisplayManagement;
+using Orchard.DynamicForms.Elements;
+using Orchard.Forms.Services;
+using Orchard.Layouts.Framework.Display;
+using Orchard.Layouts.Framework.Drivers;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class CommonFormElementDriver : FormsElementDriver<FormElement> {
+
+        public CommonFormElementDriver(IFormManager formManager, IShapeFactory shapeFactory) : base(formManager) {
+            New = shapeFactory;
+        }
+
+        public override int Priority {
+            get { return 500; }
+        }
+
+        protected override IEnumerable<string> FormNames {
+            get { yield return "CommonFormElement"; }
+        }
+
+        public dynamic New { get; set; }
+
+        protected override void DescribeForm(DescribeContext context) {
+            context.Form("CommonFormElement", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "CommonFormElement",
+                    _Span: shape.Textbox(
+                        Id: "InputName",
+                        Name: "InputName",
+                        Title: "Name",
+                        Classes: new[] { "text", "medium", "tokenized" },
+                        Description: T("The name of this form field.")),
+                    _FormBindingContentType: shape.Hidden(
+                        Id: "FormBindingContentType",
+                        Name: "FormBindingContentType"));
+
+                return form;
+            });
+        }
+
+        protected override void OnDisplaying(FormElement element, ElementDisplayContext context) {
+            context.ElementShape.Metadata.Wrappers.Add("FormElement_Wrapper");
+            context.ElementShape.Child.Add(New.PlaceChildContent(Source: context.ElementShape));
+
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationDriver.cs
new file mode 100644
index 000000000..30b60ab6e
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationDriver.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Mvc;
+using Orchard.DynamicForms.Elements;
+using Orchard.DynamicForms.Helpers;
+using Orchard.Forms.Services;
+using Orchard.Layouts.Framework.Display;
+using Orchard.Layouts.Framework.Drivers;
+using Orchard.Tokens;
+using Orchard.Utility.Extensions;
+using DescribeContext = Orchard.Forms.Services.DescribeContext;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class EnumerationDriver : FormsElementDriver<Enumeration> {
+        private readonly ITokenizer _tokenizer;
+        public EnumerationDriver(IFormManager formManager, ITokenizer tokenizer)
+            : base(formManager) {
+            _tokenizer = tokenizer;
+        }
+
+        protected override IEnumerable<string> FormNames {
+            get {
+                yield return "AutoLabel";
+                yield return "Enumeration";
+            }
+        }
+
+        protected override void DescribeForm(DescribeContext context) {
+            context.Form("Enumeration", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "Enumeration",
+                    _Options: shape.Textarea(
+                        Id: "Options",
+                        Name: "Options",
+                        Title: "Options",
+                        Classes: new[] { "text", "large", "tokenized" },
+                        Description: T("Enter one option per line. To differentiate between an option's text and value, separate the two by a colon. For example: &quot;Option 1:1&quot;")),
+                    _InputType: shape.SelectList(
+                        Id: "InputType",
+                        Name: "InputType",
+                        Title: "Input Type",
+                        Description: T("The control to render when presenting the list of options.")));
+
+                form._InputType.Items.Add(new SelectListItem { Text = T("Select List").Text, Value = "SelectList" });
+                form._InputType.Items.Add(new SelectListItem { Text = T("Multi Select List").Text, Value = "MultiSelectList" });
+                form._InputType.Items.Add(new SelectListItem { Text = T("Radio List").Text, Value = "RadioList" });
+                form._InputType.Items.Add(new SelectListItem { Text = T("Check List").Text, Value = "CheckList" });
+
+                return form;
+            });
+        }
+
+        protected override void OnDisplaying(Enumeration element, ElementDisplayContext context) {
+            var tokenizedOptions = _tokenizer.Replace(element.Options).ToArray();
+            var typeName = element.GetType().Name;
+            var category = element.Category.ToSafeName();
+            var displayType = context.DisplayType;
+
+            context.ElementShape.TokenizedOptions = tokenizedOptions;
+            context.ElementShape.Metadata.Alternates.Add(String.Format("Element__{0}__{1}__{2}", category, typeName, element.InputType));
+            context.ElementShape.Metadata.Alternates.Add(String.Format("Element_{0}__{1}__{2}__{3}", displayType, category, typeName, element.InputType));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/FormDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/FormDriver.cs
new file mode 100644
index 000000000..70dec2977
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/FormDriver.cs
@@ -0,0 +1,154 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Mvc;
+using Orchard.ContentManagement.MetaData;
+using Orchard.ContentManagement.MetaData.Models;
+using Orchard.DynamicForms.Elements;
+using Orchard.DynamicForms.Helpers;
+using Orchard.DynamicForms.Services;
+using Orchard.Forms.Services;
+using Orchard.Layouts.Framework.Display;
+using Orchard.Layouts.Framework.Drivers;
+using Orchard.Layouts.Helpers;
+using Orchard.Layouts.Services;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class FormDriver : FormsElementDriver<Form> {
+        private readonly IContentDefinitionManager _contentDefinitionManager;
+        private readonly IFormService _formService;
+        private readonly ICurrentControllerAccessor _currentControllerAccessor;
+        private readonly ICultureAccessor _cultureAccessor;
+
+        public FormDriver(
+            IFormManager formManager, 
+            IContentDefinitionManager contentDefinitionManager, 
+            IFormService formService, 
+            ICurrentControllerAccessor currentControllerAccessor, 
+            ICultureAccessor cultureAccessor)
+
+            : base(formManager) {
+            _contentDefinitionManager = contentDefinitionManager;
+            _formService = formService;
+            _currentControllerAccessor = currentControllerAccessor;
+            _cultureAccessor = cultureAccessor;
+        }
+
+        protected override IEnumerable<string> FormNames {
+            get { yield return "Form"; }
+        }
+
+        protected override void DescribeForm(DescribeContext context) {
+            context.Form("Form", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "Form",
+                    _FormName: shape.Textbox(
+                        Id: "FormName",
+                        Name: "FormName",
+                        Title: "Name",
+                        Classes: new[] { "text", "medium" },
+                        Description: T("The name of the form.")),
+                    _FormAction: shape.Textbox(
+                        Id: "FormAction",
+                        Name: "FormAction",
+                        Title: "Custom Target URL",
+                        Classes: new[] { "text", "large", "tokenized" },
+                        Description: T("The action of the form. Leave blank to have the form submitted to the default form controller.")),
+                    _FormMethod: shape.SelectList(
+                        Id: "FormMethod",
+                        Name: "FormMethod",
+                        Title: "Method",
+                        Description: T("The method of the form.")),
+                    _EnableClientValidation: shape.Checkbox(
+                        Id: "EnableClientValidation",
+                        Name: "EnableClientValidation",
+                        Title: "Enable Client Validation",
+                        Value: "true",
+                        Description: T("Enables client validation.")),
+                    _StoreSubmission: shape.Checkbox(
+                        Id: "StoreSubmission",
+                        Name: "StoreSubmission",
+                        Title: "Store Submission",
+                        Value: "true",
+                        Description: T("Stores the submitted form into the database.")),
+                    _CreateContent: shape.Checkbox(
+                        Id: "CreateContent",
+                        Name: "CreateContent",
+                        Title: "Create Content",
+                        Value: "true",
+                        Description: T("Check this to create a content item based using the submitted values. You will have to select a Content Type here and bind the form fields to the various parts and fields of the selected Content Type.")),
+                    _ContentType: shape.SelectList(
+                        Id: "CreateContentType",
+                        Name: "CreateContentType",
+                        Title: "Content Type",
+                        Description: T("The Content Type to use when storing the submitted form values as a content item. Note that if you change the content type, you will have to update the form field bindings."),
+                        EnabledBy: "CreateContent"),
+                    _PublicationDraft: shape.Radio(
+                        Id: "Publication-Draft",
+                        Name: "Publication",
+                        Title: "Save As Draft",
+                        Value: "Draft",
+                        Checked: true,
+                        Description: T("Save the created content item as a draft."),
+                        EnabledBy: "CreateContent"),
+                    _PublicationPublish: shape.Radio(
+                        Id: "Publication-Publish",
+                        Name: "Publication",
+                        Title: "Publish",
+                        Value: "Publish",
+                        Description: T("Publish the created content item."),
+                        EnabledBy: "CreateContent"),
+                    _Notification: shape.Textbox(
+                        Id: "Notification",
+                        Name: "Notification",
+                        Title: "Show Notification",
+                        Classes: new[] { "text", "large", "tokenized" },
+                        Description: T("The message to show after the form has been submitted. Leave blank if you don't want to show a message.")),
+                    _RedirectUrl: shape.Textbox(
+                        Id: "RedirectUrl",
+                        Name: "RedirectUrl",
+                        Title: "Redirect URL",
+                        Classes: new[] { "text", "large", "tokenized" },
+                        Description: T("The URL to redirect to after the form has been submitted. Leave blank to stay on the same page. tip: you can use a Workflow to control what happens when this form is submitted.")));
+
+                // FormMethod
+                form._FormMethod.Items.Add(new SelectListItem { Text = "POST", Value = "POST" });
+                form._FormMethod.Items.Add(new SelectListItem { Text = "GET", Value = "GET" });
+
+                // ContentType
+                var contentTypes = _contentDefinitionManager.ListTypeDefinitions().Where(IsCreatableContentType).ToArray();
+                foreach (var contentType in contentTypes.OrderBy(x => x.DisplayName)) {
+                    form._ContentType.Items.Add(new SelectListItem { Text = contentType.DisplayName, Value = contentType.Name });
+                }
+
+                return form;
+            });
+        }
+
+        protected override void OnDisplaying(Form element, ElementDisplayContext context) {
+            var controller = _currentControllerAccessor.CurrentController;
+            var values = controller.FetchPostedValues(element);
+            var modelState = controller.FetchModelState(element);
+
+            if (modelState != null && !modelState.IsValid) {
+                // Read any posted values from the previous request.
+                _formService.ReadElementValues(element, new NameValueCollectionValueProvider(values, _cultureAccessor.CurrentCulture));
+
+                // Add any model validation errors from the previous request.
+                controller.ApplyAnyModelErrors(element, modelState);   
+            }
+
+            // Assign the binding content type to each element within the form element.
+            foreach (var child in element.Elements.Flatten().Where(x => x is FormElement).Cast<FormElement>()) {
+                child.FormBindingContentType = element.CreateContent == true ? element.ContentType : default(string);
+            }
+        }
+
+        private static bool IsCreatableContentType(ContentTypeDefinition contentTypeDefinition) {
+            var blacklist = new[] {"Site", "Layer"};
+
+            return !blacklist.Any(x => contentTypeDefinition.Name == x) && String.IsNullOrEmpty(contentTypeDefinition.Stereotype());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldDriver.cs
new file mode 100644
index 000000000..4471b3621
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldDriver.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using Orchard.DynamicForms.Elements;
+using Orchard.Forms.Services;
+using Orchard.Layouts.Framework.Display;
+using Orchard.Layouts.Framework.Drivers;
+using Orchard.Tokens;
+using DescribeContext = Orchard.Forms.Services.DescribeContext;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class HiddenFieldDriver : FormsElementDriver<HiddenField> {
+        private readonly ITokenizer _tokenizer;
+        public HiddenFieldDriver(IFormManager formManager, ITokenizer tokenizer) : base(formManager) {
+            _tokenizer = tokenizer;
+        }
+
+        protected override IEnumerable<string> FormNames {
+            get { yield return "HiddenField"; }
+        }
+
+        protected override void DescribeForm(DescribeContext context) {
+            context.Form("HiddenField", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "HiddenField",
+                    _Span: shape.Textbox(
+                        Id: "Value",
+                        Name: "Value",
+                        Title: "Value",
+                        Classes: new[] { "text", "medium", "tokenized" },
+                        Description: T("The value of this hidden field.")));
+
+                return form;
+            });
+        }
+
+        protected override void OnDisplaying(HiddenField element, ElementDisplayContext context) {
+            context.ElementShape.TokenizedValue = _tokenizer.Replace(element.Value, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/IpAddressFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/IpAddressFieldDriver.cs
new file mode 100644
index 000000000..33972a89a
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/IpAddressFieldDriver.cs
@@ -0,0 +1,6 @@
+using Orchard.DynamicForms.Elements;
+using Orchard.Layouts.Framework.Drivers;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class IpAddressFieldDriver : ElementDriver<IpAddressField> { }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/LabelDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/LabelDriver.cs
new file mode 100644
index 000000000..59a1b0bce
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/LabelDriver.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using Orchard.DynamicForms.Elements;
+using Orchard.Forms.Services;
+using Orchard.Layouts.Framework.Drivers;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class LabelDriver : FormsElementDriver<Label> {
+        public LabelDriver(IFormManager formManager) : base(formManager) {}
+
+        protected override IEnumerable<string> FormNames {
+            get { yield return "Label"; }
+        }
+
+        protected override void DescribeForm(DescribeContext context) {
+            context.Form("Label", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "Label",
+                    _LabelText: shape.Textbox(
+                        Id: "LabelText",
+                        Name: "LabelText",
+                        Title: "Text",
+                        Classes: new[] { "text", "large" },
+                        Description: T("The label text.")),
+                    _LabelFor: shape.Textbox(
+                        Id: "LabelFor",
+                        Name: "LabelFor",
+                        Title: "For",
+                        Classes: new[] { "text", "large" },
+                        Description: T("The name of the field this label is for.")));
+
+                return form;
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonDriver.cs
new file mode 100644
index 000000000..ff2f536f5
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonDriver.cs
@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using Orchard.DynamicForms.Elements;
+using Orchard.Forms.Services;
+using Orchard.Layouts.Framework.Display;
+using Orchard.Layouts.Framework.Drivers;
+using Orchard.Tokens;
+using DescribeContext = Orchard.Forms.Services.DescribeContext;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class RadioButtonDriver : FormsElementDriver<RadioButton> {
+        private readonly ITokenizer _tokenizer;
+
+        public RadioButtonDriver(IFormManager formManager, ITokenizer tokenizer)
+            : base(formManager) {
+            _tokenizer = tokenizer;
+        }
+
+        protected override IEnumerable<string> FormNames {
+            get {
+                yield return "AutoLabel";
+                yield return "RadioButton";
+            }
+        }
+
+        protected override void DescribeForm(DescribeContext context) {
+            context.Form("RadioButton", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "RadioButton",
+                    Description: T("The label for this radio button."),
+                        _Value: shape.Textbox(
+                        Id: "Value",
+                        Name: "Value",
+                        Title: "Value",
+                        Classes: new[] { "text", "medium", "tokenized" },
+                        Description: T("The value of this radio button.")));
+
+                return form;
+            });
+        }
+
+        protected override void OnDisplaying(RadioButton element, ElementDisplayContext context) {
+            context.ElementShape.TokenizedValue = _tokenizer.Replace(element.Value, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TaxonomyDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TaxonomyDriver.cs
new file mode 100644
index 000000000..a40bcb9d2
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TaxonomyDriver.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Web.Mvc;
+using Orchard.DynamicForms.Elements;
+using Orchard.Environment.Extensions;
+using Orchard.Forms.Services;
+using Orchard.Layouts.Framework.Display;
+using Orchard.Layouts.Framework.Drivers;
+using Orchard.Taxonomies.Models;
+using Orchard.Taxonomies.Services;
+using Orchard.Utility.Extensions;
+using DescribeContext = Orchard.Forms.Services.DescribeContext;
+
+namespace Orchard.DynamicForms.Drivers {
+    [OrchardFeature("Orchard.DynamicForms.Taxonomies")]
+    public class TaxonomyDriver : FormsElementDriver<Taxonomy> {
+        private readonly ITaxonomyService _taxonomyService;
+
+        public TaxonomyDriver(IFormManager formManager, ITaxonomyService taxonomyService)
+            : base(formManager) {
+            _taxonomyService = taxonomyService;
+        }
+
+        protected override IEnumerable<string> FormNames {
+            get {
+                yield return "AutoLabel";
+                yield return "TaxonomyForm";
+            }
+        }
+
+        protected override void DescribeForm(DescribeContext context) {
+            context.Form("TaxonomyForm", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "TaxonomyForm",
+                    _OptionLabel: shape.Textbox(
+                        Id: "OptionLabel",
+                        Name: "OptionLabel",
+                        Title: "Option Label",
+                        Description: T("Optionally specify a label for the first option. If no label is specified, no empty option will be rendered.")),
+                    _Taxonomy: shape.SelectList(
+                        Id: "TaxonomyId",
+                        Name: "TaxonomyId",
+                        Title: "Taxonomy",
+                        Description: T("Select the taxonomy to use as a source for the list.")),
+                    _SortOrder: shape.SelectList(
+                        Id: "SortOrder",
+                        Name: "SortOrder",
+                        Title: "Sort Order",
+                        Description: T("The sort order to use when presenting the term values.")),
+                    _ValueType_TermText: shape.Radio(
+                        Id: "ValueType_TermText",
+                        Name: "ValueType",
+                        Title: "Use Term Name",
+                        Checked: true,
+                        Value: "TermText",
+                        Description: T("Select this option to use the term name as the option value.")),
+                    _ValueType_TermId: shape.Radio(
+                        Id: "ValueType_TermId",
+                        Name: "ValueType",
+                        Title: "Use Term ID",
+                        Checked: false,
+                        Value: "TermId",
+                        Description: T("Select this option to use the term ID as the option value.")),
+                    _InputType: shape.SelectList(
+                        Id: "InputType",
+                        Name: "InputType",
+                        Title: "Input Type",
+                        Description: T("The control to render when presenting the list of options.")));
+
+                // Taxonomy
+                var taxonomies = _taxonomyService.GetTaxonomies();
+                foreach (var taxonomy in taxonomies) {
+                    form._Taxonomy.Items.Add(new SelectListItem { Text = taxonomy.Name, Value = taxonomy.Id.ToString(CultureInfo.InvariantCulture) });
+                }
+
+                // Sort Order
+                form._SortOrder.Items.Add(new SelectListItem { Text = T("None").Text, Value = "" });
+                form._SortOrder.Items.Add(new SelectListItem { Text = T("Ascending").Text, Value = "Asc" });
+                form._SortOrder.Items.Add(new SelectListItem { Text = T("Descending").Text, Value = "Desc" });
+
+                // Input Type
+                form._InputType.Items.Add(new SelectListItem { Text = T("Select List").Text, Value = "SelectList" });
+                form._InputType.Items.Add(new SelectListItem { Text = T("Multi Select List").Text, Value = "MultiSelectList" });
+                form._InputType.Items.Add(new SelectListItem { Text = T("Radio List").Text, Value = "RadioList" });
+                form._InputType.Items.Add(new SelectListItem { Text = T("Check List").Text, Value = "CheckList" });
+
+                return form;
+            });
+        }
+
+        protected override void OnDisplaying(Taxonomy element, ElementDisplayContext context) {
+            var taxonomyId = element.TaxonomyId;
+            var typeName = element.GetType().Name;
+            var category = element.Category.ToSafeName();
+            var displayType = context.DisplayType;
+
+            context.ElementShape.TermOptions = GetTermOptions(element, taxonomyId).ToArray();
+            context.ElementShape.Metadata.Alternates.Add(String.Format("Element__{0}__{1}__{2}", category, typeName, element.InputType));
+            context.ElementShape.Metadata.Alternates.Add(String.Format("Element_{0}__{1}__{2}__{3}", displayType, category, typeName, element.InputType));
+        }
+
+        private IEnumerable<SelectListItem> GetTermOptions(Taxonomy element, int? taxonomyId) {
+            var optionLabel = element.OptionLabel;
+
+            if (!String.IsNullOrWhiteSpace(optionLabel)) {
+                yield return new SelectListItem { Text = optionLabel };
+            }
+
+            if (taxonomyId == null)
+                yield break;
+
+            var terms = _taxonomyService.GetTerms(taxonomyId.Value);
+            var valueAccessor = element.UseTermId ? (Func<TermPart, string>)(x => x.Id.ToString()) : (x => x.Name);
+            var projection = terms.Select(x => new SelectListItem {Text = x.Name, Value = valueAccessor(x)});
+
+            switch (element.SortOrder) {
+                case "Asc":
+                    projection = projection.OrderBy(x => x.Text);
+                    break;
+                case "Desc":
+                    projection = projection.OrderByDescending(x => x.Text);
+                    break;
+            }
+
+            foreach (var item in projection) {
+                yield return item;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaDriver.cs
new file mode 100644
index 000000000..1ac44aefb
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaDriver.cs
@@ -0,0 +1,55 @@
+using System.Collections.Generic;
+using Orchard.DynamicForms.Elements;
+using Orchard.Forms.Services;
+using Orchard.Layouts.Framework.Display;
+using Orchard.Layouts.Framework.Drivers;
+using Orchard.Tokens;
+using DescribeContext = Orchard.Forms.Services.DescribeContext;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class TextAreaDriver : FormsElementDriver<TextArea> {
+        private readonly ITokenizer _tokenizer;
+        public TextAreaDriver(IFormManager formManager, ITokenizer tokenizer) : base(formManager) {
+            _tokenizer = tokenizer;
+        }
+
+        protected override IEnumerable<string> FormNames {
+            get {
+                yield return "AutoLabel";
+                yield return "TextArea";
+            }
+        }
+
+        protected override void DescribeForm(DescribeContext context) {
+            context.Form("TextArea", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "TextArea",
+                    _Value: shape.Textarea(
+                        Id: "Value",
+                        Name: "Value",
+                        Title: "Value",
+                        Classes: new[] { "text", "large", "tokenized" },
+                        Description: T("The value of this text area.")),
+                    _Rows: shape.Textbox(
+                        Id: "Rows",
+                        Name: "Rows",
+                        Title: "Rows",
+                        Classes: new[] { "text", "small" },
+                        Description: T("The number of rows for this text area.")),
+                    _Columns: shape.Textbox(
+                        Id: "Columns",
+                        Name: "Columns",
+                        Title: "Columns",
+                        Classes: new[] { "text", "small" },
+                        Description: T("The number of columns for this text area.")));
+
+                return form;
+            });
+        }
+
+        protected override void OnDisplaying(TextArea element, ElementDisplayContext context) {
+            context.ElementShape.TokenizedValue = _tokenizer.Replace(element.RuntimeValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldDriver.cs
new file mode 100644
index 000000000..fc4e2a3e6
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldDriver.cs
@@ -0,0 +1,81 @@
+using Orchard.DynamicForms.Elements;
+using Orchard.Forms.Services;
+using Orchard.Layouts.Framework.Display;
+using Orchard.Layouts.Framework.Drivers;
+using Orchard.Tokens;
+using DescribeContext = Orchard.Forms.Services.DescribeContext;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class TextFieldDriver : FormsElementDriver<TextField>{
+        private readonly ITokenizer _tokenizer;
+        public TextFieldDriver(IFormManager formManager, ITokenizer tokenizer) : base(formManager) {
+            _tokenizer = tokenizer;
+        }
+
+        protected override EditorResult OnBuildEditor(TextField element, ElementEditorContext context) {
+            var autoLabelEditor = BuildForm(context, "AutoLabel");
+            var textFieldEditor = BuildForm(context, "TextField");
+            var textFieldValidation = BuildForm(context, "TextFieldValidation", "Validation:10");
+
+            return Editor(context, autoLabelEditor, textFieldEditor, textFieldValidation);
+        }
+
+        protected override void DescribeForm(DescribeContext context) {
+            context.Form("TextField", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "TextField",
+                    _Value: shape.Textbox(
+                        Id: "Value",
+                        Name: "Value",
+                        Title: "Value",
+                        Classes: new[] { "text", "medium", "tokenized" },
+                        Description: T("The value of this text field.")));
+
+                return form;
+            });
+
+            context.Form("TextFieldValidation", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "TextFieldValidation",
+                    _IsRequired: shape.Checkbox(
+                        Id: "IsRequired",
+                        Name: "IsRequired",
+                        Title: "Required",
+                        Value: "true",
+                        Description: T("Tick this checkbox to make this text field a required field.")),
+                    _MinimumLength: shape.Textbox(
+                        Id: "MinimumLength",
+                        Name: "MinimumLength",
+                        Title: "Minimum Length",
+                        Classes: new[] { "text", "medium", "tokenized" },
+                        Description: T("The minimum length required.")),
+                    _MaximumLength: shape.Textbox(
+                        Id: "MaximumLength",
+                        Name: "MaximumLength",
+                        Title: "Maximum Length",
+                        Classes: new[] { "text", "medium", "tokenized" },
+                        Description: T("The maximum length allowed.")),
+                    _CustomValidationMessage: shape.Textbox(
+                        Id: "CustomValidationMessage",
+                        Name: "CustomValidationMessage",
+                        Title: "Custom Validation Message",
+                        Classes: new[] { "text", "large", "tokenized" },
+                        Description: T("Optionally provide a custom validation message.")),
+                    _ShowValidationMessage: shape.Checkbox(
+                        Id: "ShowValidationMessage",
+                        Name: "ShowValidationMessage",
+                        Title: "Show Validation Message",
+                        Value: "true",
+                        Description: T("Autogenerate a validation message when a validation error occurs for the current field. Alternatively, to control the placement of the validation message you can use the ValidationMessage element instead.")));
+
+                return form;
+            });
+        }
+
+        protected override void OnDisplaying(TextField element, ElementDisplayContext context) {
+            context.ElementShape.TokenizedValue = _tokenizer.Replace(element.RuntimeValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/UserNameFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/UserNameFieldDriver.cs
new file mode 100644
index 000000000..3257be123
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/UserNameFieldDriver.cs
@@ -0,0 +1,6 @@
+using Orchard.DynamicForms.Elements;
+using Orchard.Layouts.Framework.Drivers;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class UserNameFieldDriver : ElementDriver<UserNameField> { }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ValidationElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ValidationElementDriver.cs
new file mode 100644
index 000000000..01e2918ea
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ValidationElementDriver.cs
@@ -0,0 +1,94 @@
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using Orchard.DynamicForms.Elements;
+//using Orchard.DynamicForms.Helpers;
+//using Orchard.DynamicForms.Services;
+//using Orchard.DynamicForms.Services.Models;
+//using Orchard.DynamicForms.ViewModels;
+//using Orchard.Forms.Services;
+//using Orchard.Layouts.Framework.Display;
+//using Orchard.Layouts.Framework.Drivers;
+//using Orchard.Layouts.Helpers;
+
+//namespace Orchard.DynamicForms.Drivers {
+//    public class ValidationElementDriver : ElementDriver<FormElement> {
+//        private readonly IValidationManager _validationManager;
+//        private readonly IFormManager _formManager;
+
+//        public ValidationElementDriver(IValidationManager validationManager, IFormManager formManager) {
+//            _validationManager = validationManager;
+//            _formManager = formManager;
+//        }
+
+//        protected override EditorResult OnBuildEditor(FormElement element, ElementEditorContext context) {
+//            var validatorNames = element.ValidatorNames.ToArray();
+
+//            var validators = new FieldValidationSettingsViewModel {
+//                Validators = _validationManager.GetValidatorsByNames(validatorNames).Select(x => new FieldValidationSettingViewModel() {
+//                    Name = x.Name,
+//                    SettingsEditor = BuildSettingsEditor(context, x)
+//                }).ToList()
+//            };
+
+//            if (context.Updater != null) {
+//                var viewModel = new FieldValidationSettingsViewModel();
+//                if (context.Updater.TryUpdateModel(viewModel, null, null, null)) {
+//                    if (viewModel.Validators != null) {
+//                        foreach (var validatorModel in viewModel.Validators) {
+//                            var validator = validators.Validators.SingleOrDefault(x => x.Name == validatorModel.Name);
+
+//                            if (validator == null)
+//                                continue;
+
+//                            validator.Enabled = validatorModel.Enabled;
+//                            validator.CustomValidationMessage = validatorModel.CustomValidationMessage;
+//                        }
+//                    }
+//                    validators.ShowValidationMessage = viewModel.ShowValidationMessage;
+//                }
+//            }
+
+//            // Fetch validation descriptors.
+//            foreach (var validator in validators.Validators) {
+//                validator.Descriptor = _validationManager.GetValidatorByName(validator.Name);
+//            }
+
+//            var validatorsEditor = context.ShapeFactory.EditorTemplate(TemplateName: "Validators", Model: validators);
+//            validatorsEditor.Metadata.Position = "Validation:10";
+
+//            return Editor(context, validatorsEditor);
+//        }
+
+//        protected override void OnDisplaying(FormElement element, ElementDisplayContext context) {
+//            if (context.DisplayType == "Design" || element.Form == null)
+//                return;
+
+//            if (element.Form.EnableClientValidation != true) {
+//                context.ElementShape.ClientValidationAttributes = new Dictionary<string, string>();
+//                return;
+//            }
+
+//            var clientAttributes = new Dictionary<string, string> {
+//                {"data-val", "true"}
+//            };
+
+//            foreach (var validatorSetting in element.ValidationSettings.Validators.Enabled()) {
+//                var validatorDescriptor = _validationManager.GetValidatorByName(validatorSetting.Name);
+//                var clientValidationRegistrationContext = new ClientValidationRegistrationContext(element, validatorSetting, validatorDescriptor);
+                
+//                validatorDescriptor.ClientAttributes(clientValidationRegistrationContext);
+//                clientAttributes.Combine(clientValidationRegistrationContext.ClientAttributes);
+//            }
+
+//            context.ElementShape.ClientValidationAttributes = clientAttributes;
+//        }
+
+//        private dynamic BuildSettingsEditor(ElementEditorContext context, ValidatorDescriptor validatorDescriptor) {
+//            if (String.IsNullOrWhiteSpace(validatorDescriptor.SettingsFormName))
+//                return null;
+
+//            return _formManager.Bind(_formManager.Build(validatorDescriptor.SettingsFormName), context.ValueProvider);
+//        }
+//    }
+//}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ValidationMessageDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ValidationMessageDriver.cs
new file mode 100644
index 000000000..9af1123d5
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ValidationMessageDriver.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using Orchard.DynamicForms.Elements;
+using Orchard.Forms.Services;
+using Orchard.Layouts.Framework.Drivers;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class ValidationMessageDriver : FormsElementDriver<ValidationMessage> {
+        public ValidationMessageDriver(IFormManager formManager) : base(formManager) {}
+
+        protected override IEnumerable<string> FormNames {
+            get { yield return "ValidationMessage"; }
+        }
+
+        protected override void DescribeForm(DescribeContext context) {
+            context.Form("ValidationMessage", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "ValidationMessage",
+                    _ValidationMessageFor: shape.Textbox(
+                        Id: "ValidationMessageFor",
+                        Name: "ValidationMessageFor",
+                        Title: "For",
+                        Classes: new[] { "text", "large" },
+                        Description: T("The name of the field this validation message is for.")));
+
+                return form;
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ValidationSummaryDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ValidationSummaryDriver.cs
new file mode 100644
index 000000000..229185838
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ValidationSummaryDriver.cs
@@ -0,0 +1,7 @@
+using Orchard.DynamicForms.Elements;
+using Orchard.Layouts.Framework.Drivers;
+
+namespace Orchard.DynamicForms.Drivers {
+    public class ValidationSummaryDriver : ElementDriver<ValidationSummary> {
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Button.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Button.cs
new file mode 100644
index 000000000..af8f04f35
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Button.cs
@@ -0,0 +1,14 @@
+using Orchard.Layouts.Helpers;
+
+namespace Orchard.DynamicForms.Elements {
+    public class Button : FormElement {
+        public override bool HasEditor {
+            get { return true; }
+        }
+
+        public string Text {
+            get { return State.Get("ButtonText", "Submit"); }
+            set { State["ButtonText"] = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Checkbox.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Checkbox.cs
new file mode 100644
index 000000000..b5d888bdf
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Checkbox.cs
@@ -0,0 +1,9 @@
+using Orchard.DynamicForms.Validators.Settings;
+
+namespace Orchard.DynamicForms.Elements {
+    public class CheckBox : LabeledFormElement {
+        public CheckBoxValidationSettings ValidationSettings {
+            get { return State.GetModel<CheckBoxValidationSettings>(""); }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Enumeration.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Enumeration.cs
new file mode 100644
index 000000000..83ee70fd7
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Enumeration.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Web.Mvc;
+using Orchard.Layouts.Helpers;
+
+namespace Orchard.DynamicForms.Elements {
+    public class Enumeration : LabeledFormElement {
+        private readonly Lazy<IEnumerable<SelectListItem>> _options;
+
+        public Enumeration() {
+            _options = new Lazy<IEnumerable<SelectListItem>>(GetOptions);
+        }
+
+        public IEnumerable<SelectListItem> Options {
+            get { return _options.Value; }
+        }
+
+        public string InputType {
+            get { return State.Get("InputType", "SelectList"); }
+            set { State["InputType"] = value; }
+        }
+
+        private IEnumerable<SelectListItem> GetOptions() {
+            return ParseOptionsText();
+        }
+
+        private IEnumerable<SelectListItem> ParseOptionsText() {
+            var data = State.Get("Options");
+            var lines = Regex.Split(data, @"(?:\r\n|[\r\n])", RegexOptions.Multiline);
+            return lines.Select(ParseLine).Where(x => x != null);
+        }
+
+        private static SelectListItem ParseLine(string line) {
+            if (String.IsNullOrWhiteSpace(line))
+                return null;
+
+            var parts = line.Split(':');
+
+            if (parts.Length == 1) {
+                var value = parts[0].Trim();
+                return new SelectListItem {
+                    Text = value,
+                    Value = value
+                };
+            }
+            else {
+                var text = parts[0].Trim();
+                var value = String.Join(":", parts.Skip(1)).Trim();
+                return new SelectListItem {
+                    Text = text,
+                    Value = value
+                };
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Form.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Form.cs
new file mode 100644
index 000000000..fc1b0393b
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Form.cs
@@ -0,0 +1,60 @@
+using Orchard.Layouts.Elements;
+using Orchard.Layouts.Helpers;
+
+namespace Orchard.DynamicForms.Elements {
+    public class Form : Container {
+        public override string Category {
+            get { return "Form"; }
+        }
+
+        public string Name {
+            get { return State.Get("FormName"); }
+            set { State["FormName"] = value; }
+        }
+
+        public bool? EnableClientValidation {
+            get { return State.Get("EnableClientValidation").ToBoolean(); }
+            set { State["EnableClientValidation"] = value.ToString(); }
+        }
+
+        public string Action {
+            get { return State.Get("FormAction"); }
+            set { State["FormAction"] = value; }
+        }
+
+        public string Method {
+            get { return State.Get("FormMethod"); }
+            set { State["FormMethod"] = value; }
+        }
+
+        public bool? StoreSubmission {
+            get { return State.Get("StoreSubmission").ToBoolean(); }
+            set { State["StoreSubmission"] = value != null ? value.Value.ToString() : null; }
+        }
+
+        public bool? CreateContent {
+            get { return State.Get("CreateContent").ToBoolean(); }
+            set { State["CreateContent"] = value != null ? value.Value.ToString() : null; }
+        }
+
+        public string ContentType {
+            get { return State.Get("CreateContentType"); }
+            set { State["CreateContentType"] = value; }
+        }
+
+        public string Publication {
+            get { return State.Get("Publication"); }
+            set { State["Publication"] = value; }
+        }
+
+        public string Notification {
+            get { return State.Get("Notification"); }
+            set { State["Notification"] = value; }
+        }
+
+        public string RedirectUrl {
+            get { return State.Get("RedirectUrl"); }
+            set { State["RedirectUrl"] = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/FormCategoryProvider.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/FormCategoryProvider.cs
new file mode 100644
index 000000000..3e667d3b4
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/FormCategoryProvider.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using Orchard.Layouts.Framework.Elements;
+using Orchard.Layouts.Framework.Harvesters;
+
+namespace Orchard.DynamicForms.Elements {
+    public class FormCategoryProvider : Component, ICategoryProvider {
+        public IEnumerable<Category> GetCategories() {
+            yield return new Category("Form", T("Form"), T("Contains elements that help building forms."), 10);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/FormElement.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/FormElement.cs
new file mode 100644
index 000000000..cda99d2b5
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/FormElement.cs
@@ -0,0 +1,56 @@
+using System;
+using Orchard.Layouts.Framework.Elements;
+using Orchard.Layouts.Helpers;
+
+namespace Orchard.DynamicForms.Elements {
+    public abstract class FormElement : Element {
+        private Lazy<string> _runtimeValue;
+
+        protected FormElement() {
+            _runtimeValue = new Lazy<string>(() => Value);
+        }
+
+        public override string Category {
+            get { return "Form"; }
+        }
+
+        public override bool HasEditor {
+            get { return true; }
+        }
+
+        public virtual string Name {
+            get { return State.Get("InputName"); }
+        }
+
+        public string Value {
+            get { return State.Get("Value"); }
+        }
+
+        public string RuntimeValue {
+            get { return _runtimeValue.Value; }
+            set { _runtimeValue = new Lazy<string>(() => value); }
+        }
+
+        public string FormBindingContentType {
+            get { return State.Get("FormBindingContentType"); }
+            set { State["FormBindingContentType"] = value; }
+        }
+
+        public Form Form {
+            get {
+                var parent = Container;
+
+                while (parent != null) {
+                    var form = parent as Form;
+
+                    if (form != null)
+                        return form;
+
+                    parent = parent.Container;
+                }
+
+                return null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/HiddenField.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/HiddenField.cs
new file mode 100644
index 000000000..90413a1d1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/HiddenField.cs
@@ -0,0 +1,4 @@
+namespace Orchard.DynamicForms.Elements {
+    public class HiddenField : FormElement {
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/IpAddressField.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/IpAddressField.cs
new file mode 100644
index 000000000..d0da3b67a
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/IpAddressField.cs
@@ -0,0 +1,11 @@
+namespace Orchard.DynamicForms.Elements {
+    public class IpAddressField : FormElement {
+        public override bool HasEditor {
+            get { return false; }
+        }
+
+        public override string Name {
+            get { return "IPAddress"; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Label.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Label.cs
new file mode 100644
index 000000000..cc653318b
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Label.cs
@@ -0,0 +1,24 @@
+using Orchard.Layouts.Framework.Elements;
+using Orchard.Layouts.Helpers;
+
+namespace Orchard.DynamicForms.Elements {
+    public class Label : Element {
+        public override string Category {
+            get { return "Form"; }
+        }
+
+        public override bool HasEditor {
+            get { return true; }
+        }
+
+        public string Text {
+            get { return State.Get("LabelText"); }
+            set { State["LabelText"] = value; }
+        }
+
+        public string For {
+            get { return State.Get("LabelFor"); }
+            set { State["LabelFor"] = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/LabeledFormElement.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/LabeledFormElement.cs
new file mode 100644
index 000000000..8fa0fd047
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/LabeledFormElement.cs
@@ -0,0 +1,15 @@
+using Orchard.Layouts.Helpers;
+
+namespace Orchard.DynamicForms.Elements {
+    public abstract class LabeledFormElement : FormElement {
+        public string Label {
+            get { return State.Get("Label"); }
+            set { State["Label"] = value; }
+        }
+
+        public bool ShowLabel {
+            get { return State.Get("ShowLabel").ToBoolean().GetValueOrDefault(); }
+            set { State["ShowLabel"] = value.ToString(); }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/RadioButton.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/RadioButton.cs
new file mode 100644
index 000000000..a5b5deaa4
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/RadioButton.cs
@@ -0,0 +1,4 @@
+namespace Orchard.DynamicForms.Elements {
+    public class RadioButton : LabeledFormElement {
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Taxonomy.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Taxonomy.cs
new file mode 100644
index 000000000..e721374d5
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/Taxonomy.cs
@@ -0,0 +1,30 @@
+using Orchard.Layouts.Helpers;
+
+namespace Orchard.DynamicForms.Elements {
+    public class Taxonomy : LabeledFormElement {
+        
+        public string InputType {
+            get { return State.Get("InputType", "SelectList"); }
+            set { State["InputType"] = value; }
+        }
+
+        public int? TaxonomyId {
+            get { return State.Get("TaxonomyId").ToInt32(); }
+            set { State["TaxonomyId"] = value.ToString(); }
+        }
+
+        public string SortOrder {
+            get { return State.Get("SortOrder"); }
+            set { State["SortOrder"] = value; }
+        }
+
+        public string OptionLabel {
+            get { return State.Get("OptionLabel"); }
+            set { State["OptionLabel"] = value; }
+        }
+
+        public bool UseTermId {
+            get { return State.Get("ValueType") == "TermId"; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/TextArea.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/TextArea.cs
new file mode 100644
index 000000000..4fbe2c8b1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/TextArea.cs
@@ -0,0 +1,15 @@
+using Orchard.Layouts.Helpers;
+
+namespace Orchard.DynamicForms.Elements {
+    public class TextArea : LabeledFormElement {
+        public int? Rows {
+            get { return State.Get("Rows").ToInt32(); }
+            set { State["Rows"] = value.ToString(); }
+        }
+
+        public int? Columns {
+            get { return State.Get("Columns").ToInt32(); }
+            set { State["Columns"] = value.ToString(); }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/TextField.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/TextField.cs
new file mode 100644
index 000000000..8ad5609f1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/TextField.cs
@@ -0,0 +1,9 @@
+using Orchard.DynamicForms.Validators.Settings;
+
+namespace Orchard.DynamicForms.Elements {
+    public class TextField : LabeledFormElement {
+        public TextFieldValidationSettings ValidationSettings {
+            get { return State.GetModel<TextFieldValidationSettings>(""); }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/UserNameField.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/UserNameField.cs
new file mode 100644
index 000000000..f0a6fbc78
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/UserNameField.cs
@@ -0,0 +1,11 @@
+namespace Orchard.DynamicForms.Elements {
+    public class UserNameField : FormElement {
+        public override bool HasEditor {
+            get { return false; }
+        }
+
+        public override string Name {
+            get { return "UserName"; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/ValidationMessage.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/ValidationMessage.cs
new file mode 100644
index 000000000..6e24ee726
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/ValidationMessage.cs
@@ -0,0 +1,13 @@
+using Orchard.Layouts.Framework.Elements;
+
+namespace Orchard.DynamicForms.Elements {
+    public class ValidationMessage : Element {
+        public override string Category {
+            get { return "Form"; }
+        }
+
+        public override bool HasEditor {
+            get { return true; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/ValidationSummary.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/ValidationSummary.cs
new file mode 100644
index 000000000..70a7f1464
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Elements/ValidationSummary.cs
@@ -0,0 +1,13 @@
+using Orchard.Layouts.Framework.Elements;
+
+namespace Orchard.DynamicForms.Elements {
+    public class ValidationSummary : Element {
+        public override string Category {
+            get { return "Form"; }
+        }
+
+        public override bool HasEditor {
+            get { return false; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Forms/AutoLabelForm.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Forms/AutoLabelForm.cs
new file mode 100644
index 000000000..ae36dca16
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Forms/AutoLabelForm.cs
@@ -0,0 +1,30 @@
+using Orchard.Forms.Services;
+using DescribeContext = Orchard.Forms.Services.DescribeContext;
+
+namespace Orchard.DynamicForms.Forms {
+    public class AutoLabelForm : Component, IFormProvider {
+    
+        public void Describe(DescribeContext context) {
+            context.Form("AutoLabel", factory => {
+                var shape = (dynamic)factory;
+                var form = shape.Fieldset(
+                    Id: "AutoLabel",
+                     _ShowLabel: shape.Checkbox(
+                        Id: "ShowLabel",
+                        Name: "ShowLabel",
+                        Title: "Show Label",
+                        Value: "true",
+                        Description: T("Check this to show a label for this text field.")),
+                    _Label: shape.Textbox(
+                        Id: "Label",
+                        Name: "Label",
+                        Title: "Label",
+                        Classes: new[] { "text", "large", "tokenized" },
+                        Description: T("The label text to render."),
+                        EnabledBy: "ShowLabel"));
+
+                return form;
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/ClientValidationRegistrationCoordinator.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/ClientValidationRegistrationCoordinator.cs
new file mode 100644
index 000000000..eb24394b3
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/ClientValidationRegistrationCoordinator.cs
@@ -0,0 +1,45 @@
+using System.Linq;
+using Orchard.DynamicForms.Elements;
+using Orchard.DynamicForms.Services;
+using Orchard.DynamicForms.Services.Models;
+using Orchard.Layouts.Framework.Display;
+using Orchard.Layouts.Framework.Drivers;
+using Orchard.Layouts.Services;
+
+namespace Orchard.DynamicForms.Handlers {
+    public class ClientValidationRegistrationCoordinator : IFormElementEventHandler, IElementEventHandler {
+        private readonly IFormService _formService;
+        public ClientValidationRegistrationCoordinator(IFormService formService) {
+            _formService = formService;
+        }
+
+        void IFormElementEventHandler.RegisterClientValidation(RegisterClientValidationAttributesEventContext context) {
+            var validators = _formService.GetValidators(context.Element).ToArray();
+
+            foreach (var validator in validators) {
+                validator.RegisterClientValidation(context);
+            }
+        }
+
+        void IElementEventHandler.Displaying(ElementDisplayContext context) {
+            var element = context.Element as FormElement;
+
+            if (element == null)
+                return;
+
+            var registrationContext = new RegisterClientValidationAttributesEventContext { Element = element };
+
+            if (element.Form.EnableClientValidation == true) {    
+                _formService.RegisterClientValidationAttributes(registrationContext);
+            }
+
+            context.ElementShape.ClientValidationAttributes = registrationContext.ClientAttributes;
+        }
+
+        void IFormElementEventHandler.GetElementValue(FormElement element, ReadElementValuesContext context) { }
+        void IElementEventHandler.Creating(ElementCreatingContext context) {}
+        void IElementEventHandler.Created(ElementCreatedContext context) {}
+        void IElementEventHandler.BuildEditor(ElementEditorContext context) {}
+        void IElementEventHandler.UpdateEditor(ElementEditorContext context) {}
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/FormSubmissionCoordinator.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/FormSubmissionCoordinator.cs
new file mode 100644
index 000000000..6506baebe
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/FormSubmissionCoordinator.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using Orchard.ContentManagement;
+using Orchard.DynamicForms.Activities;
+using Orchard.DynamicForms.Services;
+using Orchard.DynamicForms.Services.Models;
+using Orchard.Layouts.Helpers;
+using Orchard.UI.Notify;
+using Orchard.Workflows.Services;
+
+namespace Orchard.DynamicForms.Handlers {
+    public class FormSubmissionCoordinator : FormEventHandlerBase {
+        private readonly INotifier _notifier;
+        private readonly IWorkflowManager _workflowManager;
+
+        public FormSubmissionCoordinator(INotifier notifier, IWorkflowManager workflowManager) {
+            _notifier = notifier;
+            _workflowManager = workflowManager;
+        }
+
+        public override void Validated(FormValidatedEventContext context) {
+            if (!context.ModelState.IsValid)
+                return;
+
+            var form = context.Form;
+            var formName = form.Name;
+            var values = context.Values;
+            var formService = context.FormService;
+
+            // Store the submission.
+            if (form.StoreSubmission == true) {
+                formService.CreateSubmission(formName, values);
+            }
+
+            // Create content item.
+            var contentItem = default(ContentItem);
+            if (form.CreateContent == true && !String.IsNullOrWhiteSpace(form.ContentType)) {
+                contentItem = formService.CreateContentItem(form, context.ValueProvider);
+            }
+
+            // Notifiy.
+            if (!String.IsNullOrWhiteSpace(form.Notification))
+                _notifier.Information(T(form.Notification));
+
+            // Trigger workflow event.
+            var formValuesDictionary = values.ToTokenDictionary();
+            _workflowManager.TriggerEvent(FormSubmittedActivity.EventName, contentItem, () => new Dictionary<string, object>(formValuesDictionary) {
+                {"DynamicForm", form}
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/IpAddressFieldHandler.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/IpAddressFieldHandler.cs
new file mode 100644
index 000000000..c4e757da1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/IpAddressFieldHandler.cs
@@ -0,0 +1,23 @@
+using Orchard.AuditTrail.Services;
+using Orchard.DynamicForms.Elements;
+using Orchard.DynamicForms.Services;
+
+namespace Orchard.DynamicForms.Handlers {
+    public class IpAddressFieldHandler : FormElementEventHandlerBase {
+        private readonly IClientIpAddressProvider _clientIpAddressProvider;
+
+        public IpAddressFieldHandler(IClientIpAddressProvider clientIpAddressProvider) {
+            _clientIpAddressProvider = clientIpAddressProvider;
+        }
+
+        public override void GetElementValue(FormElement element, ReadElementValuesContext context) {
+            var ipAddressField = element as IpAddressField;
+
+            if (ipAddressField == null)
+                return;
+
+            var key = ipAddressField.Name;
+            context.Output[key] = _clientIpAddressProvider.GetClientIpAddress();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/ReadFormValuesHandler.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/ReadFormValuesHandler.cs
new file mode 100644
index 000000000..1f0374bac
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/ReadFormValuesHandler.cs
@@ -0,0 +1,29 @@
+using System;
+using Orchard.DynamicForms.Elements;
+using Orchard.DynamicForms.Services;
+
+namespace Orchard.DynamicForms.Handlers {
+    public class ReadFormValuesHandler : FormElementEventHandlerBase {
+        public override void GetElementValue(FormElement element, ReadElementValuesContext context) {
+
+            if (String.IsNullOrWhiteSpace(element.Name))
+                return;
+
+            var key = element.Name;
+            var valueProviderResult = context.ValueProvider.GetValue(key);
+
+            if (String.IsNullOrWhiteSpace(key) || valueProviderResult == null)
+                return;
+
+            var items = valueProviderResult.RawValue as string[];
+            if (items == null)
+                return;
+
+            foreach (var item in items) {
+                context.Output[key] = item;
+            }
+
+            element.RuntimeValue = String.Join(",", items);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/UserNameFieldHandler.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/UserNameFieldHandler.cs
new file mode 100644
index 000000000..0c3b56902
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/UserNameFieldHandler.cs
@@ -0,0 +1,22 @@
+using Orchard.DynamicForms.Elements;
+using Orchard.DynamicForms.Services;
+
+namespace Orchard.DynamicForms.Handlers {
+    public class UserNameFieldHandler : FormElementEventHandlerBase {
+        private readonly IWorkContextAccessor _wca;
+        public UserNameFieldHandler(IWorkContextAccessor wca) {
+            _wca = wca;
+        }
+
+        public override void GetElementValue(FormElement element, ReadElementValuesContext context) {
+            var userNameField = element as UserNameField;
+
+            if (userNameField == null)
+                return;
+
+            var key = userNameField.Name;
+            var currentUser = _wca.GetContext().CurrentUser;
+            context.Output[key] = currentUser != null ? currentUser.UserName : null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/ValidatorsCoordinator.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/ValidatorsCoordinator.cs
new file mode 100644
index 000000000..6bba0b812
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/ValidatorsCoordinator.cs
@@ -0,0 +1,30 @@
+using Orchard.DynamicForms.Services;
+using Orchard.DynamicForms.Services.Models;
+
+namespace Orchard.DynamicForms.Handlers {
+    public class ValidatorsCoordinator : FormEventHandlerBase {
+        public override void Validating(FormValidatingEventContext context) {
+            var form = context.Form;
+            var values = context.Values;
+            var formService = context.FormService;
+            var formElements = formService.GetFormElements(form);
+            var modelState = context.ModelState;
+
+            // Get the validators for each element and validate its submitted values.
+            foreach (var element in formElements) {
+                var validators = formService.GetValidators(element);
+                var attemptedValue = values[element.Name];
+
+                foreach (var validator in validators) {
+                    var validateContext = new ValidateInputContext {
+                        Element = element,
+                        ModelState = modelState,
+                        AttemptedValue = attemptedValue,
+                        FieldName = element.Name
+                    };
+                    validator.Validate(validateContext);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/ContentTypeDefinitionExtensions.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/ContentTypeDefinitionExtensions.cs
new file mode 100644
index 000000000..979dc695e
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/ContentTypeDefinitionExtensions.cs
@@ -0,0 +1,9 @@
+using Orchard.ContentManagement.MetaData.Models;
+
+namespace Orchard.DynamicForms.Helpers {
+    public static class ContentTypeDefinitionExtensions {
+        public static string Stereotype(this ContentTypeDefinition contentTypeDefinition) {
+            return contentTypeDefinition.Settings.ContainsKey("Stereotype") ? contentTypeDefinition.Settings["Stereotype"] : null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/DataTableExtensions.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/DataTableExtensions.cs
new file mode 100644
index 000000000..18cba17b6
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/DataTableExtensions.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Linq;
+
+namespace Orchard.DynamicForms.Helpers {
+    public static class DataTableExtensions {
+        public static string ToCsv(this DataTable table, string delimiter = ",", bool includeHeader = true) {
+            using (var writer = new StringWriter()) {
+                ToCsv(table, writer, delimiter, includeHeader);
+                return writer.GetStringBuilder().ToString();
+            }
+        }
+
+        public static Stream ToCsv(this DataTable table, Stream output, string delimiter = ",", bool includeHeader = true) {
+            var writer = new StreamWriter(output);
+            ToCsv(table, writer, delimiter, includeHeader);
+            return output;
+        }
+
+        public static TextWriter ToCsv(this DataTable table, TextWriter writer, string delimiter = ",", bool includeHeader = true) {
+            if (includeHeader) {
+                var columnNames = table.Columns.Cast<DataColumn>().Select(column => column.ColumnName);
+                writer.WriteLine(String.Join(",", columnNames));
+            }
+
+            var projection =
+                from DataRow row in table.Rows
+                select row.ItemArray.Select(field => String.Concat("\"", field.ToString().Replace("\"", "\"\""), "\""));
+
+            foreach (var fields in projection) {
+                writer.WriteLine(String.Join(",", fields));
+            }
+
+            writer.Flush();
+            return writer;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/FieldValidatorsExtensions.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/FieldValidatorsExtensions.cs
new file mode 100644
index 000000000..e9c2cc488
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/FieldValidatorsExtensions.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Linq;
+using Orchard.DynamicForms.Services.Models;
+
+namespace Orchard.DynamicForms.Helpers {
+    public static class FieldValidatorsExtensions {
+        public static IEnumerable<FieldValidatorSetting> Enabled(this IEnumerable<FieldValidatorSetting> list) {
+            return list.Where(x => x.Enabled);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/FormControllerExtensions.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/FormControllerExtensions.cs
new file mode 100644
index 000000000..c0c0e6817
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/FormControllerExtensions.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Web.Mvc;
+using Orchard.DynamicForms.Elements;
+
+namespace Orchard.DynamicForms.Helpers {
+    internal static class FormControllerExtensions {
+        internal static void TransferFormSubmission(this Controller controller, Form form, NameValueCollection values) {
+            controller.TempData[String.Format("Form_ModelState_{0}", form.Name)] = controller.ModelState;
+            controller.TempData[String.Format("Form_Values_{0}", form.Name)] = values;
+        }
+
+        internal static ModelStateDictionary FetchModelState(this Controller controller, Form form) {
+            return (ModelStateDictionary)controller.TempData[String.Format("Form_ModelState_{0}", form.Name)];
+        }
+
+        internal static NameValueCollection FetchPostedValues(this Controller controller, Form form) {
+            return (NameValueCollection)controller.TempData[String.Format("Form_Values_{0}", form.Name)] ?? new NameValueCollection();
+        }
+
+        internal static void ApplyAnyModelErrors(this Controller controller, Form form, ModelStateDictionary modelState) {
+            var hasErrors = modelState != null && !modelState.IsValid;
+
+            if (hasErrors) {
+                foreach (var state in modelState) {
+                    if (state.Value.Errors.Any()) {
+                        foreach (var error in state.Value.Errors) {
+                            controller.ModelState.AddModelError(state.Key, error.ErrorMessage);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/NameValueCollectionExtensions.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/NameValueCollectionExtensions.cs
new file mode 100644
index 000000000..cdd14b43d
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/NameValueCollectionExtensions.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Web;
+
+namespace Orchard.DynamicForms.Helpers {
+    public static class NameValueCollectionExtensions {
+        public static string ToQueryString(this NameValueCollection nameValues) {
+            return String.Join("&", (from string name in nameValues select String.Concat(name, "=", HttpUtility.UrlEncode(nameValues[name]))).ToArray());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/StreamExtensions.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/StreamExtensions.cs
new file mode 100644
index 000000000..b7e499797
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/StreamExtensions.cs
@@ -0,0 +1,10 @@
+using System.IO;
+
+namespace Orchard.DynamicForms.Helpers {
+    public static class StreamExtensions {
+        public static T Reset<T>(this T stream) where T:Stream {
+            stream.Position = 0;
+            return stream;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/SubmissionExtensions.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/SubmissionExtensions.cs
new file mode 100644
index 000000000..b7346dbb5
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/SubmissionExtensions.cs
@@ -0,0 +1,11 @@
+using System.Collections.Specialized;
+using System.Web;
+using Orchard.DynamicForms.Models;
+
+namespace Orchard.DynamicForms.Helpers {
+    public static class SubmissionExtensions {
+        public static NameValueCollection ToNameValues(this Submission submission) {
+            return HttpUtility.ParseQueryString(submission.FormData);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/TokenizerExtensions.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/TokenizerExtensions.cs
new file mode 100644
index 000000000..a21beed33
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/TokenizerExtensions.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Mvc;
+using Orchard.Tokens;
+
+namespace Orchard.DynamicForms.Helpers {
+    public static class TokenizerExtensions {
+        public static IEnumerable<SelectListItem> Replace(this ITokenizer tokenizer, IEnumerable<SelectListItem> items) {
+            return items.Select(item => new SelectListItem {
+                Text = tokenizer.Replace(item.Text, null),
+                Value = item.Value,
+                Disabled = item.Disabled,
+                Group = item.Group,
+                Selected = item.Selected
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ImportExport/FormsExportHandler.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ImportExport/FormsExportHandler.cs
new file mode 100644
index 000000000..67412a799
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ImportExport/FormsExportHandler.cs
@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+using Orchard.DynamicForms.Services;
+using Orchard.Environment.Extensions;
+using Orchard.Events;
+
+namespace Orchard.DynamicForms.ImportExport {
+    public interface IExportEventHandler : IEventHandler {
+        void Exporting(dynamic context);
+        void Exported(dynamic context);
+    }
+
+    [OrchardFeature("Orchard.DynamicForms.ImportExport")]
+    public class FormsExportHandler : IExportEventHandler {
+        private readonly IFormService _formService;
+        public FormsExportHandler(IFormService formService) {
+            _formService = formService;
+        }
+
+        public void Exporting(dynamic context) {
+        }
+
+        public void Exported(dynamic context) {
+
+            if (!((IEnumerable<string>)context.ExportOptions.CustomSteps).Contains("Forms")) {
+                return;
+            }
+
+            var submissions = _formService.GetSubmissions().ToArray();
+
+            if (!submissions.Any()) {
+                return;
+            }
+
+            var forms = submissions.GroupBy(x => x.FormName);
+            var root = new XElement("Forms");
+            context.Document.Element("Orchard").Add(root);
+
+            foreach (var form in forms) {
+                root.Add(new XElement("Form",
+                    new XAttribute("Name", form.Key),
+                    new XElement("Submissions", form.Select(submission =>
+                        new XElement("Submission",
+                            new XAttribute("CreatedUtc", submission.CreatedUtc),
+                            new XCData(submission.FormData))))));
+            }
+        }
+    }
+}
+
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ImportExport/FormsExportStep.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ImportExport/FormsExportStep.cs
new file mode 100644
index 000000000..86aa60c4d
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ImportExport/FormsExportStep.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using Orchard.Environment.Extensions;
+using Orchard.Events;
+
+namespace Orchard.DynamicForms.ImportExport {
+    public interface ICustomExportStep : IEventHandler {
+        void Register(IList<string> steps);
+    }
+
+    [OrchardFeature("Orchard.DynamicForms.ImportExport")]
+    public class FormsExportStep : ICustomExportStep {
+        public void Register(IList<string> steps) {
+            steps.Add("Forms");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ImportExport/FormsImportHandler.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ImportExport/FormsImportHandler.cs
new file mode 100644
index 000000000..098a0239d
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ImportExport/FormsImportHandler.cs
@@ -0,0 +1,39 @@
+using System;
+using Orchard.ContentManagement;
+using Orchard.DynamicForms.Models;
+using Orchard.DynamicForms.Services;
+using Orchard.Environment.Extensions;
+using Orchard.Recipes.Models;
+using Orchard.Recipes.Services;
+
+namespace Orchard.DynamicForms.ImportExport {
+    [OrchardFeature("Orchard.DynamicForms.ImportExport")]
+    public class FormsImportHandler : Component, IRecipeHandler {
+        private readonly IFormService _formService;
+        public FormsImportHandler(IFormService formService) {
+            _formService = formService;
+        }
+
+        public void ExecuteRecipeStep(RecipeContext recipeContext) {
+            if (!String.Equals(recipeContext.RecipeStep.Name, "Forms", StringComparison.OrdinalIgnoreCase)) {
+                return;
+            }
+
+            var formsElement = recipeContext.RecipeStep.Step.Elements();
+            foreach (var formElement in formsElement) {
+                var formName = formElement.Attr<string>("Name");
+                var submissionElements = formElement.Element("Submissions").Elements();
+
+                foreach (var submissionElement in submissionElements) {
+                    _formService.CreateSubmission(new Submission {
+                        FormName = formName,
+                        CreatedUtc = submissionElement.Attr<DateTime>("CreatedUtc"),
+                        FormData = submissionElement.Value
+                    });
+                }
+            }
+
+            recipeContext.Executed = true;
+        }
+    }
+}
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Migrations.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Migrations.cs
new file mode 100644
index 000000000..a67c1e8e4
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Migrations.cs
@@ -0,0 +1,62 @@
+using System;
+using Orchard.ContentManagement.MetaData;
+using Orchard.Core.Contents.Extensions;
+using Orchard.Data.Migration;
+
+namespace Orchard.DynamicForms {
+    public class Migrations : DataMigrationImpl {
+        public int Create() {
+            SchemaBuilder.CreateTable("Submission", table => table
+                .Column<int>("Id", c => c.PrimaryKey().Identity())
+                .Column<string>("FormName", c => c.WithLength(128))
+                .Column<string>("FormData", c => c.Unlimited())
+                .Column<DateTime>("CreatedUtc"));
+
+            ContentDefinitionManager.AlterTypeDefinition("Form", type => type
+                .WithPart("CommonPart", p => p
+                    .WithSetting("OwnerEditorSettings.ShowOwnerEditor", "false")
+                    .WithSetting("DateEditorSettings.ShowDateEditor", "false"))
+                .WithPart("TitlePart")
+                 .WithPart("AutoroutePart", builder => builder
+                    .WithSetting("AutorouteSettings.AllowCustomPattern", "True")
+                    .WithSetting("AutorouteSettings.AutomaticAdjustmentOnEdit", "False")
+                    .WithSetting("AutorouteSettings.PatternDefinitions", "[{\"Name\":\"Title\",\"Pattern\":\"{Content.Slug}\",\"Description\":\"my-form\"}]")
+                    .WithSetting("AutorouteSettings.DefaultPatternIndex", "0"))
+                .WithPart("LayoutPart", p => p
+                    .WithSetting("LayoutTypePartSettings.DefaultLayoutState", 
+                    "{" +
+                        "\"elements\": [{" +
+                            "\"typeName\": \"Orchard.DynamicForms.Elements.Form\"," +
+                            "\"elements\": [{" +
+                                "\"typeName\": \"Orchard.DynamicForms.Elements.Button\"," +
+                                "\"state\": \"ButtonText=Submit\"" +
+                            "}]" +
+                        "}]" +
+                    "}"))
+                .DisplayedAs("Form")
+                .Listable()
+                .Creatable()
+                .Draftable());
+
+            ContentDefinitionManager.AlterTypeDefinition("FormWidget", type => type
+                .WithPart("CommonPart", p => p
+                    .WithSetting("OwnerEditorSettings.ShowOwnerEditor", "false")
+                    .WithSetting("DateEditorSettings.ShowDateEditor", "false"))
+                .WithPart("WidgetPart")
+                .WithPart("LayoutPart", p => p
+                    .WithSetting("LayoutTypePartSettings.DefaultLayoutState",
+                    "{" +
+                        "\"elements\": [{" +
+                            "\"typeName\": \"Orchard.DynamicForms.Elements.Form\"," +
+                            "\"elements\": [{" +
+                                "\"typeName\": \"Orchard.DynamicForms.Elements.Button\"," +
+                                "\"state\": \"ButtonText=Submit\"" +
+                            "}]" +
+                        "}]" +
+                    "}"))
+                .WithSetting("Stereotype", "Widget")
+                .DisplayedAs("Form Widget"));
+            return 1;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Models/Submission.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Models/Submission.cs
new file mode 100644
index 000000000..ac5114315
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Models/Submission.cs
@@ -0,0 +1,13 @@
+using System;
+using Orchard.Data.Conventions;
+
+namespace Orchard.DynamicForms.Models {
+    public class Submission {
+        public virtual int Id { get; set; }
+        public virtual string FormName { get; set; }
+
+        [StringLengthMax]
+        public virtual string FormData { get; set; }
+        public virtual DateTime CreatedUtc { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt b/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt
new file mode 100644
index 000000000..cb6375b72
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt
@@ -0,0 +1,23 @@
+Name: Custom Forms
+AntiForgery: enabled
+Author: The Orchard Team
+Website: http://orchardcustomforms.codeplex.com
+Version: 1.8.1
+OrchardVersion: 1.8
+Description: Create custom forms like contact forms using layouts.
+Features:
+    Orchard.DynamicForms:
+        Name: Dynamic Forms
+        Description: Create custom forms like contact forms using layouts.
+        Category: Forms
+        Dependencies: Orchard.Layouts, Orchard.Tokens, Orchard.Workflows, Orchard.Users, Orchard.AuditTrail, Common
+    Orchard.DynamicForms.Taxonomies:
+        Name: Taxonomy Element
+        Description: Adds a Taxonomy foem element to the sytem.
+        Category: Forms
+        Dependencies: Orchard.DynamicForms, Orchard.Taxonomies
+    Orchard.DynamicForms.ImportExport:
+        Name: Dynamic Forms Import Export
+        Description: Enables the import and export of form submissions.
+        Category: Forms
+        Dependencies: Orchard.DynamicForms, Orchard.ImportExport
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj b/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
new file mode 100644
index 000000000..7b675cea2
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{82190F52-2901-46D6-8A4C-34649959483F}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Orchard.DynamicForms</RootNamespace>
+    <AssemblyName>Orchard.DynamicForms</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <MvcBuildViews>false</MvcBuildViews>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+    <UseIISExpress>false</UseIISExpress>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.ComponentModel.DataAnnotations">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Abstractions" />
+    <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\jquery.validate.js" />
+    <Content Include="Scripts\jquery.validate.min.js" />
+    <Content Include="Scripts\jquery.validate.unobtrusive.additional.js" />
+    <Content Include="Scripts\jquery.validate.unobtrusive.js" />
+    <Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
+    <Content Include="Styles\form-elements.css" />
+    <Content Include="Styles\forms-admin.css" />
+    <Content Include="Styles\form.designer.css" />
+    <Content Include="Styles\menu.dynamicforms-admin.css" />
+    <Content Include="Styles\menu.dynamicforms.png" />
+    <Content Include="Web.config" />
+    <Content Include="Scripts\Web.config" />
+    <Content Include="Styles\Web.config" />
+    <Content Include="Properties\AssemblyInfo.cs" />
+    <Content Include="Module.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
+      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
+      <Name>Orchard.Framework</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
+      <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
+      <Name>Orchard.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.AuditTrail\Orchard.AuditTrail.csproj">
+      <Project>{3dd574cd-9c5d-4a45-85e1-ebba64c22b5f}</Project>
+      <Name>Orchard.AuditTrail</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Forms\Orchard.Forms.csproj">
+      <Project>{642a49d7-8752-4177-80d6-bfbbcfad3de0}</Project>
+      <Name>Orchard.Forms</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Layouts\Orchard.Layouts.csproj">
+      <Project>{6bd8b2fa-f2e3-4ac8-a4c3-2925a653889a}</Project>
+      <Name>Orchard.Layouts</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Taxonomies\Orchard.Taxonomies.csproj">
+      <Project>{e649ea64-d213-461b-87f7-d67035801443}</Project>
+      <Name>Orchard.Taxonomies</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Tokens\Orchard.Tokens.csproj">
+      <Project>{6f759635-13d7-4e94-bcc9-80445d63f117}</Project>
+      <Name>Orchard.Tokens</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Users\Orchard.Users.csproj">
+      <Project>{79aed36e-abd0-4747-93d3-8722b042454b}</Project>
+      <Name>Orchard.Users</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Orchard.Workflows\Orchard.Workflows.csproj">
+      <Project>{7059493c-8251-4764-9c1e-2368b8b485bc}</Project>
+      <Name>Orchard.Workflows</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Activities\FormSubmittedActivity.cs" />
+    <Compile Include="Activities\SelectDynamicForms.cs" />
+    <Compile Include="Bindings\TextFieldBindings.cs" />
+    <Compile Include="Bindings\BodyPartBindings.cs" />
+    <Compile Include="Bindings\UserPartBindings.cs" />
+    <Compile Include="Controllers\SubmissionAdminController.cs" />
+    <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="Controllers\FormController.cs" />
+    <Compile Include="Drivers\ValidationMessageDriver.cs" />
+    <Compile Include="Drivers\ValidationSummaryDriver.cs" />
+    <Compile Include="Elements\ValidationMessage.cs" />
+    <Compile Include="Elements\ValidationSummary.cs" />
+    <Compile Include="Handlers\ClientValidationRegistrationCoordinator.cs" />
+    <Compile Include="Handlers\ValidatorsCoordinator.cs" />
+    <Compile Include="Handlers\FormSubmissionCoordinator.cs" />
+    <Compile Include="Helpers\FormControllerExtensions.cs" />
+    <Compile Include="Helpers\FieldValidatorsExtensions.cs" />
+    <Compile Include="Services\ElementValidator.cs" />
+    <Compile Include="Services\FormEventHandlerBase.cs" />
+    <Compile Include="Services\ITempDataAccessor.cs" />
+    <Compile Include="Services\IElementValidator.cs" />
+    <Compile Include="Services\Models\RegisterClientValidationAttributesEventContext.cs" />
+    <Compile Include="Validators\CheckBoxValidator.cs" />
+    <Compile Include="Validators\Settings\CheckBoxValidationSettings.cs" />
+    <Compile Include="Validators\Settings\TextFieldValidationSettings.cs" />
+    <Compile Include="Validators\Settings\ValidationSettingsBase.cs" />
+    <Compile Include="Services\Models\FormEventContext.cs" />
+    <Compile Include="Drivers\ValidationElementDriver.cs" />
+    <Compile Include="Drivers\BindingsElementDriver.cs" />
+    <Compile Include="Drivers\TaxonomyDriver.cs" />
+    <Compile Include="Drivers\HiddenFieldDriver.cs" />
+    <Compile Include="Drivers\CheckboxDriver.cs" />
+    <Compile Include="Drivers\TextAreaDriver.cs" />
+    <Compile Include="Drivers\RadioButtonDriver.cs" />
+    <Compile Include="Drivers\EnumerationDriver.cs" />
+    <Compile Include="Drivers\UserNameFieldDriver.cs" />
+    <Compile Include="Elements\LabeledFormElement.cs" />
+    <Compile Include="Elements\Taxonomy.cs" />
+    <Compile Include="Elements\HiddenField.cs" />
+    <Compile Include="Elements\Checkbox.cs" />
+    <Compile Include="Elements\RadioButton.cs" />
+    <Compile Include="Elements\TextArea.cs" />
+    <Compile Include="Elements\Enumeration.cs" />
+    <Compile Include="Elements\UserNameField.cs" />
+    <Compile Include="Forms\AutoLabelForm.cs" />
+    <Compile Include="Handlers\UserNameFieldHandler.cs" />
+    <Compile Include="Helpers\StreamExtensions.cs" />
+    <Compile Include="Helpers\DataTableExtensions.cs" />
+    <Compile Include="Helpers\TokenizerExtensions.cs" />
+    <Compile Include="ImportExport\FormsExportStep.cs" />
+    <Compile Include="ImportExport\FormsExportHandler.cs" />
+    <Compile Include="ImportExport\FormsImportHandler.cs" />
+    <Compile Include="Services\IFormEventHandler.cs" />
+    <Compile Include="Services\Models\FieldValidatorDescriptor.cs" />
+    <Compile Include="Services\Models\FormSubmittedEventContext.cs" />
+    <Compile Include="Services\Models\FormValidatedEventContext.cs" />
+    <Compile Include="Services\Models\FormValidatingEventContext.cs" />
+    <Compile Include="Services\Models\BindingDescriptor.cs" />
+    <Compile Include="Services\Models\ContentFieldBindingDescriptor.cs" />
+    <Compile Include="Services\Models\ContentPartBindingDescriptor.cs" />
+    <Compile Include="Services\Models\ValidateInputContext.cs" />
+    <Compile Include="Validators\TextFieldValidator.cs" />
+    <Compile Include="ViewModels\FieldValidationSettings.cs" />
+    <Compile Include="ViewModels\FormBindingSettings.cs" />
+    <Compile Include="Helpers\ContentTypeDefinitionExtensions.cs" />
+    <Compile Include="Services\BindingManager.cs" />
+    <Compile Include="Services\IBindingManager.cs" />
+    <Compile Include="Services\IBindingProvider.cs" />
+    <Compile Include="Services\Models\BindingDescribeContext.cs" />
+    <Compile Include="Services\Models\BindingContext.cs" />
+    <Compile Include="Bindings\TitlePartBindings.cs" />
+    <Compile Include="ViewModels\BindingSettings.cs" />
+    <Compile Include="ViewModels\FieldBindingSettings.cs" />
+    <Compile Include="ViewModels\PartBindingSettings.cs" />
+    <Compile Include="ViewModels\BlueprintsIndexViewModel.cs" />
+    <Compile Include="ViewModels\SubmissionViewModel.cs" />
+    <Compile Include="ViewModels\SubmissionsIndexViewModel.cs" />
+    <Compile Include="Helpers\SubmissionExtensions.cs" />
+    <Compile Include="ViewModels\FormsIndexViewModel.cs" />
+    <Compile Include="Drivers\CommonFormElementDriver.cs" />
+    <Compile Include="Drivers\FormDriver.cs" />
+    <Compile Include="Drivers\ButtonDriver.cs" />
+    <Compile Include="Drivers\IpAddressFieldDriver.cs" />
+    <Compile Include="Elements\IpAddressField.cs" />
+    <Compile Include="Handlers\IpAddressFieldHandler.cs" />
+    <Compile Include="AdminMenu.cs" />
+    <Compile Include="Migrations.cs" />
+    <Compile Include="Handlers\ReadFormValuesHandler.cs" />
+    <Compile Include="Services\FormElementEventHandlerBase.cs" />
+    <Compile Include="Helpers\NameValueCollectionExtensions.cs" />
+    <Compile Include="Models\Submission.cs" />
+    <Compile Include="Permissions.cs" />
+    <Compile Include="Services\FormService.cs" />
+    <Compile Include="Services\IFormElementEventHandler.cs" />
+    <Compile Include="Services\IFormService.cs" />
+    <Compile Include="Drivers\LabelDriver.cs" />
+    <Compile Include="Drivers\TextFieldDriver.cs" />
+    <Compile Include="Elements\FormCategoryProvider.cs" />
+    <Compile Include="Elements\FormElement.cs" />
+    <Compile Include="Elements\Form.cs" />
+    <Compile Include="Elements\Button.cs" />
+    <Compile Include="Elements\Label.cs" />
+    <Compile Include="Elements\TextField.cs" />
+    <Compile Include="Services\ReadElementValuesContext.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\SubmissionAdmin\Index.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-TextField.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-Button.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-Label.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-TextField.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-IpAddressField.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-IpAddressField.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Admin\Index.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\SubmissionAdmin\Details.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\EditorTemplates\FormBindings.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-UserNameField.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-UserNameField.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-HiddenField.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-HiddenField.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-TextArea.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-TextArea.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-RadioButton.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-RadioButton.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-Checkbox.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-Checkbox.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-Enumeration-SelectList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-Enumeration-MultiSelectList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-Enumeration-RadioList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-Enumeration-CheckList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-Taxonomy-SelectList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-Taxonomy-RadioList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-Taxonomy-MultiSelectList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-Taxonomy-CheckList.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Activity-DynamicFormSubmitted.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\BlueprintAdmin\Index.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-ValidationSummary.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-ValidationSummary.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-ValidationMessage.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Element-Form-ValidationMessage.Design.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\FormElement.Wrapper.cshtml" />
+  </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target> -->
+  <Target Name="AfterBuild" DependsOnTargets="AfterBuildCompiler">
+    <PropertyGroup>
+      <AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
+    </PropertyGroup>
+    <!-- If this is an area child project, uncomment the following line:
+    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
+    -->
+    <!-- If this is an area parent project, uncomment the following lines:
+    <CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
+    <CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
+    -->
+  </Target>
+  <Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
+    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
+  </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>45979</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>True</UseCustomServer>
+          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Permissions.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Permissions.cs
new file mode 100644
index 000000000..9c9992e10
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Permissions.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using Orchard.DynamicForms.Elements;
+using Orchard.Environment.Extensions.Models;
+using Orchard.Security.Permissions;
+
+namespace Orchard.DynamicForms {
+    public class Permissions : IPermissionProvider {
+        private static readonly Permission SubmitAnyForm = new Permission { Description = "Submit any forms", Name = "Submit" };
+        private static readonly Permission SubmitForm = new Permission { Description = "Submit {0} forms", Name = "Submit_{0}", ImpliedBy = new[] { SubmitAnyForm } };
+        public static readonly Permission ManageForms = new Permission { Description = "Manage custom forms", Name = "ManageForms" };
+
+        public virtual Feature Feature { get; set; }
+
+        public IEnumerable<Permission> GetPermissions() {
+            yield return SubmitAnyForm;
+            yield return ManageForms;
+        }
+
+        public IEnumerable<PermissionStereotype> GetDefaultStereotypes() {
+            return new[] {
+                new PermissionStereotype {
+                    Name = "Administrator",
+                    Permissions = new[] { SubmitAnyForm, ManageForms }
+                },
+                new PermissionStereotype {
+                    Name = "Editor",
+                    Permissions = new[] { SubmitAnyForm }
+                },
+                new PermissionStereotype {
+                    Name = "Moderator",
+                    Permissions = new[] { SubmitAnyForm }
+                },
+                new PermissionStereotype {
+                    Name = "Author",
+                    Permissions = new[] { SubmitAnyForm }
+                },
+                new PermissionStereotype {
+                    Name = "Contributor",
+                    Permissions = new[] { SubmitAnyForm }
+                }
+            };
+        }
+
+        /// <summary>
+        /// Generates a permission dynamically for a content type
+        /// </summary>
+        public static Permission CreateSubmitPermission(Form form) {
+            return new Permission {
+                Name = String.Format(SubmitForm.Name, form.Name),
+                Description = String.Format(SubmitForm.Description, form.Name),
+                Category = "Dynamic Forms",
+                ImpliedBy = new [] { SubmitForm }
+            };
+        }
+    }
+}
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..a991834db
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Properties/AssemblyInfo.cs
@@ -0,0 +1,37 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Security;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Orchard.DynamicForms")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyProduct("Orchard")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("13b1e976-66ef-432f-8e2d-11328c28ca52")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Web.config b/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Web.config
new file mode 100644
index 000000000..817198995
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Web.config
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.js b/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.js
new file mode 100644
index 000000000..d0a9bc973
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.js
@@ -0,0 +1,1245 @@
+/* NUGET: BEGIN LICENSE TEXT
+ *
+ * Microsoft grants you the right to use these script files for the sole
+ * purpose of either: (i) interacting through your browser with the Microsoft
+ * website or online service, subject to the applicable licensing or use
+ * terms; or (ii) using the files as included with a Microsoft product subject
+ * to that product's license terms. Microsoft reserves all other rights to the
+ * files not expressly granted by Microsoft, whether by implication, estoppel
+ * or otherwise. Insofar as a script file is dual licensed under GPL,
+ * Microsoft neither took the code under GPL nor distributes it thereunder but
+ * under the terms set out in this paragraph. All notices and licenses
+ * below are for informational purposes only.
+ *
+ * NUGET: END LICENSE TEXT */
+/*!
+ * jQuery Validation Plugin 1.11.1
+ *
+ * http://bassistance.de/jquery-plugins/jquery-plugin-validation/
+ * http://docs.jquery.com/Plugins/Validation
+ *
+ * Copyright 2013 Jörn Zaefferer
+ * Released under the MIT license:
+ *   http://www.opensource.org/licenses/mit-license.php
+ */
+
+(function($) {
+
+$.extend($.fn, {
+	// http://docs.jquery.com/Plugins/Validation/validate
+	validate: function( options ) {
+
+		// if nothing is selected, return nothing; can't chain anyway
+		if ( !this.length ) {
+			if ( options && options.debug && window.console ) {
+				console.warn( "Nothing selected, can't validate, returning nothing." );
+			}
+			return;
+		}
+
+		// check if a validator for this form was already created
+		var validator = $.data( this[0], "validator" );
+		if ( validator ) {
+			return validator;
+		}
+
+		// Add novalidate tag if HTML5.
+		this.attr( "novalidate", "novalidate" );
+
+		validator = new $.validator( options, this[0] );
+		$.data( this[0], "validator", validator );
+
+		if ( validator.settings.onsubmit ) {
+
+			this.validateDelegate( ":submit", "click", function( event ) {
+				if ( validator.settings.submitHandler ) {
+					validator.submitButton = event.target;
+				}
+				// allow suppressing validation by adding a cancel class to the submit button
+				if ( $(event.target).hasClass("cancel") ) {
+					validator.cancelSubmit = true;
+				}
+
+				// allow suppressing validation by adding the html5 formnovalidate attribute to the submit button
+				if ( $(event.target).attr("formnovalidate") !== undefined ) {
+					validator.cancelSubmit = true;
+				}
+			});
+
+			// validate the form on submit
+			this.submit( function( event ) {
+				if ( validator.settings.debug ) {
+					// prevent form submit to be able to see console output
+					event.preventDefault();
+				}
+				function handle() {
+					var hidden;
+					if ( validator.settings.submitHandler ) {
+						if ( validator.submitButton ) {
+							// insert a hidden input as a replacement for the missing submit button
+							hidden = $("<input type='hidden'/>").attr("name", validator.submitButton.name).val( $(validator.submitButton).val() ).appendTo(validator.currentForm);
+						}
+						validator.settings.submitHandler.call( validator, validator.currentForm, event );
+						if ( validator.submitButton ) {
+							// and clean up afterwards; thanks to no-block-scope, hidden can be referenced
+							hidden.remove();
+						}
+						return false;
+					}
+					return true;
+				}
+
+				// prevent submit for invalid forms or custom submit handlers
+				if ( validator.cancelSubmit ) {
+					validator.cancelSubmit = false;
+					return handle();
+				}
+				if ( validator.form() ) {
+					if ( validator.pendingRequest ) {
+						validator.formSubmitted = true;
+						return false;
+					}
+					return handle();
+				} else {
+					validator.focusInvalid();
+					return false;
+				}
+			});
+		}
+
+		return validator;
+	},
+	// http://docs.jquery.com/Plugins/Validation/valid
+	valid: function() {
+		if ( $(this[0]).is("form")) {
+			return this.validate().form();
+		} else {
+			var valid = true;
+			var validator = $(this[0].form).validate();
+			this.each(function() {
+				valid = valid && validator.element(this);
+			});
+			return valid;
+		}
+	},
+	// attributes: space seperated list of attributes to retrieve and remove
+	removeAttrs: function( attributes ) {
+		var result = {},
+			$element = this;
+		$.each(attributes.split(/\s/), function( index, value ) {
+			result[value] = $element.attr(value);
+			$element.removeAttr(value);
+		});
+		return result;
+	},
+	// http://docs.jquery.com/Plugins/Validation/rules
+	rules: function( command, argument ) {
+		var element = this[0];
+
+		if ( command ) {
+			var settings = $.data(element.form, "validator").settings;
+			var staticRules = settings.rules;
+			var existingRules = $.validator.staticRules(element);
+			switch(command) {
+			case "add":
+				$.extend(existingRules, $.validator.normalizeRule(argument));
+				// remove messages from rules, but allow them to be set separetely
+				delete existingRules.messages;
+				staticRules[element.name] = existingRules;
+				if ( argument.messages ) {
+					settings.messages[element.name] = $.extend( settings.messages[element.name], argument.messages );
+				}
+				break;
+			case "remove":
+				if ( !argument ) {
+					delete staticRules[element.name];
+					return existingRules;
+				}
+				var filtered = {};
+				$.each(argument.split(/\s/), function( index, method ) {
+					filtered[method] = existingRules[method];
+					delete existingRules[method];
+				});
+				return filtered;
+			}
+		}
+
+		var data = $.validator.normalizeRules(
+		$.extend(
+			{},
+			$.validator.classRules(element),
+			$.validator.attributeRules(element),
+			$.validator.dataRules(element),
+			$.validator.staticRules(element)
+		), element);
+
+		// make sure required is at front
+		if ( data.required ) {
+			var param = data.required;
+			delete data.required;
+			data = $.extend({required: param}, data);
+		}
+
+		return data;
+	}
+});
+
+// Custom selectors
+$.extend($.expr[":"], {
+	// http://docs.jquery.com/Plugins/Validation/blank
+	blank: function( a ) { return !$.trim("" + $(a).val()); },
+	// http://docs.jquery.com/Plugins/Validation/filled
+	filled: function( a ) { return !!$.trim("" + $(a).val()); },
+	// http://docs.jquery.com/Plugins/Validation/unchecked
+	unchecked: function( a ) { return !$(a).prop("checked"); }
+});
+
+// constructor for validator
+$.validator = function( options, form ) {
+	this.settings = $.extend( true, {}, $.validator.defaults, options );
+	this.currentForm = form;
+	this.init();
+};
+
+$.validator.format = function( source, params ) {
+	if ( arguments.length === 1 ) {
+		return function() {
+			var args = $.makeArray(arguments);
+			args.unshift(source);
+			return $.validator.format.apply( this, args );
+		};
+	}
+	if ( arguments.length > 2 && params.constructor !== Array  ) {
+		params = $.makeArray(arguments).slice(1);
+	}
+	if ( params.constructor !== Array ) {
+		params = [ params ];
+	}
+	$.each(params, function( i, n ) {
+		source = source.replace( new RegExp("\\{" + i + "\\}", "g"), function() {
+			return n;
+		});
+	});
+	return source;
+};
+
+$.extend($.validator, {
+
+	defaults: {
+		messages: {},
+		groups: {},
+		rules: {},
+		errorClass: "error",
+		validClass: "valid",
+		errorElement: "label",
+		focusInvalid: true,
+		errorContainer: $([]),
+		errorLabelContainer: $([]),
+		onsubmit: true,
+		ignore: ":hidden",
+		ignoreTitle: false,
+		onfocusin: function( element, event ) {
+			this.lastActive = element;
+
+			// hide error label and remove error class on focus if enabled
+			if ( this.settings.focusCleanup && !this.blockFocusCleanup ) {
+				if ( this.settings.unhighlight ) {
+					this.settings.unhighlight.call( this, element, this.settings.errorClass, this.settings.validClass );
+				}
+				this.addWrapper(this.errorsFor(element)).hide();
+			}
+		},
+		onfocusout: function( element, event ) {
+			if ( !this.checkable(element) && (element.name in this.submitted || !this.optional(element)) ) {
+				this.element(element);
+			}
+		},
+		onkeyup: function( element, event ) {
+			if ( event.which === 9 && this.elementValue(element) === "" ) {
+				return;
+			} else if ( element.name in this.submitted || element === this.lastElement ) {
+				this.element(element);
+			}
+		},
+		onclick: function( element, event ) {
+			// click on selects, radiobuttons and checkboxes
+			if ( element.name in this.submitted ) {
+				this.element(element);
+			}
+			// or option elements, check parent select in that case
+			else if ( element.parentNode.name in this.submitted ) {
+				this.element(element.parentNode);
+			}
+		},
+		highlight: function( element, errorClass, validClass ) {
+			if ( element.type === "radio" ) {
+				this.findByName(element.name).addClass(errorClass).removeClass(validClass);
+			} else {
+				$(element).addClass(errorClass).removeClass(validClass);
+			}
+		},
+		unhighlight: function( element, errorClass, validClass ) {
+			if ( element.type === "radio" ) {
+				this.findByName(element.name).removeClass(errorClass).addClass(validClass);
+			} else {
+				$(element).removeClass(errorClass).addClass(validClass);
+			}
+		}
+	},
+
+	// http://docs.jquery.com/Plugins/Validation/Validator/setDefaults
+	setDefaults: function( settings ) {
+		$.extend( $.validator.defaults, settings );
+	},
+
+	messages: {
+		required: "This field is required.",
+		remote: "Please fix this field.",
+		email: "Please enter a valid email address.",
+		url: "Please enter a valid URL.",
+		date: "Please enter a valid date.",
+		dateISO: "Please enter a valid date (ISO).",
+		number: "Please enter a valid number.",
+		digits: "Please enter only digits.",
+		creditcard: "Please enter a valid credit card number.",
+		equalTo: "Please enter the same value again.",
+		maxlength: $.validator.format("Please enter no more than {0} characters."),
+		minlength: $.validator.format("Please enter at least {0} characters."),
+		rangelength: $.validator.format("Please enter a value between {0} and {1} characters long."),
+		range: $.validator.format("Please enter a value between {0} and {1}."),
+		max: $.validator.format("Please enter a value less than or equal to {0}."),
+		min: $.validator.format("Please enter a value greater than or equal to {0}.")
+	},
+
+	autoCreateRanges: false,
+
+	prototype: {
+
+		init: function() {
+			this.labelContainer = $(this.settings.errorLabelContainer);
+			this.errorContext = this.labelContainer.length && this.labelContainer || $(this.currentForm);
+			this.containers = $(this.settings.errorContainer).add( this.settings.errorLabelContainer );
+			this.submitted = {};
+			this.valueCache = {};
+			this.pendingRequest = 0;
+			this.pending = {};
+			this.invalid = {};
+			this.reset();
+
+			var groups = (this.groups = {});
+			$.each(this.settings.groups, function( key, value ) {
+				if ( typeof value === "string" ) {
+					value = value.split(/\s/);
+				}
+				$.each(value, function( index, name ) {
+					groups[name] = key;
+				});
+			});
+			var rules = this.settings.rules;
+			$.each(rules, function( key, value ) {
+				rules[key] = $.validator.normalizeRule(value);
+			});
+
+			function delegate(event) {
+				var validator = $.data(this[0].form, "validator"),
+					eventType = "on" + event.type.replace(/^validate/, "");
+				if ( validator.settings[eventType] ) {
+					validator.settings[eventType].call(validator, this[0], event);
+				}
+			}
+			$(this.currentForm)
+				.validateDelegate(":text, [type='password'], [type='file'], select, textarea, " +
+					"[type='number'], [type='search'] ,[type='tel'], [type='url'], " +
+					"[type='email'], [type='datetime'], [type='date'], [type='month'], " +
+					"[type='week'], [type='time'], [type='datetime-local'], " +
+					"[type='range'], [type='color'] ",
+					"focusin focusout keyup", delegate)
+				.validateDelegate("[type='radio'], [type='checkbox'], select, option", "click", delegate);
+
+			if ( this.settings.invalidHandler ) {
+				$(this.currentForm).bind("invalid-form.validate", this.settings.invalidHandler);
+			}
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Validator/form
+		form: function() {
+			this.checkForm();
+			$.extend(this.submitted, this.errorMap);
+			this.invalid = $.extend({}, this.errorMap);
+			if ( !this.valid() ) {
+				$(this.currentForm).triggerHandler("invalid-form", [this]);
+			}
+			this.showErrors();
+			return this.valid();
+		},
+
+		checkForm: function() {
+			this.prepareForm();
+			for ( var i = 0, elements = (this.currentElements = this.elements()); elements[i]; i++ ) {
+				this.check( elements[i] );
+			}
+			return this.valid();
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Validator/element
+		element: function( element ) {
+			element = this.validationTargetFor( this.clean( element ) );
+			this.lastElement = element;
+			this.prepareElement( element );
+			this.currentElements = $(element);
+			var result = this.check( element ) !== false;
+			if ( result ) {
+				delete this.invalid[element.name];
+			} else {
+				this.invalid[element.name] = true;
+			}
+			if ( !this.numberOfInvalids() ) {
+				// Hide error containers on last error
+				this.toHide = this.toHide.add( this.containers );
+			}
+			this.showErrors();
+			return result;
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Validator/showErrors
+		showErrors: function( errors ) {
+			if ( errors ) {
+				// add items to error list and map
+				$.extend( this.errorMap, errors );
+				this.errorList = [];
+				for ( var name in errors ) {
+					this.errorList.push({
+						message: errors[name],
+						element: this.findByName(name)[0]
+					});
+				}
+				// remove items from success list
+				this.successList = $.grep( this.successList, function( element ) {
+					return !(element.name in errors);
+				});
+			}
+			if ( this.settings.showErrors ) {
+				this.settings.showErrors.call( this, this.errorMap, this.errorList );
+			} else {
+				this.defaultShowErrors();
+			}
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Validator/resetForm
+		resetForm: function() {
+			if ( $.fn.resetForm ) {
+				$(this.currentForm).resetForm();
+			}
+			this.submitted = {};
+			this.lastElement = null;
+			this.prepareForm();
+			this.hideErrors();
+			this.elements().removeClass( this.settings.errorClass ).removeData( "previousValue" );
+		},
+
+		numberOfInvalids: function() {
+			return this.objectLength(this.invalid);
+		},
+
+		objectLength: function( obj ) {
+			var count = 0;
+			for ( var i in obj ) {
+				count++;
+			}
+			return count;
+		},
+
+		hideErrors: function() {
+			this.addWrapper( this.toHide ).hide();
+		},
+
+		valid: function() {
+			return this.size() === 0;
+		},
+
+		size: function() {
+			return this.errorList.length;
+		},
+
+		focusInvalid: function() {
+			if ( this.settings.focusInvalid ) {
+				try {
+					$(this.findLastActive() || this.errorList.length && this.errorList[0].element || [])
+					.filter(":visible")
+					.focus()
+					// manually trigger focusin event; without it, focusin handler isn't called, findLastActive won't have anything to find
+					.trigger("focusin");
+				} catch(e) {
+					// ignore IE throwing errors when focusing hidden elements
+				}
+			}
+		},
+
+		findLastActive: function() {
+			var lastActive = this.lastActive;
+			return lastActive && $.grep(this.errorList, function( n ) {
+				return n.element.name === lastActive.name;
+			}).length === 1 && lastActive;
+		},
+
+		elements: function() {
+			var validator = this,
+				rulesCache = {};
+
+			// select all valid inputs inside the form (no submit or reset buttons)
+			return $(this.currentForm)
+			.find("input, select, textarea")
+			.not(":submit, :reset, :image, [disabled]")
+			.not( this.settings.ignore )
+			.filter(function() {
+				if ( !this.name && validator.settings.debug && window.console ) {
+					console.error( "%o has no name assigned", this);
+				}
+
+				// select only the first element for each name, and only those with rules specified
+				if ( this.name in rulesCache || !validator.objectLength($(this).rules()) ) {
+					return false;
+				}
+
+				rulesCache[this.name] = true;
+				return true;
+			});
+		},
+
+		clean: function( selector ) {
+			return $(selector)[0];
+		},
+
+		errors: function() {
+			var errorClass = this.settings.errorClass.replace(" ", ".");
+			return $(this.settings.errorElement + "." + errorClass, this.errorContext);
+		},
+
+		reset: function() {
+			this.successList = [];
+			this.errorList = [];
+			this.errorMap = {};
+			this.toShow = $([]);
+			this.toHide = $([]);
+			this.currentElements = $([]);
+		},
+
+		prepareForm: function() {
+			this.reset();
+			this.toHide = this.errors().add( this.containers );
+		},
+
+		prepareElement: function( element ) {
+			this.reset();
+			this.toHide = this.errorsFor(element);
+		},
+
+		elementValue: function( element ) {
+			var type = $(element).attr("type"),
+				val = $(element).val();
+
+			if ( type === "radio" || type === "checkbox" ) {
+				return $("input[name='" + $(element).attr("name") + "']:checked").val();
+			}
+
+			if ( typeof val === "string" ) {
+				return val.replace(/\r/g, "");
+			}
+			return val;
+		},
+
+		check: function( element ) {
+			element = this.validationTargetFor( this.clean( element ) );
+
+			var rules = $(element).rules();
+			var dependencyMismatch = false;
+			var val = this.elementValue(element);
+			var result;
+
+			for (var method in rules ) {
+				var rule = { method: method, parameters: rules[method] };
+				try {
+
+					result = $.validator.methods[method].call( this, val, element, rule.parameters );
+
+					// if a method indicates that the field is optional and therefore valid,
+					// don't mark it as valid when there are no other rules
+					if ( result === "dependency-mismatch" ) {
+						dependencyMismatch = true;
+						continue;
+					}
+					dependencyMismatch = false;
+
+					if ( result === "pending" ) {
+						this.toHide = this.toHide.not( this.errorsFor(element) );
+						return;
+					}
+
+					if ( !result ) {
+						this.formatAndAdd( element, rule );
+						return false;
+					}
+				} catch(e) {
+					if ( this.settings.debug && window.console ) {
+						console.log( "Exception occurred when checking element " + element.id + ", check the '" + rule.method + "' method.", e );
+					}
+					throw e;
+				}
+			}
+			if ( dependencyMismatch ) {
+				return;
+			}
+			if ( this.objectLength(rules) ) {
+				this.successList.push(element);
+			}
+			return true;
+		},
+
+		// return the custom message for the given element and validation method
+		// specified in the element's HTML5 data attribute
+		customDataMessage: function( element, method ) {
+			return $(element).data("msg-" + method.toLowerCase()) || (element.attributes && $(element).attr("data-msg-" + method.toLowerCase()));
+		},
+
+		// return the custom message for the given element name and validation method
+		customMessage: function( name, method ) {
+			var m = this.settings.messages[name];
+			return m && (m.constructor === String ? m : m[method]);
+		},
+
+		// return the first defined argument, allowing empty strings
+		findDefined: function() {
+			for(var i = 0; i < arguments.length; i++) {
+				if ( arguments[i] !== undefined ) {
+					return arguments[i];
+				}
+			}
+			return undefined;
+		},
+
+		defaultMessage: function( element, method ) {
+			return this.findDefined(
+				this.customMessage( element.name, method ),
+				this.customDataMessage( element, method ),
+				// title is never undefined, so handle empty string as undefined
+				!this.settings.ignoreTitle && element.title || undefined,
+				$.validator.messages[method],
+				"<strong>Warning: No message defined for " + element.name + "</strong>"
+			);
+		},
+
+		formatAndAdd: function( element, rule ) {
+			var message = this.defaultMessage( element, rule.method ),
+				theregex = /\$?\{(\d+)\}/g;
+			if ( typeof message === "function" ) {
+				message = message.call(this, rule.parameters, element);
+			} else if (theregex.test(message)) {
+				message = $.validator.format(message.replace(theregex, "{$1}"), rule.parameters);
+			}
+			this.errorList.push({
+				message: message,
+				element: element
+			});
+
+			this.errorMap[element.name] = message;
+			this.submitted[element.name] = message;
+		},
+
+		addWrapper: function( toToggle ) {
+			if ( this.settings.wrapper ) {
+				toToggle = toToggle.add( toToggle.parent( this.settings.wrapper ) );
+			}
+			return toToggle;
+		},
+
+		defaultShowErrors: function() {
+			var i, elements;
+			for ( i = 0; this.errorList[i]; i++ ) {
+				var error = this.errorList[i];
+				if ( this.settings.highlight ) {
+					this.settings.highlight.call( this, error.element, this.settings.errorClass, this.settings.validClass );
+				}
+				this.showLabel( error.element, error.message );
+			}
+			if ( this.errorList.length ) {
+				this.toShow = this.toShow.add( this.containers );
+			}
+			if ( this.settings.success ) {
+				for ( i = 0; this.successList[i]; i++ ) {
+					this.showLabel( this.successList[i] );
+				}
+			}
+			if ( this.settings.unhighlight ) {
+				for ( i = 0, elements = this.validElements(); elements[i]; i++ ) {
+					this.settings.unhighlight.call( this, elements[i], this.settings.errorClass, this.settings.validClass );
+				}
+			}
+			this.toHide = this.toHide.not( this.toShow );
+			this.hideErrors();
+			this.addWrapper( this.toShow ).show();
+		},
+
+		validElements: function() {
+			return this.currentElements.not(this.invalidElements());
+		},
+
+		invalidElements: function() {
+			return $(this.errorList).map(function() {
+				return this.element;
+			});
+		},
+
+		showLabel: function( element, message ) {
+			var label = this.errorsFor( element );
+			if ( label.length ) {
+				// refresh error/success class
+				label.removeClass( this.settings.validClass ).addClass( this.settings.errorClass );
+				// replace message on existing label
+				label.html(message);
+			} else {
+				// create label
+				label = $("<" + this.settings.errorElement + ">")
+					.attr("for", this.idOrName(element))
+					.addClass(this.settings.errorClass)
+					.html(message || "");
+				if ( this.settings.wrapper ) {
+					// make sure the element is visible, even in IE
+					// actually showing the wrapped element is handled elsewhere
+					label = label.hide().show().wrap("<" + this.settings.wrapper + "/>").parent();
+				}
+				if ( !this.labelContainer.append(label).length ) {
+					if ( this.settings.errorPlacement ) {
+						this.settings.errorPlacement(label, $(element) );
+					} else {
+						label.insertAfter(element);
+					}
+				}
+			}
+			if ( !message && this.settings.success ) {
+				label.text("");
+				if ( typeof this.settings.success === "string" ) {
+					label.addClass( this.settings.success );
+				} else {
+					this.settings.success( label, element );
+				}
+			}
+			this.toShow = this.toShow.add(label);
+		},
+
+		errorsFor: function( element ) {
+			var name = this.idOrName(element);
+			return this.errors().filter(function() {
+				return $(this).attr("for") === name;
+			});
+		},
+
+		idOrName: function( element ) {
+			return this.groups[element.name] || (this.checkable(element) ? element.name : element.id || element.name);
+		},
+
+		validationTargetFor: function( element ) {
+			// if radio/checkbox, validate first element in group instead
+			if ( this.checkable(element) ) {
+				element = this.findByName( element.name ).not(this.settings.ignore)[0];
+			}
+			return element;
+		},
+
+		checkable: function( element ) {
+			return (/radio|checkbox/i).test(element.type);
+		},
+
+		findByName: function( name ) {
+			return $(this.currentForm).find("[name='" + name + "']");
+		},
+
+		getLength: function( value, element ) {
+			switch( element.nodeName.toLowerCase() ) {
+			case "select":
+				return $("option:selected", element).length;
+			case "input":
+				if ( this.checkable( element) ) {
+					return this.findByName(element.name).filter(":checked").length;
+				}
+			}
+			return value.length;
+		},
+
+		depend: function( param, element ) {
+			return this.dependTypes[typeof param] ? this.dependTypes[typeof param](param, element) : true;
+		},
+
+		dependTypes: {
+			"boolean": function( param, element ) {
+				return param;
+			},
+			"string": function( param, element ) {
+				return !!$(param, element.form).length;
+			},
+			"function": function( param, element ) {
+				return param(element);
+			}
+		},
+
+		optional: function( element ) {
+			var val = this.elementValue(element);
+			return !$.validator.methods.required.call(this, val, element) && "dependency-mismatch";
+		},
+
+		startRequest: function( element ) {
+			if ( !this.pending[element.name] ) {
+				this.pendingRequest++;
+				this.pending[element.name] = true;
+			}
+		},
+
+		stopRequest: function( element, valid ) {
+			this.pendingRequest--;
+			// sometimes synchronization fails, make sure pendingRequest is never < 0
+			if ( this.pendingRequest < 0 ) {
+				this.pendingRequest = 0;
+			}
+			delete this.pending[element.name];
+			if ( valid && this.pendingRequest === 0 && this.formSubmitted && this.form() ) {
+				$(this.currentForm).submit();
+				this.formSubmitted = false;
+			} else if (!valid && this.pendingRequest === 0 && this.formSubmitted) {
+				$(this.currentForm).triggerHandler("invalid-form", [this]);
+				this.formSubmitted = false;
+			}
+		},
+
+		previousValue: function( element ) {
+			return $.data(element, "previousValue") || $.data(element, "previousValue", {
+				old: null,
+				valid: true,
+				message: this.defaultMessage( element, "remote" )
+			});
+		}
+
+	},
+
+	classRuleSettings: {
+		required: {required: true},
+		email: {email: true},
+		url: {url: true},
+		date: {date: true},
+		dateISO: {dateISO: true},
+		number: {number: true},
+		digits: {digits: true},
+		creditcard: {creditcard: true}
+	},
+
+	addClassRules: function( className, rules ) {
+		if ( className.constructor === String ) {
+			this.classRuleSettings[className] = rules;
+		} else {
+			$.extend(this.classRuleSettings, className);
+		}
+	},
+
+	classRules: function( element ) {
+		var rules = {};
+		var classes = $(element).attr("class");
+		if ( classes ) {
+			$.each(classes.split(" "), function() {
+				if ( this in $.validator.classRuleSettings ) {
+					$.extend(rules, $.validator.classRuleSettings[this]);
+				}
+			});
+		}
+		return rules;
+	},
+
+	attributeRules: function( element ) {
+		var rules = {};
+		var $element = $(element);
+		var type = $element[0].getAttribute("type");
+
+		for (var method in $.validator.methods) {
+			var value;
+
+			// support for <input required> in both html5 and older browsers
+			if ( method === "required" ) {
+				value = $element.get(0).getAttribute(method);
+				// Some browsers return an empty string for the required attribute
+				// and non-HTML5 browsers might have required="" markup
+				if ( value === "" ) {
+					value = true;
+				}
+				// force non-HTML5 browsers to return bool
+				value = !!value;
+			} else {
+				value = $element.attr(method);
+			}
+
+			// convert the value to a number for number inputs, and for text for backwards compability
+			// allows type="date" and others to be compared as strings
+			if ( /min|max/.test( method ) && ( type === null || /number|range|text/.test( type ) ) ) {
+				value = Number(value);
+			}
+
+			if ( value ) {
+				rules[method] = value;
+			} else if ( type === method && type !== 'range' ) {
+				// exception: the jquery validate 'range' method
+				// does not test for the html5 'range' type
+				rules[method] = true;
+			}
+		}
+
+		// maxlength may be returned as -1, 2147483647 (IE) and 524288 (safari) for text inputs
+		if ( rules.maxlength && /-1|2147483647|524288/.test(rules.maxlength) ) {
+			delete rules.maxlength;
+		}
+
+		return rules;
+	},
+
+	dataRules: function( element ) {
+		var method, value,
+			rules = {}, $element = $(element);
+		for (method in $.validator.methods) {
+			value = $element.data("rule-" + method.toLowerCase());
+			if ( value !== undefined ) {
+				rules[method] = value;
+			}
+		}
+		return rules;
+	},
+
+	staticRules: function( element ) {
+		var rules = {};
+		var validator = $.data(element.form, "validator");
+		if ( validator.settings.rules ) {
+			rules = $.validator.normalizeRule(validator.settings.rules[element.name]) || {};
+		}
+		return rules;
+	},
+
+	normalizeRules: function( rules, element ) {
+		// handle dependency check
+		$.each(rules, function( prop, val ) {
+			// ignore rule when param is explicitly false, eg. required:false
+			if ( val === false ) {
+				delete rules[prop];
+				return;
+			}
+			if ( val.param || val.depends ) {
+				var keepRule = true;
+				switch (typeof val.depends) {
+				case "string":
+					keepRule = !!$(val.depends, element.form).length;
+					break;
+				case "function":
+					keepRule = val.depends.call(element, element);
+					break;
+				}
+				if ( keepRule ) {
+					rules[prop] = val.param !== undefined ? val.param : true;
+				} else {
+					delete rules[prop];
+				}
+			}
+		});
+
+		// evaluate parameters
+		$.each(rules, function( rule, parameter ) {
+			rules[rule] = $.isFunction(parameter) ? parameter(element) : parameter;
+		});
+
+		// clean number parameters
+		$.each(['minlength', 'maxlength'], function() {
+			if ( rules[this] ) {
+				rules[this] = Number(rules[this]);
+			}
+		});
+		$.each(['rangelength', 'range'], function() {
+			var parts;
+			if ( rules[this] ) {
+				if ( $.isArray(rules[this]) ) {
+					rules[this] = [Number(rules[this][0]), Number(rules[this][1])];
+				} else if ( typeof rules[this] === "string" ) {
+					parts = rules[this].split(/[\s,]+/);
+					rules[this] = [Number(parts[0]), Number(parts[1])];
+				}
+			}
+		});
+
+		if ( $.validator.autoCreateRanges ) {
+			// auto-create ranges
+			if ( rules.min && rules.max ) {
+				rules.range = [rules.min, rules.max];
+				delete rules.min;
+				delete rules.max;
+			}
+			if ( rules.minlength && rules.maxlength ) {
+				rules.rangelength = [rules.minlength, rules.maxlength];
+				delete rules.minlength;
+				delete rules.maxlength;
+			}
+		}
+
+		return rules;
+	},
+
+	// Converts a simple string to a {string: true} rule, e.g., "required" to {required:true}
+	normalizeRule: function( data ) {
+		if ( typeof data === "string" ) {
+			var transformed = {};
+			$.each(data.split(/\s/), function() {
+				transformed[this] = true;
+			});
+			data = transformed;
+		}
+		return data;
+	},
+
+	// http://docs.jquery.com/Plugins/Validation/Validator/addMethod
+	addMethod: function( name, method, message ) {
+		$.validator.methods[name] = method;
+		$.validator.messages[name] = message !== undefined ? message : $.validator.messages[name];
+		if ( method.length < 3 ) {
+			$.validator.addClassRules(name, $.validator.normalizeRule(name));
+		}
+	},
+
+	methods: {
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/required
+		required: function( value, element, param ) {
+			// check if dependency is met
+			if ( !this.depend(param, element) ) {
+				return "dependency-mismatch";
+			}
+			if ( element.nodeName.toLowerCase() === "select" ) {
+				// could be an array for select-multiple or a string, both are fine this way
+				var val = $(element).val();
+				return val && val.length > 0;
+			}
+			if ( this.checkable(element) ) {
+				return this.getLength(value, element) > 0;
+			}
+			return $.trim(value).length > 0;
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/email
+		email: function( value, element ) {
+			// contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/
+			return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i.test(value);
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/url
+		url: function( value, element ) {
+			// contributed by Scott Gonzalez: http://projects.scottsplayground.com/iri/
+			return this.optional(element) || /^(https?|s?ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/date
+		date: function( value, element ) {
+			return this.optional(element) || !/Invalid|NaN/.test(new Date(value).toString());
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/dateISO
+		dateISO: function( value, element ) {
+			return this.optional(element) || /^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/.test(value);
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/number
+		number: function( value, element ) {
+			return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value);
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/digits
+		digits: function( value, element ) {
+			return this.optional(element) || /^\d+$/.test(value);
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/creditcard
+		// based on http://en.wikipedia.org/wiki/Luhn
+		creditcard: function( value, element ) {
+			if ( this.optional(element) ) {
+				return "dependency-mismatch";
+			}
+			// accept only spaces, digits and dashes
+			if ( /[^0-9 \-]+/.test(value) ) {
+				return false;
+			}
+			var nCheck = 0,
+				nDigit = 0,
+				bEven = false;
+
+			value = value.replace(/\D/g, "");
+
+			for (var n = value.length - 1; n >= 0; n--) {
+				var cDigit = value.charAt(n);
+				nDigit = parseInt(cDigit, 10);
+				if ( bEven ) {
+					if ( (nDigit *= 2) > 9 ) {
+						nDigit -= 9;
+					}
+				}
+				nCheck += nDigit;
+				bEven = !bEven;
+			}
+
+			return (nCheck % 10) === 0;
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/minlength
+		minlength: function( value, element, param ) {
+			var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element);
+			return this.optional(element) || length >= param;
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/maxlength
+		maxlength: function( value, element, param ) {
+			var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element);
+			return this.optional(element) || length <= param;
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/rangelength
+		rangelength: function( value, element, param ) {
+			var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element);
+			return this.optional(element) || ( length >= param[0] && length <= param[1] );
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/min
+		min: function( value, element, param ) {
+			return this.optional(element) || value >= param;
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/max
+		max: function( value, element, param ) {
+			return this.optional(element) || value <= param;
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/range
+		range: function( value, element, param ) {
+			return this.optional(element) || ( value >= param[0] && value <= param[1] );
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/equalTo
+		equalTo: function( value, element, param ) {
+			// bind to the blur event of the target in order to revalidate whenever the target field is updated
+			// TODO find a way to bind the event just once, avoiding the unbind-rebind overhead
+			var target = $(param);
+			if ( this.settings.onfocusout ) {
+				target.unbind(".validate-equalTo").bind("blur.validate-equalTo", function() {
+					$(element).valid();
+				});
+			}
+			return value === target.val();
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/remote
+		remote: function( value, element, param ) {
+			if ( this.optional(element) ) {
+				return "dependency-mismatch";
+			}
+
+			var previous = this.previousValue(element);
+			if (!this.settings.messages[element.name] ) {
+				this.settings.messages[element.name] = {};
+			}
+			previous.originalMessage = this.settings.messages[element.name].remote;
+			this.settings.messages[element.name].remote = previous.message;
+
+			param = typeof param === "string" && {url:param} || param;
+
+			if ( previous.old === value ) {
+				return previous.valid;
+			}
+
+			previous.old = value;
+			var validator = this;
+			this.startRequest(element);
+			var data = {};
+			data[element.name] = value;
+			$.ajax($.extend(true, {
+				url: param,
+				mode: "abort",
+				port: "validate" + element.name,
+				dataType: "json",
+				data: data,
+				success: function( response ) {
+					validator.settings.messages[element.name].remote = previous.originalMessage;
+					var valid = response === true || response === "true";
+					if ( valid ) {
+						var submitted = validator.formSubmitted;
+						validator.prepareElement(element);
+						validator.formSubmitted = submitted;
+						validator.successList.push(element);
+						delete validator.invalid[element.name];
+						validator.showErrors();
+					} else {
+						var errors = {};
+						var message = response || validator.defaultMessage( element, "remote" );
+						errors[element.name] = previous.message = $.isFunction(message) ? message(value) : message;
+						validator.invalid[element.name] = true;
+						validator.showErrors(errors);
+					}
+					previous.valid = valid;
+					validator.stopRequest(element, valid);
+				}
+			}, param));
+			return "pending";
+		}
+
+	}
+
+});
+
+// deprecated, use $.validator.format instead
+$.format = $.validator.format;
+
+}(jQuery));
+
+// ajax mode: abort
+// usage: $.ajax({ mode: "abort"[, port: "uniqueport"]});
+// if mode:"abort" is used, the previous request on that port (port can be undefined) is aborted via XMLHttpRequest.abort()
+(function($) {
+	var pendingRequests = {};
+	// Use a prefilter if available (1.5+)
+	if ( $.ajaxPrefilter ) {
+		$.ajaxPrefilter(function( settings, _, xhr ) {
+			var port = settings.port;
+			if ( settings.mode === "abort" ) {
+				if ( pendingRequests[port] ) {
+					pendingRequests[port].abort();
+				}
+				pendingRequests[port] = xhr;
+			}
+		});
+	} else {
+		// Proxy ajax
+		var ajax = $.ajax;
+		$.ajax = function( settings ) {
+			var mode = ( "mode" in settings ? settings : $.ajaxSettings ).mode,
+				port = ( "port" in settings ? settings : $.ajaxSettings ).port;
+			if ( mode === "abort" ) {
+				if ( pendingRequests[port] ) {
+					pendingRequests[port].abort();
+				}
+				pendingRequests[port] = ajax.apply(this, arguments);
+				return pendingRequests[port];
+			}
+			return ajax.apply(this, arguments);
+		};
+	}
+}(jQuery));
+
+// provides delegate(type: String, delegate: Selector, handler: Callback) plugin for easier event delegation
+// handler is only called when $(event.target).is(delegate), in the scope of the jquery-object for event.target
+(function($) {
+	$.extend($.fn, {
+		validateDelegate: function( delegate, type, handler ) {
+			return this.bind(type, function( event ) {
+				var target = $(event.target);
+				if ( target.is(delegate) ) {
+					return handler.apply(target, arguments);
+				}
+			});
+		}
+	});
+}(jQuery));
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.min.js b/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.min.js
new file mode 100644
index 000000000..3efb64822
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.min.js
@@ -0,0 +1,16 @@
+/* NUGET: BEGIN LICENSE TEXT
+ *
+ * Microsoft grants you the right to use these script files for the sole
+ * purpose of either: (i) interacting through your browser with the Microsoft
+ * website or online service, subject to the applicable licensing or use
+ * terms; or (ii) using the files as included with a Microsoft product subject
+ * to that product's license terms. Microsoft reserves all other rights to the
+ * files not expressly granted by Microsoft, whether by implication, estoppel
+ * or otherwise. Insofar as a script file is dual licensed under GPL,
+ * Microsoft neither took the code under GPL nor distributes it thereunder but
+ * under the terms set out in this paragraph. All notices and licenses
+ * below are for informational purposes only.
+ *
+ * NUGET: END LICENSE TEXT */
+/*! jQuery Validation Plugin - v1.11.1 - 3/22/2013\n* https://github.com/jzaefferer/jquery-validation
+* Copyright (c) 2013 Jörn Zaefferer; Licensed MIT */(function(t){t.extend(t.fn,{validate:function(e){if(!this.length)return e&&e.debug&&window.console&&console.warn("Nothing selected, can't validate, returning nothing."),void 0;var i=t.data(this[0],"validator");return i?i:(this.attr("novalidate","novalidate"),i=new t.validator(e,this[0]),t.data(this[0],"validator",i),i.settings.onsubmit&&(this.validateDelegate(":submit","click",function(e){i.settings.submitHandler&&(i.submitButton=e.target),t(e.target).hasClass("cancel")&&(i.cancelSubmit=!0),void 0!==t(e.target).attr("formnovalidate")&&(i.cancelSubmit=!0)}),this.submit(function(e){function s(){var s;return i.settings.submitHandler?(i.submitButton&&(s=t("<input type='hidden'/>").attr("name",i.submitButton.name).val(t(i.submitButton).val()).appendTo(i.currentForm)),i.settings.submitHandler.call(i,i.currentForm,e),i.submitButton&&s.remove(),!1):!0}return i.settings.debug&&e.preventDefault(),i.cancelSubmit?(i.cancelSubmit=!1,s()):i.form()?i.pendingRequest?(i.formSubmitted=!0,!1):s():(i.focusInvalid(),!1)})),i)},valid:function(){if(t(this[0]).is("form"))return this.validate().form();var e=!0,i=t(this[0].form).validate();return this.each(function(){e=e&&i.element(this)}),e},removeAttrs:function(e){var i={},s=this;return t.each(e.split(/\s/),function(t,e){i[e]=s.attr(e),s.removeAttr(e)}),i},rules:function(e,i){var s=this[0];if(e){var r=t.data(s.form,"validator").settings,n=r.rules,a=t.validator.staticRules(s);switch(e){case"add":t.extend(a,t.validator.normalizeRule(i)),delete a.messages,n[s.name]=a,i.messages&&(r.messages[s.name]=t.extend(r.messages[s.name],i.messages));break;case"remove":if(!i)return delete n[s.name],a;var u={};return t.each(i.split(/\s/),function(t,e){u[e]=a[e],delete a[e]}),u}}var o=t.validator.normalizeRules(t.extend({},t.validator.classRules(s),t.validator.attributeRules(s),t.validator.dataRules(s),t.validator.staticRules(s)),s);if(o.required){var l=o.required;delete o.required,o=t.extend({required:l},o)}return o}}),t.extend(t.expr[":"],{blank:function(e){return!t.trim(""+t(e).val())},filled:function(e){return!!t.trim(""+t(e).val())},unchecked:function(e){return!t(e).prop("checked")}}),t.validator=function(e,i){this.settings=t.extend(!0,{},t.validator.defaults,e),this.currentForm=i,this.init()},t.validator.format=function(e,i){return 1===arguments.length?function(){var i=t.makeArray(arguments);return i.unshift(e),t.validator.format.apply(this,i)}:(arguments.length>2&&i.constructor!==Array&&(i=t.makeArray(arguments).slice(1)),i.constructor!==Array&&(i=[i]),t.each(i,function(t,i){e=e.replace(RegExp("\\{"+t+"\\}","g"),function(){return i})}),e)},t.extend(t.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",validClass:"valid",errorElement:"label",focusInvalid:!0,errorContainer:t([]),errorLabelContainer:t([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,onfocusin:function(t){this.lastActive=t,this.settings.focusCleanup&&!this.blockFocusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,t,this.settings.errorClass,this.settings.validClass),this.addWrapper(this.errorsFor(t)).hide())},onfocusout:function(t){this.checkable(t)||!(t.name in this.submitted)&&this.optional(t)||this.element(t)},onkeyup:function(t,e){(9!==e.which||""!==this.elementValue(t))&&(t.name in this.submitted||t===this.lastElement)&&this.element(t)},onclick:function(t){t.name in this.submitted?this.element(t):t.parentNode.name in this.submitted&&this.element(t.parentNode)},highlight:function(e,i,s){"radio"===e.type?this.findByName(e.name).addClass(i).removeClass(s):t(e).addClass(i).removeClass(s)},unhighlight:function(e,i,s){"radio"===e.type?this.findByName(e.name).removeClass(i).addClass(s):t(e).removeClass(i).addClass(s)}},setDefaults:function(e){t.extend(t.validator.defaults,e)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date (ISO).",number:"Please enter a valid number.",digits:"Please enter only digits.",creditcard:"Please enter a valid credit card number.",equalTo:"Please enter the same value again.",maxlength:t.validator.format("Please enter no more than {0} characters."),minlength:t.validator.format("Please enter at least {0} characters."),rangelength:t.validator.format("Please enter a value between {0} and {1} characters long."),range:t.validator.format("Please enter a value between {0} and {1}."),max:t.validator.format("Please enter a value less than or equal to {0}."),min:t.validator.format("Please enter a value greater than or equal to {0}.")},autoCreateRanges:!1,prototype:{init:function(){function e(e){var i=t.data(this[0].form,"validator"),s="on"+e.type.replace(/^validate/,"");i.settings[s]&&i.settings[s].call(i,this[0],e)}this.labelContainer=t(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||t(this.currentForm),this.containers=t(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var i=this.groups={};t.each(this.settings.groups,function(e,s){"string"==typeof s&&(s=s.split(/\s/)),t.each(s,function(t,s){i[s]=e})});var s=this.settings.rules;t.each(s,function(e,i){s[e]=t.validator.normalizeRule(i)}),t(this.currentForm).validateDelegate(":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'] ,[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], [type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'] ","focusin focusout keyup",e).validateDelegate("[type='radio'], [type='checkbox'], select, option","click",e),this.settings.invalidHandler&&t(this.currentForm).bind("invalid-form.validate",this.settings.invalidHandler)},form:function(){return this.checkForm(),t.extend(this.submitted,this.errorMap),this.invalid=t.extend({},this.errorMap),this.valid()||t(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var t=0,e=this.currentElements=this.elements();e[t];t++)this.check(e[t]);return this.valid()},element:function(e){e=this.validationTargetFor(this.clean(e)),this.lastElement=e,this.prepareElement(e),this.currentElements=t(e);var i=this.check(e)!==!1;return i?delete this.invalid[e.name]:this.invalid[e.name]=!0,this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),i},showErrors:function(e){if(e){t.extend(this.errorMap,e),this.errorList=[];for(var i in e)this.errorList.push({message:e[i],element:this.findByName(i)[0]});this.successList=t.grep(this.successList,function(t){return!(t.name in e)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){t.fn.resetForm&&t(this.currentForm).resetForm(),this.submitted={},this.lastElement=null,this.prepareForm(),this.hideErrors(),this.elements().removeClass(this.settings.errorClass).removeData("previousValue")},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(t){var e=0;for(var i in t)e++;return e},hideErrors:function(){this.addWrapper(this.toHide).hide()},valid:function(){return 0===this.size()},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{t(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").focus().trigger("focusin")}catch(e){}},findLastActive:function(){var e=this.lastActive;return e&&1===t.grep(this.errorList,function(t){return t.element.name===e.name}).length&&e},elements:function(){var e=this,i={};return t(this.currentForm).find("input, select, textarea").not(":submit, :reset, :image, [disabled]").not(this.settings.ignore).filter(function(){return!this.name&&e.settings.debug&&window.console&&console.error("%o has no name assigned",this),this.name in i||!e.objectLength(t(this).rules())?!1:(i[this.name]=!0,!0)})},clean:function(e){return t(e)[0]},errors:function(){var e=this.settings.errorClass.replace(" ",".");return t(this.settings.errorElement+"."+e,this.errorContext)},reset:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=t([]),this.toHide=t([]),this.currentElements=t([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(t){this.reset(),this.toHide=this.errorsFor(t)},elementValue:function(e){var i=t(e).attr("type"),s=t(e).val();return"radio"===i||"checkbox"===i?t("input[name='"+t(e).attr("name")+"']:checked").val():"string"==typeof s?s.replace(/\r/g,""):s},check:function(e){e=this.validationTargetFor(this.clean(e));var i,s=t(e).rules(),r=!1,n=this.elementValue(e);for(var a in s){var u={method:a,parameters:s[a]};try{if(i=t.validator.methods[a].call(this,n,e,u.parameters),"dependency-mismatch"===i){r=!0;continue}if(r=!1,"pending"===i)return this.toHide=this.toHide.not(this.errorsFor(e)),void 0;if(!i)return this.formatAndAdd(e,u),!1}catch(o){throw this.settings.debug&&window.console&&console.log("Exception occurred when checking element "+e.id+", check the '"+u.method+"' method.",o),o}}return r?void 0:(this.objectLength(s)&&this.successList.push(e),!0)},customDataMessage:function(e,i){return t(e).data("msg-"+i.toLowerCase())||e.attributes&&t(e).attr("data-msg-"+i.toLowerCase())},customMessage:function(t,e){var i=this.settings.messages[t];return i&&(i.constructor===String?i:i[e])},findDefined:function(){for(var t=0;arguments.length>t;t++)if(void 0!==arguments[t])return arguments[t];return void 0},defaultMessage:function(e,i){return this.findDefined(this.customMessage(e.name,i),this.customDataMessage(e,i),!this.settings.ignoreTitle&&e.title||void 0,t.validator.messages[i],"<strong>Warning: No message defined for "+e.name+"</strong>")},formatAndAdd:function(e,i){var s=this.defaultMessage(e,i.method),r=/\$?\{(\d+)\}/g;"function"==typeof s?s=s.call(this,i.parameters,e):r.test(s)&&(s=t.validator.format(s.replace(r,"{$1}"),i.parameters)),this.errorList.push({message:s,element:e}),this.errorMap[e.name]=s,this.submitted[e.name]=s},addWrapper:function(t){return this.settings.wrapper&&(t=t.add(t.parent(this.settings.wrapper))),t},defaultShowErrors:function(){var t,e;for(t=0;this.errorList[t];t++){var i=this.errorList[t];this.settings.highlight&&this.settings.highlight.call(this,i.element,this.settings.errorClass,this.settings.validClass),this.showLabel(i.element,i.message)}if(this.errorList.length&&(this.toShow=this.toShow.add(this.containers)),this.settings.success)for(t=0;this.successList[t];t++)this.showLabel(this.successList[t]);if(this.settings.unhighlight)for(t=0,e=this.validElements();e[t];t++)this.settings.unhighlight.call(this,e[t],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return t(this.errorList).map(function(){return this.element})},showLabel:function(e,i){var s=this.errorsFor(e);s.length?(s.removeClass(this.settings.validClass).addClass(this.settings.errorClass),s.html(i)):(s=t("<"+this.settings.errorElement+">").attr("for",this.idOrName(e)).addClass(this.settings.errorClass).html(i||""),this.settings.wrapper&&(s=s.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.append(s).length||(this.settings.errorPlacement?this.settings.errorPlacement(s,t(e)):s.insertAfter(e))),!i&&this.settings.success&&(s.text(""),"string"==typeof this.settings.success?s.addClass(this.settings.success):this.settings.success(s,e)),this.toShow=this.toShow.add(s)},errorsFor:function(e){var i=this.idOrName(e);return this.errors().filter(function(){return t(this).attr("for")===i})},idOrName:function(t){return this.groups[t.name]||(this.checkable(t)?t.name:t.id||t.name)},validationTargetFor:function(t){return this.checkable(t)&&(t=this.findByName(t.name).not(this.settings.ignore)[0]),t},checkable:function(t){return/radio|checkbox/i.test(t.type)},findByName:function(e){return t(this.currentForm).find("[name='"+e+"']")},getLength:function(e,i){switch(i.nodeName.toLowerCase()){case"select":return t("option:selected",i).length;case"input":if(this.checkable(i))return this.findByName(i.name).filter(":checked").length}return e.length},depend:function(t,e){return this.dependTypes[typeof t]?this.dependTypes[typeof t](t,e):!0},dependTypes:{"boolean":function(t){return t},string:function(e,i){return!!t(e,i.form).length},"function":function(t,e){return t(e)}},optional:function(e){var i=this.elementValue(e);return!t.validator.methods.required.call(this,i,e)&&"dependency-mismatch"},startRequest:function(t){this.pending[t.name]||(this.pendingRequest++,this.pending[t.name]=!0)},stopRequest:function(e,i){this.pendingRequest--,0>this.pendingRequest&&(this.pendingRequest=0),delete this.pending[e.name],i&&0===this.pendingRequest&&this.formSubmitted&&this.form()?(t(this.currentForm).submit(),this.formSubmitted=!1):!i&&0===this.pendingRequest&&this.formSubmitted&&(t(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},previousValue:function(e){return t.data(e,"previousValue")||t.data(e,"previousValue",{old:null,valid:!0,message:this.defaultMessage(e,"remote")})}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(e,i){e.constructor===String?this.classRuleSettings[e]=i:t.extend(this.classRuleSettings,e)},classRules:function(e){var i={},s=t(e).attr("class");return s&&t.each(s.split(" "),function(){this in t.validator.classRuleSettings&&t.extend(i,t.validator.classRuleSettings[this])}),i},attributeRules:function(e){var i={},s=t(e),r=s[0].getAttribute("type");for(var n in t.validator.methods){var a;"required"===n?(a=s.get(0).getAttribute(n),""===a&&(a=!0),a=!!a):a=s.attr(n),/min|max/.test(n)&&(null===r||/number|range|text/.test(r))&&(a=Number(a)),a?i[n]=a:r===n&&"range"!==r&&(i[n]=!0)}return i.maxlength&&/-1|2147483647|524288/.test(i.maxlength)&&delete i.maxlength,i},dataRules:function(e){var i,s,r={},n=t(e);for(i in t.validator.methods)s=n.data("rule-"+i.toLowerCase()),void 0!==s&&(r[i]=s);return r},staticRules:function(e){var i={},s=t.data(e.form,"validator");return s.settings.rules&&(i=t.validator.normalizeRule(s.settings.rules[e.name])||{}),i},normalizeRules:function(e,i){return t.each(e,function(s,r){if(r===!1)return delete e[s],void 0;if(r.param||r.depends){var n=!0;switch(typeof r.depends){case"string":n=!!t(r.depends,i.form).length;break;case"function":n=r.depends.call(i,i)}n?e[s]=void 0!==r.param?r.param:!0:delete e[s]}}),t.each(e,function(s,r){e[s]=t.isFunction(r)?r(i):r}),t.each(["minlength","maxlength"],function(){e[this]&&(e[this]=Number(e[this]))}),t.each(["rangelength","range"],function(){var i;e[this]&&(t.isArray(e[this])?e[this]=[Number(e[this][0]),Number(e[this][1])]:"string"==typeof e[this]&&(i=e[this].split(/[\s,]+/),e[this]=[Number(i[0]),Number(i[1])]))}),t.validator.autoCreateRanges&&(e.min&&e.max&&(e.range=[e.min,e.max],delete e.min,delete e.max),e.minlength&&e.maxlength&&(e.rangelength=[e.minlength,e.maxlength],delete e.minlength,delete e.maxlength)),e},normalizeRule:function(e){if("string"==typeof e){var i={};t.each(e.split(/\s/),function(){i[this]=!0}),e=i}return e},addMethod:function(e,i,s){t.validator.methods[e]=i,t.validator.messages[e]=void 0!==s?s:t.validator.messages[e],3>i.length&&t.validator.addClassRules(e,t.validator.normalizeRule(e))},methods:{required:function(e,i,s){if(!this.depend(s,i))return"dependency-mismatch";if("select"===i.nodeName.toLowerCase()){var r=t(i).val();return r&&r.length>0}return this.checkable(i)?this.getLength(e,i)>0:t.trim(e).length>0},email:function(t,e){return this.optional(e)||/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i.test(t)},url:function(t,e){return this.optional(e)||/^(https?|s?ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(t)},date:function(t,e){return this.optional(e)||!/Invalid|NaN/.test(""+new Date(t))},dateISO:function(t,e){return this.optional(e)||/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/.test(t)},number:function(t,e){return this.optional(e)||/^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(t)},digits:function(t,e){return this.optional(e)||/^\d+$/.test(t)},creditcard:function(t,e){if(this.optional(e))return"dependency-mismatch";if(/[^0-9 \-]+/.test(t))return!1;var i=0,s=0,r=!1;t=t.replace(/\D/g,"");for(var n=t.length-1;n>=0;n--){var a=t.charAt(n);s=parseInt(a,10),r&&(s*=2)>9&&(s-=9),i+=s,r=!r}return 0===i%10},minlength:function(e,i,s){var r=t.isArray(e)?e.length:this.getLength(t.trim(e),i);return this.optional(i)||r>=s},maxlength:function(e,i,s){var r=t.isArray(e)?e.length:this.getLength(t.trim(e),i);return this.optional(i)||s>=r},rangelength:function(e,i,s){var r=t.isArray(e)?e.length:this.getLength(t.trim(e),i);return this.optional(i)||r>=s[0]&&s[1]>=r},min:function(t,e,i){return this.optional(e)||t>=i},max:function(t,e,i){return this.optional(e)||i>=t},range:function(t,e,i){return this.optional(e)||t>=i[0]&&i[1]>=t},equalTo:function(e,i,s){var r=t(s);return this.settings.onfocusout&&r.unbind(".validate-equalTo").bind("blur.validate-equalTo",function(){t(i).valid()}),e===r.val()},remote:function(e,i,s){if(this.optional(i))return"dependency-mismatch";var r=this.previousValue(i);if(this.settings.messages[i.name]||(this.settings.messages[i.name]={}),r.originalMessage=this.settings.messages[i.name].remote,this.settings.messages[i.name].remote=r.message,s="string"==typeof s&&{url:s}||s,r.old===e)return r.valid;r.old=e;var n=this;this.startRequest(i);var a={};return a[i.name]=e,t.ajax(t.extend(!0,{url:s,mode:"abort",port:"validate"+i.name,dataType:"json",data:a,success:function(s){n.settings.messages[i.name].remote=r.originalMessage;var a=s===!0||"true"===s;if(a){var u=n.formSubmitted;n.prepareElement(i),n.formSubmitted=u,n.successList.push(i),delete n.invalid[i.name],n.showErrors()}else{var o={},l=s||n.defaultMessage(i,"remote");o[i.name]=r.message=t.isFunction(l)?l(e):l,n.invalid[i.name]=!0,n.showErrors(o)}r.valid=a,n.stopRequest(i,a)}},s)),"pending"}}}),t.format=t.validator.format})(jQuery),function(t){var e={};if(t.ajaxPrefilter)t.ajaxPrefilter(function(t,i,s){var r=t.port;"abort"===t.mode&&(e[r]&&e[r].abort(),e[r]=s)});else{var i=t.ajax;t.ajax=function(s){var r=("mode"in s?s:t.ajaxSettings).mode,n=("port"in s?s:t.ajaxSettings).port;return"abort"===r?(e[n]&&e[n].abort(),e[n]=i.apply(this,arguments),e[n]):i.apply(this,arguments)}}}(jQuery),function(t){t.extend(t.fn,{validateDelegate:function(e,i,s){return this.bind(i,function(i){var r=t(i.target);return r.is(e)?s.apply(r,arguments):void 0})}})}(jQuery);
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.unobtrusive.additional.js b/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.unobtrusive.additional.js
new file mode 100644
index 000000000..3ece17f0d
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.unobtrusive.additional.js
@@ -0,0 +1,3 @@
+(function ($) {
+    $.validator.unobtrusive.adapters.addBool("mandatory", "required");
+}(jQuery));
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.unobtrusive.js b/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.unobtrusive.js
new file mode 100644
index 000000000..3d117943a
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.unobtrusive.js
@@ -0,0 +1,410 @@
+/* NUGET: BEGIN LICENSE TEXT
+ *
+ * Microsoft grants you the right to use these script files for the sole
+ * purpose of either: (i) interacting through your browser with the Microsoft
+ * website or online service, subject to the applicable licensing or use
+ * terms; or (ii) using the files as included with a Microsoft product subject
+ * to that product's license terms. Microsoft reserves all other rights to the
+ * files not expressly granted by Microsoft, whether by implication, estoppel
+ * or otherwise. Insofar as a script file is dual licensed under GPL,
+ * Microsoft neither took the code under GPL nor distributes it thereunder but
+ * under the terms set out in this paragraph. All notices and licenses
+ * below are for informational purposes only.
+ *
+ * NUGET: END LICENSE TEXT */
+/*!
+** Unobtrusive validation support library for jQuery and jQuery Validate
+** Copyright (C) Microsoft Corporation. All rights reserved.
+*/
+
+/*jslint white: true, browser: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: false */
+/*global document: false, jQuery: false */
+
+(function ($) {
+    var $jQval = $.validator,
+        adapters,
+        data_validation = "unobtrusiveValidation";
+
+    function setValidationValues(options, ruleName, value) {
+        options.rules[ruleName] = value;
+        if (options.message) {
+            options.messages[ruleName] = options.message;
+        }
+    }
+
+    function splitAndTrim(value) {
+        return value.replace(/^\s+|\s+$/g, "").split(/\s*,\s*/g);
+    }
+
+    function escapeAttributeValue(value) {
+        // As mentioned on http://api.jquery.com/category/selectors/
+        return value.replace(/([!"#$%&'()*+,./:;<=>?@\[\\\]^`{|}~])/g, "\\$1");
+    }
+
+    function getModelPrefix(fieldName) {
+        return fieldName.substr(0, fieldName.lastIndexOf(".") + 1);
+    }
+
+    function appendModelPrefix(value, prefix) {
+        if (value.indexOf("*.") === 0) {
+            value = value.replace("*.", prefix);
+        }
+        return value;
+    }
+
+    function onError(error, inputElement) {  // 'this' is the form element
+        var container = $(this).find("[data-valmsg-for='" + escapeAttributeValue(inputElement[0].name) + "']"),
+            replaceAttrValue = container.attr("data-valmsg-replace"),
+            replace = replaceAttrValue ? $.parseJSON(replaceAttrValue) !== false : null;
+
+        container.removeClass("field-validation-valid").addClass("field-validation-error");
+        error.data("unobtrusiveContainer", container);
+
+        if (replace) {
+            container.empty();
+            error.removeClass("input-validation-error").appendTo(container);
+        }
+        else {
+            error.hide();
+        }
+    }
+
+    function onErrors(event, validator) {  // 'this' is the form element
+        var container = $(this).find("[data-valmsg-summary=true]"),
+            list = container.find("ul");
+
+        if (list && list.length && validator.errorList.length) {
+            list.empty();
+            container.addClass("validation-summary-errors").removeClass("validation-summary-valid");
+
+            $.each(validator.errorList, function () {
+                $("<li />").html(this.message).appendTo(list);
+            });
+        }
+    }
+
+    function onSuccess(error) {  // 'this' is the form element
+        var container = error.data("unobtrusiveContainer"),
+            replaceAttrValue = container.attr("data-valmsg-replace"),
+            replace = replaceAttrValue ? $.parseJSON(replaceAttrValue) : null;
+
+        if (container) {
+            container.addClass("field-validation-valid").removeClass("field-validation-error");
+            error.removeData("unobtrusiveContainer");
+
+            if (replace) {
+                container.empty();
+            }
+        }
+    }
+
+    function onReset(event) {  // 'this' is the form element
+        var $form = $(this);
+        $form.data("validator").resetForm();
+        $form.find(".validation-summary-errors")
+            .addClass("validation-summary-valid")
+            .removeClass("validation-summary-errors");
+        $form.find(".field-validation-error")
+            .addClass("field-validation-valid")
+            .removeClass("field-validation-error")
+            .removeData("unobtrusiveContainer")
+            .find(">*")  // If we were using valmsg-replace, get the underlying error
+                .removeData("unobtrusiveContainer");
+    }
+
+    function validationInfo(form) {
+        var $form = $(form),
+            result = $form.data(data_validation),
+            onResetProxy = $.proxy(onReset, form),
+            defaultOptions = $jQval.unobtrusive.options || {},
+            execInContext = function (name, args) {
+                var func = defaultOptions[name];
+                func && $.isFunction(func) && func.apply(form, args);
+            }
+
+        if (!result) {
+            result = {
+                options: {  // options structure passed to jQuery Validate's validate() method
+                    errorClass: defaultOptions.errorClass || "input-validation-error",
+                    errorElement: defaultOptions.errorElement || "span",
+                    errorPlacement: function () {
+                        onError.apply(form, arguments);
+                        execInContext("errorPlacement", arguments);
+                    },
+                    invalidHandler: function () {
+                        onErrors.apply(form, arguments);
+                        execInContext("invalidHandler", arguments);
+                    },
+                    messages: {},
+                    rules: {},
+                    success: function () {
+                        onSuccess.apply(form, arguments);
+                        execInContext("success", arguments);
+                    }
+                },
+                attachValidation: function () {
+                    $form
+                        .off("reset." + data_validation, onResetProxy)
+                        .on("reset." + data_validation, onResetProxy)
+                        .validate(this.options);
+                },
+                validate: function () {  // a validation function that is called by unobtrusive Ajax
+                    $form.validate();
+                    return $form.valid();
+                }
+            };
+            $form.data(data_validation, result);
+        }
+
+        return result;
+    }
+
+    $jQval.unobtrusive = {
+        adapters: [],
+
+        parseElement: function (element, skipAttach) {
+            /// <summary>
+            /// Parses a single HTML element for unobtrusive validation attributes.
+            /// </summary>
+            /// <param name="element" domElement="true">The HTML element to be parsed.</param>
+            /// <param name="skipAttach" type="Boolean">[Optional] true to skip attaching the
+            /// validation to the form. If parsing just this single element, you should specify true.
+            /// If parsing several elements, you should specify false, and manually attach the validation
+            /// to the form when you are finished. The default is false.</param>
+            var $element = $(element),
+                form = $element.parents("form")[0],
+                valInfo, rules, messages;
+
+            if (!form) {  // Cannot do client-side validation without a form
+                return;
+            }
+
+            valInfo = validationInfo(form);
+            valInfo.options.rules[element.name] = rules = {};
+            valInfo.options.messages[element.name] = messages = {};
+
+            $.each(this.adapters, function () {
+                var prefix = "data-val-" + this.name,
+                    message = $element.attr(prefix),
+                    paramValues = {};
+
+                if (message !== undefined) {  // Compare against undefined, because an empty message is legal (and falsy)
+                    prefix += "-";
+
+                    $.each(this.params, function () {
+                        paramValues[this] = $element.attr(prefix + this);
+                    });
+
+                    this.adapt({
+                        element: element,
+                        form: form,
+                        message: message,
+                        params: paramValues,
+                        rules: rules,
+                        messages: messages
+                    });
+                }
+            });
+
+            $.extend(rules, { "__dummy__": true });
+
+            if (!skipAttach) {
+                valInfo.attachValidation();
+            }
+        },
+
+        parse: function (selector) {
+            /// <summary>
+            /// Parses all the HTML elements in the specified selector. It looks for input elements decorated
+            /// with the [data-val=true] attribute value and enables validation according to the data-val-*
+            /// attribute values.
+            /// </summary>
+            /// <param name="selector" type="String">Any valid jQuery selector.</param>
+
+            // $forms includes all forms in selector's DOM hierarchy (parent, children and self) that have at least one
+            // element with data-val=true
+            var $selector = $(selector),
+                $forms = $selector.parents()
+                                  .addBack()
+                                  .filter("form")
+                                  .add($selector.find("form"))
+                                  .has("[data-val=true]");
+
+            $selector.find("[data-val=true]").each(function () {
+                $jQval.unobtrusive.parseElement(this, true);
+            });
+
+            $forms.each(function () {
+                var info = validationInfo(this);
+                if (info) {
+                    info.attachValidation();
+                }
+            });
+        }
+    };
+
+    adapters = $jQval.unobtrusive.adapters;
+
+    adapters.add = function (adapterName, params, fn) {
+        /// <summary>Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation.</summary>
+        /// <param name="adapterName" type="String">The name of the adapter to be added. This matches the name used
+        /// in the data-val-nnnn HTML attribute (where nnnn is the adapter name).</param>
+        /// <param name="params" type="Array" optional="true">[Optional] An array of parameter names (strings) that will
+        /// be extracted from the data-val-nnnn-mmmm HTML attributes (where nnnn is the adapter name, and
+        /// mmmm is the parameter name).</param>
+        /// <param name="fn" type="Function">The function to call, which adapts the values from the HTML
+        /// attributes into jQuery Validate rules and/or messages.</param>
+        /// <returns type="jQuery.validator.unobtrusive.adapters" />
+        if (!fn) {  // Called with no params, just a function
+            fn = params;
+            params = [];
+        }
+        this.push({ name: adapterName, params: params, adapt: fn });
+        return this;
+    };
+
+    adapters.addBool = function (adapterName, ruleName) {
+        /// <summary>Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation, where
+        /// the jQuery Validate validation rule has no parameter values.</summary>
+        /// <param name="adapterName" type="String">The name of the adapter to be added. This matches the name used
+        /// in the data-val-nnnn HTML attribute (where nnnn is the adapter name).</param>
+        /// <param name="ruleName" type="String" optional="true">[Optional] The name of the jQuery Validate rule. If not provided, the value
+        /// of adapterName will be used instead.</param>
+        /// <returns type="jQuery.validator.unobtrusive.adapters" />
+        return this.add(adapterName, function (options) {
+            setValidationValues(options, ruleName || adapterName, true);
+        });
+    };
+
+    adapters.addMinMax = function (adapterName, minRuleName, maxRuleName, minMaxRuleName, minAttribute, maxAttribute) {
+        /// <summary>Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation, where
+        /// the jQuery Validate validation has three potential rules (one for min-only, one for max-only, and
+        /// one for min-and-max). The HTML parameters are expected to be named -min and -max.</summary>
+        /// <param name="adapterName" type="String">The name of the adapter to be added. This matches the name used
+        /// in the data-val-nnnn HTML attribute (where nnnn is the adapter name).</param>
+        /// <param name="minRuleName" type="String">The name of the jQuery Validate rule to be used when you only
+        /// have a minimum value.</param>
+        /// <param name="maxRuleName" type="String">The name of the jQuery Validate rule to be used when you only
+        /// have a maximum value.</param>
+        /// <param name="minMaxRuleName" type="String">The name of the jQuery Validate rule to be used when you
+        /// have both a minimum and maximum value.</param>
+        /// <param name="minAttribute" type="String" optional="true">[Optional] The name of the HTML attribute that
+        /// contains the minimum value. The default is "min".</param>
+        /// <param name="maxAttribute" type="String" optional="true">[Optional] The name of the HTML attribute that
+        /// contains the maximum value. The default is "max".</param>
+        /// <returns type="jQuery.validator.unobtrusive.adapters" />
+        return this.add(adapterName, [minAttribute || "min", maxAttribute || "max"], function (options) {
+            var min = options.params.min,
+                max = options.params.max;
+
+            if (min && max) {
+                setValidationValues(options, minMaxRuleName, [min, max]);
+            }
+            else if (min) {
+                setValidationValues(options, minRuleName, min);
+            }
+            else if (max) {
+                setValidationValues(options, maxRuleName, max);
+            }
+        });
+    };
+
+    adapters.addSingleVal = function (adapterName, attribute, ruleName) {
+        /// <summary>Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation, where
+        /// the jQuery Validate validation rule has a single value.</summary>
+        /// <param name="adapterName" type="String">The name of the adapter to be added. This matches the name used
+        /// in the data-val-nnnn HTML attribute(where nnnn is the adapter name).</param>
+        /// <param name="attribute" type="String">[Optional] The name of the HTML attribute that contains the value.
+        /// The default is "val".</param>
+        /// <param name="ruleName" type="String" optional="true">[Optional] The name of the jQuery Validate rule. If not provided, the value
+        /// of adapterName will be used instead.</param>
+        /// <returns type="jQuery.validator.unobtrusive.adapters" />
+        return this.add(adapterName, [attribute || "val"], function (options) {
+            setValidationValues(options, ruleName || adapterName, options.params[attribute]);
+        });
+    };
+
+    $jQval.addMethod("__dummy__", function (value, element, params) {
+        return true;
+    });
+
+    $jQval.addMethod("regex", function (value, element, params) {
+        var match;
+        if (this.optional(element)) {
+            return true;
+        }
+
+        match = new RegExp(params).exec(value);
+        return (match && (match.index === 0) && (match[0].length === value.length));
+    });
+
+    $jQval.addMethod("nonalphamin", function (value, element, nonalphamin) {
+        var match;
+        if (nonalphamin) {
+            match = value.match(/\W/g);
+            match = match && match.length >= nonalphamin;
+        }
+        return match;
+    });
+
+    if ($jQval.methods.extension) {
+        adapters.addSingleVal("accept", "mimtype");
+        adapters.addSingleVal("extension", "extension");
+    } else {
+        // for backward compatibility, when the 'extension' validation method does not exist, such as with versions
+        // of JQuery Validation plugin prior to 1.10, we should use the 'accept' method for
+        // validating the extension, and ignore mime-type validations as they are not supported.
+        adapters.addSingleVal("extension", "extension", "accept");
+    }
+
+    adapters.addSingleVal("regex", "pattern");
+    adapters.addBool("creditcard").addBool("date").addBool("digits").addBool("email").addBool("number").addBool("url");
+    adapters.addMinMax("length", "minlength", "maxlength", "rangelength").addMinMax("range", "min", "max", "range");
+    adapters.addMinMax("minlength", "minlength").addMinMax("maxlength", "minlength", "maxlength");
+    adapters.add("equalto", ["other"], function (options) {
+        var prefix = getModelPrefix(options.element.name),
+            other = options.params.other,
+            fullOtherName = appendModelPrefix(other, prefix),
+            element = $(options.form).find(":input").filter("[name='" + escapeAttributeValue(fullOtherName) + "']")[0];
+
+        setValidationValues(options, "equalTo", element);
+    });
+    adapters.add("required", function (options) {
+        // jQuery Validate equates "required" with "mandatory" for checkbox elements
+        if (options.element.tagName.toUpperCase() !== "INPUT" || options.element.type.toUpperCase() !== "CHECKBOX") {
+            setValidationValues(options, "required", true);
+        }
+    });
+    adapters.add("remote", ["url", "type", "additionalfields"], function (options) {
+        var value = {
+            url: options.params.url,
+            type: options.params.type || "GET",
+            data: {}
+        },
+            prefix = getModelPrefix(options.element.name);
+
+        $.each(splitAndTrim(options.params.additionalfields || options.element.name), function (i, fieldName) {
+            var paramName = appendModelPrefix(fieldName, prefix);
+            value.data[paramName] = function () {
+                return $(options.form).find(":input").filter("[name='" + escapeAttributeValue(paramName) + "']").val();
+            };
+        });
+
+        setValidationValues(options, "remote", value);
+    });
+    adapters.add("password", ["min", "nonalphamin", "regex"], function (options) {
+        if (options.params.min) {
+            setValidationValues(options, "minlength", options.params.min);
+        }
+        if (options.params.nonalphamin) {
+            setValidationValues(options, "nonalphamin", options.params.nonalphamin);
+        }
+        if (options.params.regex) {
+            setValidationValues(options, "regex", options.params.regex);
+        }
+    });
+
+    $(function () {
+        $jQval.unobtrusive.parse(document);
+    });
+}(jQuery));
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.unobtrusive.min.js b/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.unobtrusive.min.js
new file mode 100644
index 000000000..db91044eb
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/jquery.validate.unobtrusive.min.js
@@ -0,0 +1,19 @@
+/* NUGET: BEGIN LICENSE TEXT
+ *
+ * Microsoft grants you the right to use these script files for the sole
+ * purpose of either: (i) interacting through your browser with the Microsoft
+ * website or online service, subject to the applicable licensing or use
+ * terms; or (ii) using the files as included with a Microsoft product subject
+ * to that product's license terms. Microsoft reserves all other rights to the
+ * files not expressly granted by Microsoft, whether by implication, estoppel
+ * or otherwise. Insofar as a script file is dual licensed under GPL,
+ * Microsoft neither took the code under GPL nor distributes it thereunder but
+ * under the terms set out in this paragraph. All notices and licenses
+ * below are for informational purposes only.
+ *
+ * NUGET: END LICENSE TEXT */
+/*
+** Unobtrusive validation support library for jQuery and jQuery Validate
+** Copyright (C) Microsoft Corporation. All rights reserved.
+*/
+(function(a){var d=a.validator,b,e="unobtrusiveValidation";function c(a,b,c){a.rules[b]=c;if(a.message)a.messages[b]=a.message}function j(a){return a.replace(/^\s+|\s+$/g,"").split(/\s*,\s*/g)}function f(a){return a.replace(/([!"#$%&'()*+,./:;<=>?@\[\\\]^`{|}~])/g,"\\$1")}function h(a){return a.substr(0,a.lastIndexOf(".")+1)}function g(a,b){if(a.indexOf("*.")===0)a=a.replace("*.",b);return a}function m(c,e){var b=a(this).find("[data-valmsg-for='"+f(e[0].name)+"']"),d=b.attr("data-valmsg-replace"),g=d?a.parseJSON(d)!==false:null;b.removeClass("field-validation-valid").addClass("field-validation-error");c.data("unobtrusiveContainer",b);if(g){b.empty();c.removeClass("input-validation-error").appendTo(b)}else c.hide()}function l(e,d){var c=a(this).find("[data-valmsg-summary=true]"),b=c.find("ul");if(b&&b.length&&d.errorList.length){b.empty();c.addClass("validation-summary-errors").removeClass("validation-summary-valid");a.each(d.errorList,function(){a("<li />").html(this.message).appendTo(b)})}}function k(d){var b=d.data("unobtrusiveContainer"),c=b.attr("data-valmsg-replace"),e=c?a.parseJSON(c):null;if(b){b.addClass("field-validation-valid").removeClass("field-validation-error");d.removeData("unobtrusiveContainer");e&&b.empty()}}function n(){var b=a(this);b.data("validator").resetForm();b.find(".validation-summary-errors").addClass("validation-summary-valid").removeClass("validation-summary-errors");b.find(".field-validation-error").addClass("field-validation-valid").removeClass("field-validation-error").removeData("unobtrusiveContainer").find(">*").removeData("unobtrusiveContainer")}function i(b){var c=a(b),f=c.data(e),i=a.proxy(n,b),g=d.unobtrusive.options||{},h=function(e,d){var c=g[e];c&&a.isFunction(c)&&c.apply(b,d)};if(!f){f={options:{errorClass:g.errorClass||"input-validation-error",errorElement:g.errorElement||"span",errorPlacement:function(){m.apply(b,arguments);h("errorPlacement",arguments)},invalidHandler:function(){l.apply(b,arguments);h("invalidHandler",arguments)},messages:{},rules:{},success:function(){k.apply(b,arguments);h("success",arguments)}},attachValidation:function(){c.off("reset."+e,i).on("reset."+e,i).validate(this.options)},validate:function(){c.validate();return c.valid()}};c.data(e,f)}return f}d.unobtrusive={adapters:[],parseElement:function(b,h){var d=a(b),f=d.parents("form")[0],c,e,g;if(!f)return;c=i(f);c.options.rules[b.name]=e={};c.options.messages[b.name]=g={};a.each(this.adapters,function(){var c="data-val-"+this.name,i=d.attr(c),h={};if(i!==undefined){c+="-";a.each(this.params,function(){h[this]=d.attr(c+this)});this.adapt({element:b,form:f,message:i,params:h,rules:e,messages:g})}});a.extend(e,{__dummy__:true});!h&&c.attachValidation()},parse:function(c){var b=a(c),e=b.parents().addBack().filter("form").add(b.find("form")).has("[data-val=true]");b.find("[data-val=true]").each(function(){d.unobtrusive.parseElement(this,true)});e.each(function(){var a=i(this);a&&a.attachValidation()})}};b=d.unobtrusive.adapters;b.add=function(c,a,b){if(!b){b=a;a=[]}this.push({name:c,params:a,adapt:b});return this};b.addBool=function(a,b){return this.add(a,function(d){c(d,b||a,true)})};b.addMinMax=function(e,g,f,a,d,b){return this.add(e,[d||"min",b||"max"],function(b){var e=b.params.min,d=b.params.max;if(e&&d)c(b,a,[e,d]);else if(e)c(b,g,e);else d&&c(b,f,d)})};b.addSingleVal=function(a,b,d){return this.add(a,[b||"val"],function(e){c(e,d||a,e.params[b])})};d.addMethod("__dummy__",function(){return true});d.addMethod("regex",function(b,c,d){var a;if(this.optional(c))return true;a=(new RegExp(d)).exec(b);return a&&a.index===0&&a[0].length===b.length});d.addMethod("nonalphamin",function(c,d,b){var a;if(b){a=c.match(/\W/g);a=a&&a.length>=b}return a});if(d.methods.extension){b.addSingleVal("accept","mimtype");b.addSingleVal("extension","extension")}else b.addSingleVal("extension","extension","accept");b.addSingleVal("regex","pattern");b.addBool("creditcard").addBool("date").addBool("digits").addBool("email").addBool("number").addBool("url");b.addMinMax("length","minlength","maxlength","rangelength").addMinMax("range","min","max","range");b.addMinMax("minlength","minlength").addMinMax("maxlength","minlength","maxlength");b.add("equalto",["other"],function(b){var i=h(b.element.name),j=b.params.other,d=g(j,i),e=a(b.form).find(":input").filter("[name='"+f(d)+"']")[0];c(b,"equalTo",e)});b.add("required",function(a){(a.element.tagName.toUpperCase()!=="INPUT"||a.element.type.toUpperCase()!=="CHECKBOX")&&c(a,"required",true)});b.add("remote",["url","type","additionalfields"],function(b){var d={url:b.params.url,type:b.params.type||"GET",data:{}},e=h(b.element.name);a.each(j(b.params.additionalfields||b.element.name),function(i,h){var c=g(h,e);d.data[c]=function(){return a(b.form).find(":input").filter("[name='"+f(c)+"']").val()}});c(b,"remote",d)});b.add("password",["min","nonalphamin","regex"],function(a){a.params.min&&c(a,"minlength",a.params.min);a.params.nonalphamin&&c(a,"nonalphamin",a.params.nonalphamin);a.params.regex&&c(a,"regex",a.params.regex)});a(function(){d.unobtrusive.parse(document)})})(jQuery);
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/BindingManager.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/BindingManager.cs
new file mode 100644
index 000000000..57fb3929d
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/BindingManager.cs
@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.Linq;
+using Orchard.ContentManagement.MetaData.Models;
+using Orchard.DynamicForms.Services.Models;
+
+namespace Orchard.DynamicForms.Services {
+    public class BindingManager : IBindingManager {
+        private readonly IEnumerable<IBindingProvider> _providers;
+        public BindingManager(IEnumerable<IBindingProvider> providers) {
+            _providers = providers;
+        }
+
+        public IEnumerable<BindingContext> DescribeBindingContexts() {
+            foreach (var provider in _providers) {
+                var context = new BindingDescribeContext();
+                provider.Describe(context);
+
+                foreach (var description in context.Describe()) {
+                    yield return description;
+                }
+            }
+        }
+
+        public IEnumerable<ContentPartBindingDescriptor> DescribeBindingsFor(ContentTypeDefinition contentTypeDefinition) {
+            var contexts = DescribeBindingContexts().ToLookup(x => x.ContextName);
+
+            foreach (var part in contentTypeDefinition.Parts) {
+                var partName = part.PartDefinition.Name;
+                var partBinding = new ContentPartBindingDescriptor() {
+                    Part = part,
+                    BindingContexts = contexts[partName].ToList()
+                };
+
+                foreach (var field in part.PartDefinition.Fields) {
+                    var fieldName = field.FieldDefinition.Name;
+                    var fieldBinding = new ContentFieldBindingDescriptor {
+                        Field = field,
+                        BindingContexts = contexts[fieldName].ToList()
+                    };
+
+                    partBinding.FieldBindings.Add(fieldBinding);
+                }
+
+                yield return partBinding;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/ElementValidator.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/ElementValidator.cs
new file mode 100644
index 000000000..10ab780fc
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/ElementValidator.cs
@@ -0,0 +1,18 @@
+using Orchard.DynamicForms.Elements;
+using Orchard.DynamicForms.Services.Models;
+
+namespace Orchard.DynamicForms.Services {
+    public abstract class ElementValidator<TElement> : Component, IElementValidator where TElement : FormElement {
+        public void Validate(ValidateInputContext context) {
+            OnValidate((TElement) context.Element, context);
+        }
+
+        public void RegisterClientValidation(RegisterClientValidationAttributesEventContext context) {
+            OnRegisterClientValidation((TElement)context.Element, context);
+        }
+
+        protected virtual void OnValidate(TElement element, ValidateInputContext context) {}
+
+        protected virtual void OnRegisterClientValidation(TElement element, RegisterClientValidationAttributesEventContext context) {}
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/FormElementEventHandlerBase.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/FormElementEventHandlerBase.cs
new file mode 100644
index 000000000..b646cc145
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/FormElementEventHandlerBase.cs
@@ -0,0 +1,9 @@
+using Orchard.DynamicForms.Elements;
+using Orchard.DynamicForms.Services.Models;
+
+namespace Orchard.DynamicForms.Services {
+    public abstract class FormElementEventHandlerBase : IFormElementEventHandler {
+        public virtual void GetElementValue(FormElement element, ReadElementValuesContext context) {}
+        public virtual void RegisterClientValidation(RegisterClientValidationAttributesEventContext context) {}
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/FormEventHandlerBase.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/FormEventHandlerBase.cs
new file mode 100644
index 000000000..d8af700a6
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/FormEventHandlerBase.cs
@@ -0,0 +1,9 @@
+using Orchard.DynamicForms.Services.Models;
+
+namespace Orchard.DynamicForms.Services {
+    public abstract class FormEventHandlerBase : Component, IFormEventHandler {
+        public virtual void Submitted(FormSubmittedEventContext context) {}
+        public virtual void Validating(FormValidatingEventContext context) {}
+        public virtual void Validated(FormValidatedEventContext context) {}
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/FormService.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/FormService.cs
new file mode 100644
index 000000000..9c4d6d0fb
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/FormService.cs
@@ -0,0 +1,350 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Data;
+using System.Linq;
+using System.Web.Mvc;
+using Orchard.Collections;
+using Orchard.ContentManagement;
+using Orchard.ContentManagement.MetaData;
+using Orchard.Core.Contents.Settings;
+using Orchard.Data;
+using Orchard.DynamicForms.Elements;
+using Orchard.DynamicForms.Handlers;
+using Orchard.DynamicForms.Helpers;
+using Orchard.DynamicForms.Models;
+using Orchard.DynamicForms.Services.Models;
+using Orchard.DynamicForms.ViewModels;
+using Orchard.Layouts.Framework.Serialization;
+using Orchard.Layouts.Helpers;
+using Orchard.Layouts.Models;
+using Orchard.Layouts.Services;
+using Orchard.Mvc;
+using Orchard.Services;
+
+namespace Orchard.DynamicForms.Services {
+    public class FormService : IFormService {
+        private readonly ILayoutSerializer _serializer;
+        private readonly IClock _clock;
+        private readonly IRepository<Submission> _submissionRepository;
+        private readonly IFormElementEventHandler _elementHandlers;
+        private readonly IContentManager _contentManager;
+        private readonly IContentDefinitionManager _contentDefinitionManager;
+        private readonly IBindingManager _bindingManager;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IFormEventHandler _formEventHandler;
+        private readonly Lazy<IEnumerable<IElementValidator>> _validators;
+
+        public FormService(
+            ILayoutSerializer serializer, 
+            IClock clock, 
+            IRepository<Submission> submissionRepository, 
+            IFormElementEventHandler elementHandlers, 
+            IContentManager contentManager, 
+            IContentDefinitionManager contentDefinitionManager, 
+            IBindingManager bindingManager, 
+            IHttpContextAccessor httpContextAccessor,
+            IFormEventHandler formEventHandler, 
+            Lazy<IEnumerable<IElementValidator>> validators) {
+
+            _serializer = serializer;
+            _clock = clock;
+            _submissionRepository = submissionRepository;
+            _elementHandlers = elementHandlers;
+            _contentManager = contentManager;
+            _contentDefinitionManager = contentDefinitionManager;
+            _bindingManager = bindingManager;
+            _httpContextAccessor = httpContextAccessor;
+            _formEventHandler = formEventHandler;
+            _validators = validators;
+        }
+
+        public Form FindForm(LayoutPart layoutPart, string formName = null) {
+            var elements = _serializer.Deserialize(layoutPart.LayoutState, new DescribeElementsContext { Content = layoutPart });
+            var forms = elements.Flatten().Where(x => x is Form).Cast<Form>();
+            return String.IsNullOrWhiteSpace(formName) ? forms.FirstOrDefault() : forms.FirstOrDefault(x => x.Name == formName);
+        }
+
+        public IEnumerable<FormElement> GetFormElements(Form form) {
+            return form.Elements.Flatten().Where(x => x is FormElement).Cast<FormElement>();
+        }
+
+        public IEnumerable<string> GetFormElementNames(Form form) {
+            return GetFormElements(form).Select(x => x.Name).Where(x => !String.IsNullOrWhiteSpace(x)).Distinct();
+        }
+
+        public NameValueCollection SubmitForm(Form form, IValueProvider valueProvider, ModelStateDictionary modelState) {
+            var values = ReadElementValues(form, valueProvider);
+
+            _formEventHandler.Submitted(new FormSubmittedEventContext {
+                Form = form,
+                FormService = this,
+                ValueProvider = valueProvider,
+                Values = values
+            });
+
+            _formEventHandler.Validating(new FormValidatingEventContext {
+                Form = form,
+                FormService = this,
+                Values = values,
+                ModelState = modelState,
+                ValueProvider = valueProvider
+            });
+
+            _formEventHandler.Validated(new FormValidatedEventContext {
+                Form = form,
+                FormService = this,
+                Values = values,
+                ModelState = modelState,
+                ValueProvider = valueProvider
+            });
+
+            return values;
+        }
+
+        public Submission CreateSubmission(string formName, NameValueCollection values) {
+            var submission = new Submission {
+                FormName = formName,
+                CreatedUtc = _clock.UtcNow,
+                FormData = values.ToQueryString()
+            };
+
+            CreateSubmission(submission);
+            return submission;
+        }
+
+        public Submission CreateSubmission(Submission submission) {
+            _submissionRepository.Create(submission);
+            return submission;
+        }
+
+        public Submission GetSubmission(int id) {
+            return _submissionRepository.Get(id);
+        }
+
+        public IPageOfItems<Submission> GetSubmissions(string formName = null, int? skip = null, int? take = null) {
+            var query = _submissionRepository.Table;
+
+            if (!String.IsNullOrWhiteSpace(formName))
+                query = query.Where(x => x.FormName == formName);
+
+            query = new Orderable<Submission>(query).Desc(x => x.CreatedUtc).Queryable;
+
+            var totalItemCount = query.Count();
+            if (skip != null && take.GetValueOrDefault() > 0)
+                query = query.Skip(skip.Value).Take(take.GetValueOrDefault());
+
+            return new PageOfItems<Submission>(query) {
+                PageNumber = skip.GetValueOrDefault() * take.GetValueOrDefault(),
+                PageSize = take ?? Int32.MaxValue,
+                TotalItemCount = totalItemCount
+            };
+        }
+
+        public void DeleteSubmission(Submission submission) {
+            _submissionRepository.Delete(submission);
+        }
+
+        public int DeleteSubmissions(IEnumerable<int> submissionIds) {
+            var submissions = _submissionRepository.Table.Where(x => submissionIds.Contains(x.Id)).ToArray();
+
+            foreach (var submission in submissions) {
+                DeleteSubmission(submission);
+            }
+
+            return submissions.Length;
+        }
+
+        public void ReadElementValues(FormElement element, ReadElementValuesContext context) {
+            _elementHandlers.GetElementValue(element, context);
+        }
+
+        public NameValueCollection ReadElementValues(Form form, IValueProvider valueProvider) {
+            var formElements = GetFormElements(form);
+            var values = new NameValueCollection();
+
+            // Let each element provide its values.
+            foreach (var element in formElements) {
+                var context = new ReadElementValuesContext { ValueProvider = valueProvider };
+                ReadElementValues(element, context);
+
+                foreach (var key in from string key in context.Output where !String.IsNullOrWhiteSpace(key) && values[key] == null select key) {
+                    values.Add(key, context.Output[key]);
+                }
+            }
+
+            // Collect any remaining form values not handled by any specific element.
+            var requestForm = _httpContextAccessor.Current().Request.Form;
+            var blackList = new[] {"__RequestVerificationToken", "formName", "contentId"};
+            foreach (var key in 
+                from string key in requestForm 
+                where !String.IsNullOrWhiteSpace(key) && !blackList.Contains(key) && values[key] == null 
+                select key) {
+
+                values.Add(key, requestForm[key]);
+            }
+
+            return values;
+        }
+
+        public DataTable GenerateDataTable(IEnumerable<Submission> submissions) {
+            var records = submissions.Select(x => Tuple.Create(x, x.ToNameValues())).ToArray();
+            var columnNames = new HashSet<string>();
+            var dataTable = new DataTable();
+
+            foreach (var key in 
+                from record in records 
+                from string key in record.Item2 where !columnNames.Contains(key) 
+                where !String.IsNullOrWhiteSpace(key)
+                select key) {
+                columnNames.Add(key);
+            }
+
+            dataTable.Columns.Add("Id");
+            dataTable.Columns.Add("CreatedUtc", typeof (DateTime));
+            foreach (var columnName in columnNames) {
+                dataTable.Columns.Add(columnName);
+            }
+
+            foreach (var record in records) {
+                var dataRow = dataTable.NewRow();
+
+                dataRow["Id"] = record.Item1.Id;
+                dataRow["CreatedUtc"] = record.Item1.CreatedUtc;
+                foreach (var columnName in columnNames) {
+                    var value = record.Item2[columnName];
+                    dataRow[columnName] = value;
+                }
+
+                dataTable.Rows.Add(dataRow);
+            }
+
+            return dataTable;
+        }
+
+        public ContentItem CreateContentItem(Form form, IValueProvider valueProvider) {
+            var contentTypeDefinition = _contentDefinitionManager.GetTypeDefinition(form.ContentType);
+
+            if (contentTypeDefinition == null)
+                return null;
+
+            var contentItem = _contentManager.Create(contentTypeDefinition.Name, VersionOptions.Draft);
+            var lookup = _bindingManager.DescribeBindingsFor(contentTypeDefinition);
+            var formElements = GetFormElements(form);
+
+            foreach (var element in formElements) {
+                var context = new ReadElementValuesContext { ValueProvider = valueProvider };
+                ReadElementValues(element, context);
+
+                var value = context.Output[element.Name];
+                var bindingSettings = element.State.GetModel<FormBindingSettings>(null);
+
+                if (bindingSettings != null) {
+                    foreach (var partBindingSettings in bindingSettings.Parts) {
+                        InvokePartBindings(contentItem, lookup, partBindingSettings, value);
+
+                        foreach (var fieldBindingSettings in partBindingSettings.Fields) {
+                            InvokeFieldBindings(contentItem, lookup, partBindingSettings, fieldBindingSettings, value);
+                        }
+                    }
+                }
+            }
+
+            var contentTypeSettings = contentTypeDefinition.Settings.GetModel<ContentTypeSettings>();
+            if (form.Publication == "Publish" || !contentTypeSettings.Draftable)
+                _contentManager.Publish(contentItem);
+            return contentItem;
+        }
+
+        public IEnumerable<IElementValidator> GetValidators<TElement>() where TElement : FormElement {
+            return GetValidators(typeof(TElement));
+        }
+
+        public IEnumerable<IElementValidator> GetValidators(FormElement element) {
+            return GetValidators(element.GetType());
+        }
+
+        public IEnumerable<IElementValidator> GetValidators(Type elementType) {
+            return _validators.Value.Where(x => IsFormElementType(x, elementType)).ToArray();
+        }
+
+        public IEnumerable<IElementValidator> GetValidators() {
+            return _validators.Value.ToArray();
+        }
+
+        public void RegisterClientValidationAttributes(RegisterClientValidationAttributesEventContext context) {
+            _elementHandlers.RegisterClientValidation(context);
+        }
+
+        private static void InvokePartBindings(
+            ContentItem contentItem, 
+            IEnumerable<ContentPartBindingDescriptor> lookup, 
+            PartBindingSettings partBindingSettings,
+            string value) {
+
+            var part = contentItem.Parts.FirstOrDefault(x => x.PartDefinition.Name == partBindingSettings.Name);
+            if (part == null)
+                return;
+
+            var partBindingDescriptors = lookup.Where(x => x.Part.PartDefinition.Name == partBindingSettings.Name);
+            var partBindingsQuery =
+                from descriptor in partBindingDescriptors
+                from bindingContext in descriptor.BindingContexts
+                where bindingContext.ContextName == part.PartDefinition.Name
+                from binding in bindingContext.Bindings
+                select binding;
+            var partBindings = partBindingsQuery.ToArray();
+
+            foreach (var binding in partBindingSettings.Bindings.Where(x => x.Enabled)) {
+                var localBinding = binding;
+                foreach (var partBinding in partBindings.Where(x => x.Name == localBinding.Name)) {
+                    partBinding.Setter.DynamicInvoke(part, value);
+                }
+            }
+        }
+
+        private static void InvokeFieldBindings(
+            ContentItem contentItem,
+            IEnumerable<ContentPartBindingDescriptor> lookup,
+            PartBindingSettings partBindingSettings,
+            FieldBindingSettings fieldBindingSettings,
+            string value) {
+
+            var part = contentItem.Parts.FirstOrDefault(x => x.PartDefinition.Name == partBindingSettings.Name);
+            if (part == null)
+                return;
+
+            var field = part.Fields.FirstOrDefault(x => x.Name == fieldBindingSettings.Name);
+            if (field == null)
+                return;
+
+            var fieldBindingDescriptorsQuery = 
+                from partBindingDescriptor in lookup
+                where partBindingDescriptor.Part.PartDefinition.Name == partBindingSettings.Name
+                from fieldBindingDescriptor in partBindingDescriptor.FieldBindings
+                where fieldBindingDescriptor.Field.Name == fieldBindingSettings.Name
+                select fieldBindingDescriptor;
+            var fieldBindingDescriptors = fieldBindingDescriptorsQuery.ToArray();
+            var fieldBindingsQuery =
+                from descriptor in fieldBindingDescriptors
+                from bindingContext in descriptor.BindingContexts
+                where bindingContext.ContextName == field.FieldDefinition.Name
+                from binding in bindingContext.Bindings
+                select binding;
+            var fieldBindings = fieldBindingsQuery.ToArray();
+
+            foreach (var binding in fieldBindingSettings.Bindings.Where(x => x.Enabled)) {
+                var localBinding = binding;
+                foreach (var fieldBinding in fieldBindings.Where(x => x.Name == localBinding.Name)) {
+                    fieldBinding.Setter.DynamicInvoke(field, value);
+                }
+            }
+        }
+
+        private static bool IsFormElementType(IElementValidator validator, Type elementType) {
+            var validatorType = validator.GetType();
+            var validatorElementType = validatorType.BaseType.GenericTypeArguments[0];
+            return validatorElementType == elementType || validatorElementType.IsAssignableFrom(elementType);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IBindingManager.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IBindingManager.cs
new file mode 100644
index 000000000..24d5aea12
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IBindingManager.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using Orchard.ContentManagement.MetaData.Models;
+using Orchard.DynamicForms.Services.Models;
+
+namespace Orchard.DynamicForms.Services {
+    public interface IBindingManager : IDependency {
+        IEnumerable<BindingContext> DescribeBindingContexts();
+        IEnumerable<ContentPartBindingDescriptor> DescribeBindingsFor(ContentTypeDefinition contentTypeDefinition);
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IBindingProvider.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IBindingProvider.cs
new file mode 100644
index 000000000..573dd1d1a
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IBindingProvider.cs
@@ -0,0 +1,8 @@
+using Orchard.DynamicForms.Services.Models;
+using Orchard.Events;
+
+namespace Orchard.DynamicForms.Services {
+    public interface IBindingProvider : IEventHandler {
+        void Describe(BindingDescribeContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IElementValidator.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IElementValidator.cs
new file mode 100644
index 000000000..ac3b325ed
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IElementValidator.cs
@@ -0,0 +1,8 @@
+using Orchard.DynamicForms.Services.Models;
+
+namespace Orchard.DynamicForms.Services {
+    public interface IElementValidator : IDependency {
+        void Validate(ValidateInputContext context);
+        void RegisterClientValidation(RegisterClientValidationAttributesEventContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IFormElementEventHandler.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IFormElementEventHandler.cs
new file mode 100644
index 000000000..65395e5ae
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IFormElementEventHandler.cs
@@ -0,0 +1,10 @@
+using Orchard.DynamicForms.Elements;
+using Orchard.DynamicForms.Services.Models;
+using Orchard.Events;
+
+namespace Orchard.DynamicForms.Services {
+    public interface IFormElementEventHandler : IEventHandler{
+        void GetElementValue(FormElement element, ReadElementValuesContext context);
+        void RegisterClientValidation(RegisterClientValidationAttributesEventContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IFormEventHandler.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IFormEventHandler.cs
new file mode 100644
index 000000000..17122fcd0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IFormEventHandler.cs
@@ -0,0 +1,10 @@
+using Orchard.DynamicForms.Services.Models;
+using Orchard.Events;
+
+namespace Orchard.DynamicForms.Services {
+    public interface IFormEventHandler : IEventHandler {
+        void Submitted(FormSubmittedEventContext context);
+        void Validating(FormValidatingEventContext context);
+        void Validated(FormValidatedEventContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IFormService.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IFormService.cs
new file mode 100644
index 000000000..145303b5b
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/IFormService.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Data;
+using System.Web.Mvc;
+using Orchard.Collections;
+using Orchard.ContentManagement;
+using Orchard.DynamicForms.Elements;
+using Orchard.DynamicForms.Models;
+using Orchard.DynamicForms.Services.Models;
+using Orchard.Layouts.Models;
+
+namespace Orchard.DynamicForms.Services {
+    public interface IFormService : IDependency {
+        Form FindForm(LayoutPart layoutPart, string formName = null);
+        IEnumerable<FormElement> GetFormElements(Form form);
+        IEnumerable<string> GetFormElementNames(Form form);
+        NameValueCollection SubmitForm(Form form, IValueProvider valueProvider, ModelStateDictionary modelState);
+        Submission CreateSubmission(string formName, NameValueCollection values);
+        Submission CreateSubmission(Submission submission);
+        Submission GetSubmission(int id);
+        IPageOfItems<Submission> GetSubmissions(string formName = null, int? skip = null, int? take = null);
+        void DeleteSubmission(Submission submission);
+        int DeleteSubmissions(IEnumerable<int> submissionIds);
+        void ReadElementValues(FormElement element, ReadElementValuesContext context);
+        NameValueCollection ReadElementValues(Form form, IValueProvider valueProvider);
+        DataTable GenerateDataTable(IEnumerable<Submission> submissions);
+        ContentItem CreateContentItem(Form form, IValueProvider valueProvider);
+        IEnumerable<IElementValidator> GetValidators<TElement>() where TElement : FormElement;
+        IEnumerable<IElementValidator> GetValidators(FormElement element);
+        IEnumerable<IElementValidator> GetValidators(Type elementType);
+        IEnumerable<IElementValidator> GetValidators();
+        void RegisterClientValidationAttributes(RegisterClientValidationAttributesEventContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/ITempDataAccessor.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/ITempDataAccessor.cs
new file mode 100644
index 000000000..debff575f
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/ITempDataAccessor.cs
@@ -0,0 +1,8 @@
+using System.Web.Mvc;
+
+namespace Orchard.DynamicForms.Services {
+    public interface IController {
+        TempDataDictionary TempData { get; }
+        ModelStateDictionary ModelState { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/BindingContext.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/BindingContext.cs
new file mode 100644
index 000000000..77910b132
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/BindingContext.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+
+namespace Orchard.DynamicForms.Services.Models {
+    public abstract class BindingContext {
+        protected readonly IList<BindingDescriptor> _bindings = new List<BindingDescriptor>();
+
+        protected BindingContext(string contextName) {
+            ContextName = contextName;
+        }
+
+        public string ContextName { get; set; }
+        public IEnumerable<BindingDescriptor> Bindings {
+            get { return _bindings; }
+        }
+    }
+
+    public class BindingContext<T> : BindingContext {
+
+        public BindingContext() : base(typeof(T).Name) {
+        }
+
+        public BindingContext<T> Binding(string name, Action<T, string> setter) {
+
+            _bindings.Add(new BindingDescriptor<T> {
+                Name = name,
+                Setter = setter
+            });
+
+            return this;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/BindingDescribeContext.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/BindingDescribeContext.cs
new file mode 100644
index 000000000..25afdd96d
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/BindingDescribeContext.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+
+namespace Orchard.DynamicForms.Services.Models {
+    public class BindingDescribeContext {
+        private readonly IDictionary<string, BindingContext> _describes = new Dictionary<string, BindingContext>();
+
+        public IEnumerable<BindingContext> Describe() {
+            return _describes.Values;
+        }
+
+        public BindingContext<T> For<T>() {
+            BindingContext bindingContext;
+            var key = typeof (T).Name;
+            if (!_describes.TryGetValue(key, out bindingContext)) {
+                bindingContext = new BindingContext<T>();
+                _describes[key] = bindingContext;
+            }
+            return (BindingContext<T>)bindingContext;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/BindingDescriptor.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/BindingDescriptor.cs
new file mode 100644
index 000000000..b4021ba10
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/BindingDescriptor.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Orchard.DynamicForms.Services.Models {
+    public abstract class BindingDescriptor {
+        public string Name { get; set; }
+        public Delegate Setter { get; set; }
+    }
+
+    public class BindingDescriptor<T> : BindingDescriptor {
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/ContentFieldBindingDescriptor.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/ContentFieldBindingDescriptor.cs
new file mode 100644
index 000000000..b9c49e972
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/ContentFieldBindingDescriptor.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using Orchard.ContentManagement.MetaData.Models;
+
+namespace Orchard.DynamicForms.Services.Models {
+    public class ContentFieldBindingDescriptor {
+        public ContentFieldBindingDescriptor() {
+            BindingContexts = new List<BindingContext>();
+        }
+        public ContentPartFieldDefinition Field { get; set; }
+        public IList<BindingContext> BindingContexts { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/ContentPartBindingDescriptor.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/ContentPartBindingDescriptor.cs
new file mode 100644
index 000000000..63ed82c28
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/ContentPartBindingDescriptor.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using Orchard.ContentManagement.MetaData.Models;
+
+namespace Orchard.DynamicForms.Services.Models {
+    public class ContentPartBindingDescriptor {
+        public ContentPartBindingDescriptor() {
+            BindingContexts = new List<BindingContext>();
+            FieldBindings = new List<ContentFieldBindingDescriptor>();
+        }
+        public ContentTypePartDefinition Part { get; set; }
+        public IList<BindingContext> BindingContexts { get; set; }
+        public IList<ContentFieldBindingDescriptor> FieldBindings { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FieldValidatorDescriptor.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FieldValidatorDescriptor.cs
new file mode 100644
index 000000000..78e0f1e08
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FieldValidatorDescriptor.cs
@@ -0,0 +1,7 @@
+namespace Orchard.DynamicForms.Services.Models {
+    public class FieldValidatorSetting {
+        public string Name { get; set; }
+        public bool Enabled { get; set; }
+        public string CustomValidationMessage { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FormEventContext.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FormEventContext.cs
new file mode 100644
index 000000000..b47296323
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FormEventContext.cs
@@ -0,0 +1,12 @@
+using System.Collections.Specialized;
+using System.Web.Mvc;
+using Orchard.DynamicForms.Elements;
+
+namespace Orchard.DynamicForms.Services.Models {
+    public class FormEventContext {
+        public Form Form { get; set; }
+        public NameValueCollection Values { get; set; }
+        public IFormService FormService { get; set; }
+        public IValueProvider ValueProvider { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FormSubmittedEventContext.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FormSubmittedEventContext.cs
new file mode 100644
index 000000000..705acc9a1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FormSubmittedEventContext.cs
@@ -0,0 +1,4 @@
+namespace Orchard.DynamicForms.Services.Models {
+    public class FormSubmittedEventContext : FormEventContext {
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FormValidatedEventContext.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FormValidatedEventContext.cs
new file mode 100644
index 000000000..e738c9450
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FormValidatedEventContext.cs
@@ -0,0 +1,7 @@
+using System.Web.Mvc;
+
+namespace Orchard.DynamicForms.Services.Models {
+    public class FormValidatedEventContext : FormEventContext {
+        public ModelStateDictionary ModelState { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FormValidatingEventContext.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FormValidatingEventContext.cs
new file mode 100644
index 000000000..ad0c770dd
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/FormValidatingEventContext.cs
@@ -0,0 +1,7 @@
+using System.Web.Mvc;
+
+namespace Orchard.DynamicForms.Services.Models {
+    public class FormValidatingEventContext : FormEventContext {
+        public ModelStateDictionary ModelState { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/RegisterClientValidationAttributesEventContext.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/RegisterClientValidationAttributesEventContext.cs
new file mode 100644
index 000000000..15832835f
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/RegisterClientValidationAttributesEventContext.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Orchard.DynamicForms.Elements;
+
+namespace Orchard.DynamicForms.Services.Models {
+    public class RegisterClientValidationAttributesEventContext {
+        public RegisterClientValidationAttributesEventContext() {
+            ClientAttributes = new Dictionary<string, string>();
+        }
+        public IDictionary<string, string> ClientAttributes { get; set; }
+        public FormElement Element { get; set; }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/ValidateInputContext.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/ValidateInputContext.cs
new file mode 100644
index 000000000..04aef3634
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/Models/ValidateInputContext.cs
@@ -0,0 +1,11 @@
+using System.Web.Mvc;
+using Orchard.DynamicForms.Elements;
+
+namespace Orchard.DynamicForms.Services.Models {
+    public class ValidateInputContext {
+        public FormElement Element { get; set; }
+        public ModelStateDictionary ModelState { get; set; }
+        public string FieldName { get; set; }
+        public string AttemptedValue { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/ReadElementValuesContext.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/ReadElementValuesContext.cs
new file mode 100644
index 000000000..3aea44ec8
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/ReadElementValuesContext.cs
@@ -0,0 +1,12 @@
+using System.Collections.Specialized;
+using System.Web.Mvc;
+
+namespace Orchard.DynamicForms.Services {
+    public class ReadElementValuesContext {
+        public ReadElementValuesContext() {
+            Output = new NameValueCollection();
+        }
+        public IValueProvider ValueProvider { get; set; }
+        public NameValueCollection Output { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/Web.config
new file mode 100644
index 000000000..817198995
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/Web.config
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/form-elements.css b/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/form-elements.css
new file mode 100644
index 000000000..cbac7e091
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/form-elements.css
@@ -0,0 +1,25 @@
+/* Forms
+***************************************************************/
+.dynamic-form input[type='text'],
+.dynamic-form input.text,
+.dynamic-form textarea.text {
+    width: 99%;
+    line-height: 1.5em;
+    margin-bottom: 0.8em;
+}
+
+/* Validation
+***************************************************************/
+.input-validation-error, input.text.input-validation-error {
+     border:1px solid #990808;
+}
+
+.field-validation-error {
+     color: #990808;
+}
+
+/* Elements
+***************************************************************/
+.form-field-element {
+    margin: 0.8em 0 0 0;
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/form.designer.css b/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/form.designer.css
new file mode 100644
index 000000000..ba5a61307
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/form.designer.css
@@ -0,0 +1,46 @@
+.layout-editor .canvas .x-form {
+    background: none repeat scroll 0 0 #fafafa;
+    border: 1px solid #bdbcbc;
+    margin: 0 0 0.3em;
+    padding: 4.3em 0.4em 2.5em 0.4em;
+    position: relative;
+}
+
+    .layout-editor .canvas .x-form .form-toolbar {
+        padding: 0 0.5em 0 0.5em;
+        height: 27px;
+    }
+
+    .layout-editor .canvas .x-form .drag-handle {
+        background: none repeat scroll 0 0 #e4e4e4;
+        cursor: move;
+        left: -1px;
+        position: absolute;
+        right: -1px;
+        top: -1px;
+        z-index: 25;
+        border: 1px solid #bdbcbc;
+        height: 27px;
+    }
+
+        .layout-editor .canvas .x-form .drag-handle .name {
+            line-height: 1.5em;
+        }
+
+    .layout-editor .canvas .x-row .x-column .x-form .x-holder,
+    .layout-editor .canvas .x-form .x-holder {
+        min-height: 5em;
+        border: none;
+    }
+
+.layout-editor .hidden-field {
+    background: #e5e5e5;
+    padding: 0.5em;
+    -ms-opacity: .5;
+    opacity: .5;
+}
+
+input.text.design,
+textarea.text.design {
+    width: 99%;
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/forms-admin.css b/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/forms-admin.css
new file mode 100644
index 000000000..094ac21dc
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/forms-admin.css
@@ -0,0 +1,18 @@
+.dynamic-forms tbody.forms td:last-child,
+.dynamic-forms-submissions tbody.submissions td:last-child {
+    text-align: right;
+}
+
+.bindings table thead th.property-type,
+.bindings table tbody td.property-type {
+    width: 300px;
+    text-align: right;
+}
+
+th.validator-name {
+    width: 20%;
+}
+
+th.validator-settings {
+    width: 80%;
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/menu.dynamicforms-admin.css b/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/menu.dynamicforms-admin.css
new file mode 100644
index 000000000..e628ecd70
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/menu.dynamicforms-admin.css
@@ -0,0 +1,7 @@
+.navicon-dynamic-forms {
+    background-image: url(menu.dynamicforms.png) !important;
+}
+
+    .navicon-dynamic-forms:hover {
+        background-position: 0 -30px !important;
+    }
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/menu.dynamicforms.png b/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/menu.dynamicforms.png
new file mode 100644
index 000000000..e877f51ce
Binary files /dev/null and b/src/Orchard.Web/Modules/Orchard.DynamicForms/Styles/menu.dynamicforms.png differ
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/CheckBoxValidator.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/CheckBoxValidator.cs
new file mode 100644
index 000000000..8e55ee384
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/CheckBoxValidator.cs
@@ -0,0 +1,41 @@
+using System;
+using Orchard.DynamicForms.Elements;
+using Orchard.DynamicForms.Services;
+using Orchard.DynamicForms.Services.Models;
+using Orchard.DynamicForms.Validators.Settings;
+
+namespace Orchard.DynamicForms.Validators {
+    public class CheckBoxValidator : ElementValidator<CheckBox> {
+        protected override void OnValidate(CheckBox element, ValidateInputContext context) {
+            var settings = element.ValidationSettings;
+
+            if (settings.IsMandatory != true)
+                return;
+
+            if (String.IsNullOrWhiteSpace(context.AttemptedValue)) {
+                var message = GetValidationMessage(settings);
+                context.ModelState.AddModelError(context.FieldName, T(message, context.FieldName).Text);
+            }
+        }
+
+        protected override void OnRegisterClientValidation(CheckBox element, RegisterClientValidationAttributesEventContext context) {
+            var settings = element.ValidationSettings;
+
+            if (settings.IsMandatory != true)
+                return;
+
+            var message = GetValidationMessage(settings);
+
+            context.ClientAttributes["data-val"] = "true";
+            context.ClientAttributes["data-val-mandatory"] = T(message, context.Element.Name).Text;
+        }
+
+        private string GetValidationMessage(CheckBoxValidationSettings settings) {
+            var message = String.IsNullOrWhiteSpace(settings.CustomValidationMessage)
+                    ? "{0} is a mandatory field."
+                    : settings.CustomValidationMessage;
+
+            return message;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/Settings/CheckBoxValidationSettings.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/Settings/CheckBoxValidationSettings.cs
new file mode 100644
index 000000000..38f9f3d2e
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/Settings/CheckBoxValidationSettings.cs
@@ -0,0 +1,5 @@
+namespace Orchard.DynamicForms.Validators.Settings {
+    public class CheckBoxValidationSettings : ValidationSettingsBase {
+        public bool? IsMandatory { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/Settings/TextFieldValidationSettings.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/Settings/TextFieldValidationSettings.cs
new file mode 100644
index 000000000..755e86e6e
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/Settings/TextFieldValidationSettings.cs
@@ -0,0 +1,7 @@
+namespace Orchard.DynamicForms.Validators.Settings {
+    public class TextFieldValidationSettings : ValidationSettingsBase {
+        public bool? IsRequired { get; set; }
+        public int? MinimumLength { get; set; }
+        public int? MaximumLength { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/Settings/ValidationSettingsBase.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/Settings/ValidationSettingsBase.cs
new file mode 100644
index 000000000..0a68592e9
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/Settings/ValidationSettingsBase.cs
@@ -0,0 +1,6 @@
+namespace Orchard.DynamicForms.Validators.Settings {
+    public abstract class ValidationSettingsBase {
+        public string CustomValidationMessage { get; set; }
+        public bool? ShowValidationMessage { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/TextFieldValidator.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/TextFieldValidator.cs
new file mode 100644
index 000000000..2fbb029df
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Validators/TextFieldValidator.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Globalization;
+using Orchard.DynamicForms.Elements;
+using Orchard.DynamicForms.Services;
+using Orchard.DynamicForms.Services.Models;
+using Orchard.DynamicForms.Validators.Settings;
+
+namespace Orchard.DynamicForms.Validators {
+    public class TextFieldValidator : ElementValidator<TextField> {
+        protected override void OnValidate(TextField element, ValidateInputContext context) {
+            var settings = element.ValidationSettings;
+
+            if (settings.IsRequired != true)
+                return;
+
+            if (String.IsNullOrWhiteSpace(context.AttemptedValue)) {    
+                var message = GetValidationMessage(settings);
+                context.ModelState.AddModelError(context.FieldName, T(message, context.FieldName).Text);
+            }
+        }
+
+        protected override void OnRegisterClientValidation(TextField element, RegisterClientValidationAttributesEventContext context) {
+            var settings = element.ValidationSettings;
+            
+            if (settings.IsRequired != true && settings.MinimumLength == null && settings.MaximumLength == null)
+                return;
+
+            var message = GetValidationMessage(settings);
+
+            context.ClientAttributes["data-val"] = "true";
+
+            if(settings.IsRequired == true)
+                context.ClientAttributes["data-val-required"] = T(message, context.Element.Name).Text;
+
+            if (settings.MaximumLength != null || settings.MinimumLength != null) {
+                if (settings.MaximumLength != null) {
+                    context.ClientAttributes["data-val-length-max"] = settings.MaximumLength.Value.ToString(CultureInfo.InvariantCulture);
+                }
+
+                if (settings.MinimumLength != null) {
+                    context.ClientAttributes["data-val-length-min"] = settings.MinimumLength.Value.ToString(CultureInfo.InvariantCulture);
+                }
+
+                context.ClientAttributes["data-val-length"] = T(message, element.Name, settings.MaximumLength, settings.MinimumLength).Text;
+            }
+        }
+
+        private string GetValidationMessage(TextFieldValidationSettings validationSettings) {
+            var message = String.IsNullOrWhiteSpace(validationSettings.CustomValidationMessage)
+                    ? "{0} is a required field."
+                    : validationSettings.CustomValidationMessage;
+
+            return message;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/BindingSettings.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/BindingSettings.cs
new file mode 100644
index 000000000..85a0ce0a5
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/BindingSettings.cs
@@ -0,0 +1,6 @@
+namespace Orchard.DynamicForms.ViewModels {
+    public class BindingSettings {
+        public string Name { get; set; }
+        public bool Enabled { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/BlueprintsIndexViewModel.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/BlueprintsIndexViewModel.cs
new file mode 100644
index 000000000..6ae72fcbf
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/BlueprintsIndexViewModel.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+using Orchard.DynamicForms.Models;
+using Orchard.Layouts.Models;
+
+namespace Orchard.DynamicForms.ViewModels {
+    public class BlueprintsIndexViewModel {
+        public IList<ElementBlueprint> Blueprints { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/FieldBindingSettings.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/FieldBindingSettings.cs
new file mode 100644
index 000000000..9eec6d8be
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/FieldBindingSettings.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace Orchard.DynamicForms.ViewModels {
+    public class FieldBindingSettings {
+        public FieldBindingSettings() {
+            Bindings = new List<BindingSettings>();
+        }
+
+        public string Name { get; set; }
+        public IList<BindingSettings> Bindings { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/FieldValidationSettings.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/FieldValidationSettings.cs
new file mode 100644
index 000000000..917e07ac1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/FieldValidationSettings.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using Orchard.DynamicForms.Services.Models;
+
+namespace Orchard.DynamicForms.ViewModels {
+    public class FieldValidationSettings {
+        public FieldValidationSettings() {
+            Validators = new List<FieldValidatorSetting>();
+        }
+        public IList<FieldValidatorSetting> Validators { get; set; }
+        public bool ShowValidationMessage { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/FormBindingSettings.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/FormBindingSettings.cs
new file mode 100644
index 000000000..1fcd539e8
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/FormBindingSettings.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Orchard.DynamicForms.Services.Models;
+
+namespace Orchard.DynamicForms.ViewModels {
+    public class FormBindingSettings {
+        public FormBindingSettings() {
+            Parts = new List<PartBindingSettings>();
+        }
+
+        public IEnumerable<ContentPartBindingDescriptor> AvailableBindings { get; set; }
+        public IList<PartBindingSettings> Parts { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/FormsIndexViewModel.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/FormsIndexViewModel.cs
new file mode 100644
index 000000000..498519b30
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/FormsIndexViewModel.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+using System.Linq;
+using Orchard.DynamicForms.Models;
+
+namespace Orchard.DynamicForms.ViewModels {
+    public class FormsIndexViewModel {
+        public IList<IGrouping<string, Submission>> Forms { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/PartBindingSettings.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/PartBindingSettings.cs
new file mode 100644
index 000000000..691ff78fe
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/PartBindingSettings.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace Orchard.DynamicForms.ViewModels {
+    public class PartBindingSettings {
+        public PartBindingSettings() {
+            Bindings = new List<BindingSettings>();
+            Fields = new List<FieldBindingSettings>();
+        }
+
+        public string Name { get; set; }
+        public IList<BindingSettings> Bindings { get; set; }
+        public IList<FieldBindingSettings> Fields { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/SubmissionViewModel.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/SubmissionViewModel.cs
new file mode 100644
index 000000000..ac6528eb4
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/SubmissionViewModel.cs
@@ -0,0 +1,9 @@
+using System.Collections.Specialized;
+using Orchard.DynamicForms.Models;
+
+namespace Orchard.DynamicForms.ViewModels {
+    public class SubmissionViewModel {
+        public Submission Submission { get; set; }
+        public NameValueCollection NameValues { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/SubmissionsIndexViewModel.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/SubmissionsIndexViewModel.cs
new file mode 100644
index 000000000..4411dd6ca
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ViewModels/SubmissionsIndexViewModel.cs
@@ -0,0 +1,9 @@
+using System.Data;
+
+namespace Orchard.DynamicForms.ViewModels {
+    public class SubmissionsIndexViewModel {
+        public string FormName { get; set; }
+        public DataTable Submissions { get; set; }
+        public dynamic Pager { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Activity-DynamicFormSubmitted.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Activity-DynamicFormSubmitted.cshtml
new file mode 100644
index 000000000..996468a89
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Activity-DynamicFormSubmitted.cshtml
@@ -0,0 +1,9 @@
+@{
+    var formNames = (string)Model.State.DynamicForms;
+    var isEventClass = Model.IsEvent ? "event" : null;
+    var canStartClass = Model.CanStartWorkflow ? "canStart" : null;
+    var description = String.IsNullOrEmpty(formNames) ? T("Any Dynamic Form Submitted") : T("{0} Form Submitted", formNames);
+}
+<div class="@isEventClass @canStartClass activity-dynamic-form-submitted">
+    <div>@description</div>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Admin/Index.cshtml
new file mode 100644
index 000000000..59384fd82
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Admin/Index.cshtml
@@ -0,0 +1,34 @@
+@model Orchard.DynamicForms.ViewModels.FormsIndexViewModel
+@{
+    Style.Include("forms-admin.css");
+    Layout.Title = T("Dynamic Forms");
+}
+<table class="items dynamic-forms">
+    <thead>
+        <tr>
+            <th>@T("Form")</th>
+            <th>@T("Submissions")</th>
+            <th></th>
+        </tr>
+    </thead>
+    @if (!Model.Forms.Any()) {
+        <tbody>
+            <tr>
+                <td colspan="3">@T("There are no submissions yet.")</td>
+            </tr>
+        </tbody>
+    }
+    else {
+        <tbody class="forms">
+            @foreach (var form in Model.Forms) {
+                var formName = form.Key;
+                var submissions = form.Count();
+                <tr>
+                    <td>@formName</td>
+                    <td>@submissions</td>
+                    <td>@Html.ActionLink(T("Submissions").Text, "Index", "SubmissionAdmin", new { id = formName, area = "Orchard.DynamicForms" }, null)</td>
+                </tr>
+            }
+        </tbody>
+    }
+</table>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/BlueprintAdmin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/BlueprintAdmin/Index.cshtml
new file mode 100644
index 000000000..7a6f539a7
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/BlueprintAdmin/Index.cshtml
@@ -0,0 +1,42 @@
+@model Orchard.DynamicForms.ViewModels.BlueprintsIndexViewModel
+@{
+    Layout.Title = T("Element Blueprints");
+}
+<div class="manage">
+    @Html.ActionLink(T("Create").Text, "Create", new { area = "BlueprintAdmin" }, new { @class = "button primaryAction" })
+</div>
+@using (Html.BeginFormAntiForgeryPost()) {
+    <fieldset class="bulk-actions">
+        <label for="publishActions">@T("Actions:")</label>
+        <select id="publishActions" name="Options.BulkAction">
+            @Html.SelectOption("", false, T("Choose action...").ToString())
+            @Html.SelectOption("Delete", false, T("Delete").ToString())
+        </select>
+        <button type="submit" name="submit.BulkEdit" value="yes">@T("Apply")</button>
+    </fieldset>
+    <table class="items">
+        <thead>
+            <tr>
+                <th><input type="checkbox" class="check-all" /></th>
+                <th>@T("Display Name")</th>
+                <th>@T("Name")</th>
+                <th>@T("Base")</th>
+                <th></th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var blueprint in Model.Blueprints) {
+                <tr>
+                    <td><input type="checkbox" value="@blueprint.Id" name="blueprintIds" /></td>
+                    <td>@blueprint.ElementDisplayName</td>
+                    <td>@blueprint.ElementTypeName</td>
+                    <td>@blueprint.BaseElementTypeName</td>
+                    <td>
+	                    @Html.ActionLink(T("Edit").Text, "Edit", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.DynamicForms" }, null) @T(" | ")
+	                    @Html.ActionLink(T("Remove").Text, "Delete", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.DynamicForms" }, new { itemprop = "RemoveUrl UnsafeUrl" })
+                    </td>
+                </tr>
+            }
+        </tbody>
+    </table>
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/EditorTemplates/FormBindings.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/EditorTemplates/FormBindings.cshtml
new file mode 100644
index 000000000..b8adf5608
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/EditorTemplates/FormBindings.cshtml
@@ -0,0 +1,60 @@
+@using Orchard.DynamicForms.ViewModels
+@using Orchard.Utility.Extensions
+@model FormBindingSettings
+@{
+    Style.Include("forms-admin.css");
+    var partIndex = 0;
+}
+<fieldset class="bindings">
+    @foreach (var partDescriptor in Model.AvailableBindings.Where(x => x.BindingContexts.Any() || x.FieldBindings.Any())) {
+        var partBindingIndex = 0;
+        var fieldIndex = 0;
+        var partState = Model.Parts.ElementAtOrDefault(partIndex) ?? new PartBindingSettings();
+
+        <input type="hidden" name="Parts[@partIndex].Name" value="@partDescriptor.Part.PartDefinition.Name" />
+        <table class="items">
+            <thead>
+                <tr>
+                    <th class="property-name">@partDescriptor.Part.PartDefinition.Name</th>
+                    <th class="property-type">&nbsp;</th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach (var partBinding in partDescriptor.BindingContexts.SelectMany(x => x.Bindings)) {
+                    var partBindingId = String.Format("binding-{0}-{1}", partDescriptor.Part.PartDefinition.Name.HtmlClassify(), partBinding.Name.HtmlClassify());
+                    var partBindingState = partState.Bindings.ElementAtOrDefault(partBindingIndex) ?? new BindingSettings();
+                    <tr>
+                        <td colspan="2">
+                            <input type="hidden" name="Parts[@partIndex].Bindings[@partBindingIndex].Name" value="@partBinding.Name" />
+                            <input type="checkbox" id="@partBindingId" name="Parts[@partIndex].Bindings[@partBindingIndex].Enabled" value="@Boolean.TrueString" @if (partBindingState.Enabled) { <text> checked="checked" </text> } />
+                            <label class="forcheckbox" for="@partBindingId">@partBinding.Name</label>
+                        </td>
+                    </tr>
+partBindingIndex++;
+                }
+                @foreach (var fieldDescriptor in partDescriptor.FieldBindings) {
+                    var fieldBindingIndex = 0;
+                    var fieldState = partState.Fields.ElementAtOrDefault(fieldIndex) ?? new FieldBindingSettings();
+                    foreach (var fieldBinding in fieldDescriptor.BindingContexts.SelectMany(x => x.Bindings)) {
+                        var fieldBindingId = String.Format("binding-{0}-{1}-{2}", partDescriptor.Part.PartDefinition.Name.HtmlClassify(), fieldDescriptor.Field.Name.HtmlClassify(), fieldBinding.Name.HtmlClassify());
+                        var fieldBindingstate = fieldState.Bindings.ElementAtOrDefault(fieldBindingIndex) ?? new BindingSettings();
+                        <tr>
+                            <td class="property-name">
+                                <input type="hidden" name="Parts[@partIndex].Fields[@fieldIndex].Name" value="@fieldDescriptor.Field.Name" />
+                                <input type="hidden" name="Parts[@partIndex].Fields[@fieldIndex].Bindings[@fieldBindingIndex].Name" value="@fieldBinding.Name" />
+                                <input type="checkbox" id="@fieldBindingId" name="Parts[@partIndex].Fields[@fieldIndex].Bindings[@fieldBindingIndex].Enabled" value="@Boolean.TrueString" @if (fieldBindingstate.Enabled) { <text> checked="checked" </text> } />
+                                <label class="forcheckbox" for="@fieldBindingId">@String.Format("{0}.{1}", fieldDescriptor.Field.Name, fieldBinding.Name)</label>
+                            </td>
+                            <td class="property-type">
+                                @fieldDescriptor.Field.FieldDefinition.Name
+                            </td>
+                        </tr>
+fieldBindingIndex++;
+                    }
+                    fieldIndex++;
+                }
+            </tbody>
+        </table>
+                partIndex++;
+    }
+</fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Button.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Button.cshtml
new file mode 100644
index 000000000..c384fba8b
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Button.cshtml
@@ -0,0 +1,12 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@{
+    var element = (Button)Model.Element;
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("button"), Model);
+
+    tagBuilder.Attributes["type"] = "submit";
+    tagBuilder.Attributes["name"] = element.Name;
+    tagBuilder.SetInnerText(element.Text);
+}
+@Html.Raw(tagBuilder.ToString(TagRenderMode.Normal))
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Checkbox.Design.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Checkbox.Design.cshtml
new file mode 100644
index 000000000..b45bef9b3
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Checkbox.Design.cshtml
@@ -0,0 +1,20 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@{
+    var element = (CheckBox)Model.Element;
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+    
+    tagBuilder.Attributes["type"] = "checkbox";
+    tagBuilder.Attributes["name"] = element.Name;
+    tagBuilder.Attributes["value"] = element.Value;
+}
+@if (element.ShowLabel) {
+    <label>
+        @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+        @Html.Raw(element.Label)
+    </label>
+}
+else {
+    @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Checkbox.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Checkbox.cshtml
new file mode 100644
index 000000000..3cbd2fc1e
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Checkbox.cshtml
@@ -0,0 +1,24 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@{
+    var element = (CheckBox)Model.Element;
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+
+    tagBuilder.Attributes["type"] = "checkbox";
+    tagBuilder.Attributes["name"] = element.Name;
+    tagBuilder.Attributes["value"] = Model.TokenizedValue;
+    tagBuilder.AddClientValidationAttributes((IDictionary<string, string>)Model.ClientValidationAttributes);
+}
+@if (element.ShowLabel) {
+    <label>
+        @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+        @Html.Raw(element.Label)
+    </label>
+}
+else {
+    @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+}
+@if (element.ValidationSettings.ShowValidationMessage == true) {
+    @Html.ValidationMessage(element.Name)
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Enumeration-CheckList.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Enumeration-CheckList.cshtml
new file mode 100644
index 000000000..232fec701
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Enumeration-CheckList.cshtml
@@ -0,0 +1,20 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@{
+    var element = (Enumeration)Model.Element;
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+}
+@if (element.ShowLabel) {
+    <label>@Html.Raw(element.Label)</label>
+}
+@tagBuilder.StartElement
+@foreach (var option in Model.TokenizedOptions) {
+    <li>
+        <label>
+            <input type="checkbox" name="@element.Name" value="@option.Value" />
+            @option.Text
+        </label>
+    </li>
+}
+@tagBuilder.EndElement
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Enumeration-MultiSelectList.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Enumeration-MultiSelectList.cshtml
new file mode 100644
index 000000000..3e70d1875
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Enumeration-MultiSelectList.cshtml
@@ -0,0 +1,14 @@
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Settings
+@{
+    var element = (Enumeration)Model.Element;
+    var commonSettings = element.State.GetModel<CommonElementSettings>();
+    var attributes = (IDictionary<string, object>)TagBuilderExtensions.GetCommonElementAttributes(Model);
+    var name = String.IsNullOrWhiteSpace(element.Name) ? "MultiSelectList1" : element.Name;
+    var options = (IEnumerable<SelectListItem>)Model.TokenizedOptions;
+}
+@if (element.ShowLabel) {
+    <label for="@commonSettings.Id">@Html.Raw(element.Label)</label>
+}
+@Html.ListBox(name, options, attributes)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Enumeration-RadioList.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Enumeration-RadioList.cshtml
new file mode 100644
index 000000000..348697e56
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Enumeration-RadioList.cshtml
@@ -0,0 +1,20 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@{
+    var element = (Enumeration)Model.Element;
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+}
+@if (element.ShowLabel) {
+    <label>@Html.Raw(element.Label)</label>
+}
+@tagBuilder.StartElement
+@foreach (var option in Model.TokenizedOptions) {
+    <li>
+        <label>
+            <input type="radio" name="@element.Name" value="@option.Value" />
+            @option.Text
+        </label>
+    </li>
+}
+@tagBuilder.EndElement
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Enumeration-SelectList.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Enumeration-SelectList.cshtml
new file mode 100644
index 000000000..c4f3d7398
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Enumeration-SelectList.cshtml
@@ -0,0 +1,14 @@
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Settings
+@{
+    var element = (Enumeration)Model.Element;
+    var commonSettings = element.State.GetModel<CommonElementSettings>();
+    var attributes = (IDictionary<string, object>)TagBuilderExtensions.GetCommonElementAttributes(Model);
+    var name = String.IsNullOrWhiteSpace(element.Name) ? "SelectList1" : element.Name;
+    var options = (IEnumerable<SelectListItem>)Model.TokenizedOptions;
+}
+@if (element.ShowLabel) {
+    <label for="@commonSettings.Id">@Html.Raw(element.Label)</label>
+}
+@Html.DropDownList(name, options, attributes)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-HiddenField.Design.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-HiddenField.Design.cshtml
new file mode 100644
index 000000000..b87c96360
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-HiddenField.Design.cshtml
@@ -0,0 +1,5 @@
+@using Orchard.DynamicForms.Elements
+@{
+    var element = (HiddenField) Model.Element;
+}
+<div class="hidden-field">@element.Name</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-HiddenField.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-HiddenField.cshtml
new file mode 100644
index 000000000..2b614cee3
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-HiddenField.cshtml
@@ -0,0 +1,14 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@{
+    var element = (HiddenField) Model.Element;
+    var tagBuilder = TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+
+    tagBuilder.AddCssClass("text");
+    tagBuilder.Attributes["type"] = "hidden";
+    tagBuilder.Attributes["value"] = Model.TokenizedValue;
+    tagBuilder.Attributes["name"] = element.Name;
+}
+
+@Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-IpAddressField.Design.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-IpAddressField.Design.cshtml
new file mode 100644
index 000000000..de0b22120
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-IpAddressField.Design.cshtml
@@ -0,0 +1 @@
+<div class="hidden-field">@T("IP Address")</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-IpAddressField.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-IpAddressField.cshtml
new file mode 100644
index 000000000..ee6aea494
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-IpAddressField.cshtml
@@ -0,0 +1 @@
+<!--IP Address Field Element-->
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Label.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Label.cshtml
new file mode 100644
index 000000000..eda1ede3f
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Label.cshtml
@@ -0,0 +1,12 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@{
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("label"), Model);
+    var label = (Label) Model.Element;
+    
+    tagBuilder.Attributes["for"] = label.For;
+    tagBuilder.InnerHtml = label.Text;
+}
+
+@Html.Raw(tagBuilder.ToString(TagRenderMode.Normal))
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-RadioButton.Design.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-RadioButton.Design.cshtml
new file mode 100644
index 000000000..d7df2fda2
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-RadioButton.Design.cshtml
@@ -0,0 +1,20 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@{
+    var element = (RadioButton)Model.Element;
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+
+    tagBuilder.Attributes["type"] = "radio";
+    tagBuilder.Attributes["name"] = element.Name;
+    tagBuilder.Attributes["value"] = element.Value;
+}
+@if (element.ShowLabel) {
+    <label>
+        @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+        @Html.Raw(element.Label)
+    </label>
+}
+else {
+    @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-RadioButton.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-RadioButton.cshtml
new file mode 100644
index 000000000..dc98d157a
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-RadioButton.cshtml
@@ -0,0 +1,20 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@{
+    var element = (RadioButton)Model.Element;
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+
+    tagBuilder.Attributes["type"] = "radio";
+    tagBuilder.Attributes["name"] = element.Name;
+    tagBuilder.Attributes["value"] = Model.TokenizedValue;
+}
+@if (element.ShowLabel) {
+    <label>
+        @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+        @Html.Raw(element.Label)
+    </label>
+}
+else {
+    @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Taxonomy-CheckList.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Taxonomy-CheckList.cshtml
new file mode 100644
index 000000000..2d1ed17cb
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Taxonomy-CheckList.cshtml
@@ -0,0 +1,20 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@{
+    var element = (Taxonomy)Model.Element;
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+}
+@if (element.ShowLabel) {
+    <label>@Html.Raw(element.Label)</label>
+}
+@tagBuilder.StartElement
+@foreach (var option in Model.TermOptions) {
+    <li>
+        <label>
+            <input type="checkbox" name="@element.Name" value="@option.Value" />
+            @option.Text
+        </label>
+    </li>
+}
+@tagBuilder.EndElement
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Taxonomy-MultiSelectList.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Taxonomy-MultiSelectList.cshtml
new file mode 100644
index 000000000..763c07cc2
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Taxonomy-MultiSelectList.cshtml
@@ -0,0 +1,14 @@
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Settings
+@{
+    var element = (Taxonomy)Model.Element;
+    var commonSettings = element.State.GetModel<CommonElementSettings>();
+    var attributes = (IDictionary<string, object>)TagBuilderExtensions.GetCommonElementAttributes(Model);
+    var name = String.IsNullOrWhiteSpace(element.Name) ? "MultiSelectList1" : element.Name;
+    var options = (IEnumerable<SelectListItem>)Model.TermOptions;
+}
+@if (element.ShowLabel) {
+    <label for="@commonSettings.Id">@Html.Raw(element.Label)</label>
+}
+@Html.ListBox(name, options, attributes)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Taxonomy-RadioList.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Taxonomy-RadioList.cshtml
new file mode 100644
index 000000000..d3317b614
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Taxonomy-RadioList.cshtml
@@ -0,0 +1,20 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@{
+    var element = (Taxonomy)Model.Element;
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("ol"), Model);
+}
+@if (element.ShowLabel) {
+    <label>@Html.Raw(element.Label)</label>
+}
+@tagBuilder.StartElement
+@foreach (var option in Model.TermOptions) {
+    <li>
+        <label>
+            <input type="radio" name="@element.Name" value="@option.Value" />
+            @option.Text
+        </label>
+    </li>
+}
+@tagBuilder.EndElement
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Taxonomy-SelectList.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Taxonomy-SelectList.cshtml
new file mode 100644
index 000000000..cda1a4787
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-Taxonomy-SelectList.cshtml
@@ -0,0 +1,14 @@
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Settings
+@{
+    var element = (Taxonomy)Model.Element;
+    var commonSettings = element.State.GetModel<CommonElementSettings>();
+    var attributes = (IDictionary<string, object>)TagBuilderExtensions.GetCommonElementAttributes(Model);
+    var name = String.IsNullOrWhiteSpace(element.Name) ? "SelectList1" : element.Name;
+    var options = (IEnumerable<SelectListItem>)Model.TermOptions;
+}
+@if (element.ShowLabel) {
+    <label for="@commonSettings.Id">@Html.Raw(element.Label)</label>
+}
+@Html.DropDownList(name, options, attributes)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-TextArea.Design.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-TextArea.Design.cshtml
new file mode 100644
index 000000000..e6d619730
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-TextArea.Design.cshtml
@@ -0,0 +1,32 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Settings
+@{
+    var element = (TextArea)Model.Element;
+    var commonSettings = element.State.GetModel<CommonElementSettings>();
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("textarea"), Model);
+
+    tagBuilder.AddCssClass("text design");
+    tagBuilder.Attributes["name"] = element.Name;
+
+    if (element.Rows != null) {
+        tagBuilder.Attributes["rows"] = element.Rows.ToString();
+    }
+
+    if (element.Columns != null) {
+        tagBuilder.Attributes["cols"] = element.Columns.ToString();
+    }
+
+    tagBuilder.SetInnerText(element.Value);
+}
+
+@if (element.ShowLabel) {
+    <div>
+        <label for="@commonSettings.Id">@element.Label</label>
+        @Html.Raw(tagBuilder.ToString(TagRenderMode.Normal))
+    </div>
+}
+else {
+    @Html.Raw(tagBuilder.ToString(TagRenderMode.Normal))
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-TextArea.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-TextArea.cshtml
new file mode 100644
index 000000000..a426b66ea
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-TextArea.cshtml
@@ -0,0 +1,32 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Settings
+@{
+    var element = (TextArea)Model.Element;
+    var commonSettings = element.State.GetModel<CommonElementSettings>();
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("textarea"), Model);
+
+    tagBuilder.AddCssClass("text");
+    tagBuilder.Attributes["name"] = element.Name;
+    tagBuilder.AddClientValidationAttributes((IDictionary<string, string>)Model.ClientValidationAttributes);
+
+    if (element.Rows != null) {
+        tagBuilder.Attributes["rows"] = element.Rows.ToString();
+    }
+
+    if (element.Columns != null) {
+        tagBuilder.Attributes["cols"] = element.Columns.ToString();
+    }
+
+    if (!ViewData.ModelState.IsValidField(element.Name)) {
+        tagBuilder.AddCssClass("input-validation-error");
+    }
+
+    tagBuilder.SetInnerText(Model.TokenizedValue);
+}
+@if (element.ShowLabel) {
+    <label for="@commonSettings.Id">@element.Label</label>
+}
+
+@Html.Raw(tagBuilder.ToString(TagRenderMode.Normal))
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-TextField.Design.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-TextField.Design.cshtml
new file mode 100644
index 000000000..5a937b2e2
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-TextField.Design.cshtml
@@ -0,0 +1,24 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Settings
+@{
+    var element = (TextField)Model.Element;
+    var commonSettings = element.State.GetModel<CommonElementSettings>();
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+
+    tagBuilder.AddCssClass("text design");
+    tagBuilder.Attributes["type"] = "text";
+    tagBuilder.Attributes["value"] = element.Value;
+    tagBuilder.Attributes["name"] = element.Name;
+}
+
+@if (element.ShowLabel) {
+    <div>
+        <label for="@commonSettings.Id">@element.Label</label>
+        @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+    </div>
+}
+else {
+    @Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-TextField.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-TextField.cshtml
new file mode 100644
index 000000000..c8bbdc24a
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-TextField.cshtml
@@ -0,0 +1,27 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@using Orchard.Layouts.Settings
+@{
+    var element = (TextField)Model.Element;
+    var commonSettings = element.State.GetModel<CommonElementSettings>();
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("input"), Model);
+
+    tagBuilder.AddCssClass("text");
+    tagBuilder.Attributes["type"] = "text";
+    tagBuilder.Attributes["value"] = Model.TokenizedValue;
+    tagBuilder.Attributes["name"] = element.Name;
+    tagBuilder.AddClientValidationAttributes((IDictionary<string, string>)Model.ClientValidationAttributes);
+
+    if (!ViewData.ModelState.IsValidField(element.Name)) {
+        tagBuilder.AddCssClass("input-validation-error");
+    }
+}
+
+@if (element.ShowLabel) {
+    <label for="@commonSettings.Id">@element.Label</label>
+}
+@Html.Raw(tagBuilder.ToString(TagRenderMode.SelfClosing))
+@if (element.ValidationSettings.ShowValidationMessage == true) {
+    @Html.ValidationMessage(element.Name)
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-UserNameField.Design.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-UserNameField.Design.cshtml
new file mode 100644
index 000000000..064f7c5f7
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-UserNameField.Design.cshtml
@@ -0,0 +1 @@
+<div class="hidden-field">@T("User Name")</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-UserNameField.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-UserNameField.cshtml
new file mode 100644
index 000000000..874332500
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-UserNameField.cshtml
@@ -0,0 +1 @@
+<!--UserName Field Element-->
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-ValidationMessage.Design.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-ValidationMessage.Design.cshtml
new file mode 100644
index 000000000..0b7a47a19
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-ValidationMessage.Design.cshtml
@@ -0,0 +1,4 @@
+@{
+    var forFieldName = (string) Model.ValidationMessageFor;
+}
+<div class="hidden-field">@T("Validation message for {0}", forFieldName)</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-ValidationMessage.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-ValidationMessage.cshtml
new file mode 100644
index 000000000..c0b4a9af3
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-ValidationMessage.cshtml
@@ -0,0 +1,6 @@
+@using Orchard.Layouts.Helpers
+@{
+    var forFieldName = (string) Model.ValidationMessageFor;
+    var commonAttributes = (IDictionary<string, object>) TagBuilderExtensions.GetCommonElementAttributes(Model);
+}
+@Html.ValidationMessage(forFieldName, commonAttributes)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-ValidationSummary.Design.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-ValidationSummary.Design.cshtml
new file mode 100644
index 000000000..f9ee823e4
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-ValidationSummary.Design.cshtml
@@ -0,0 +1 @@
+<div class="hidden-field">@T("Validation summary")</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-ValidationSummary.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-ValidationSummary.cshtml
new file mode 100644
index 000000000..0280113fc
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form-ValidationSummary.cshtml
@@ -0,0 +1 @@
+@Html.ValidationSummary()
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form.Design.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form.Design.cshtml
new file mode 100644
index 000000000..af22b2b0a
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form.Design.cshtml
@@ -0,0 +1,35 @@
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@using Orchard.Utility.Extensions
+@{
+    Style.Include("form.designer.css");
+}
+@{
+    var element = (Form)Model.Element;
+    var isTemplated = element.IsTemplated;
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
+    var formTitle = !String.IsNullOrWhiteSpace(element.Name) ? element.Name.CamelFriendly() : T("Form").Text;
+
+    tagBuilder.AddCssClass("x-element x-container x-form");
+    tagBuilder.Attributes["data-element"] = Model.ElementJson;
+}
+<div class="x-form x-element x-container @if (isTemplated) {<text>templated</text>}" data-element="@Model.ElementJson">
+    @if (!isTemplated) {
+        <div class="drag-handle">
+            <div class="toolbar form-toolbar group">
+                <div class="pull-left">
+                    <a class="edit icon-cog" href="#" title="@T("Edit form properties")"></a>
+                    <a class="remove icon-trash" href="#" title="@T("Remove form")"></a>
+                </div>
+                <div class="pull-right">
+                    <span class="name">@formTitle</span>
+                </div>
+            </div>
+        </div>
+    }
+    <div class="element container x-holder drop-target">
+        @DisplayChildren(Model)
+    </div>
+    <a href="#" class="add" title="@T("Add Element")"></a>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form.cshtml
new file mode 100644
index 000000000..31d263957
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Element-Form.cshtml
@@ -0,0 +1,36 @@
+@using Orchard.ContentManagement
+@using Orchard.DisplayManagement.Shapes
+@using Orchard.DynamicForms.Elements
+@using Orchard.Layouts.Helpers
+@{
+    Style.Include("form-elements.css");
+}
+@{
+    var contentItem = (ContentItem) Model.ContentItem;
+    var element = (Form) Model.Element;
+    var tagBuilder = (OrchardTagBuilder)TagBuilderExtensions.AddCommonElementAttributes(new OrchardTagBuilder("div"), Model);
+    var formName = element.Name;
+    var formAction = String.IsNullOrWhiteSpace(element.Action) ? Url.Action("Submit", "Form", new { area = "Orchard.DynamicForms"}) : element.Action;
+    var formMethod = !String.IsNullOrWhiteSpace(element.Method) ? element.Method : "POST";
+    
+    tagBuilder.AddCssClass("dynamic-form");
+
+    if (element.EnableClientValidation == true) {
+        Script.Require("jQuery").AtFoot();
+        Script.Include("jquery.validate.js", "jquery.validate.min.js").AtFoot();
+        Script.Include("jquery.validate.unobtrusive.js", "jquery.validate.unobtrusive.min.js").AtFoot();
+        Script.Include("jquery.validate.unobtrusive.additional.js").AtFoot();
+
+        Html.EnableUnobtrusiveJavaScript();
+        Html.EnableClientValidation();
+    }
+    
+}
+@tagBuilder.StartElement
+<form action="@formAction" method="@formMethod" enctype="multipart/form-data">
+    @DisplayChildren(Model)
+    <input type="hidden" name="formName" value="@formName" />
+    <input type="hidden" name="contentId" value="@contentItem.Id" />
+    @Html.AntiForgeryToken()
+</form>
+@tagBuilder.EndElement
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/FormElement.Wrapper.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/FormElement.Wrapper.cshtml
new file mode 100644
index 000000000..5a9d34eac
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/FormElement.Wrapper.cshtml
@@ -0,0 +1,10 @@
+@using Orchard.DynamicForms.Elements
+@using Orchard.Utility.Extensions
+@{
+    var element = (FormElement) Model.Element;
+    var cssType = String.Format("form-field-element-{0}", element.Descriptor.DisplayText.Text.HtmlClassify());
+    var cssName = !String.IsNullOrWhiteSpace(element.Name) ? String.Format("form-field-element-{0}", element.Name.HtmlClassify()) : default(string);
+}
+<div class="form-field-element @cssType @cssName">
+    @Display(Model.Child)
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/SubmissionAdmin/Details.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/SubmissionAdmin/Details.cshtml
new file mode 100644
index 000000000..3c7582d57
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/SubmissionAdmin/Details.cshtml
@@ -0,0 +1,32 @@
+@model Orchard.DynamicForms.ViewModels.SubmissionViewModel
+@{
+    Style.Include("forms-admin.css");
+    Script.Require("ShapesBase");
+}
+@{
+    Layout.Title = T("Submission for {0}", Model.Submission.FormName);
+}
+<table class="items">
+    <thead>
+        <tr>
+            <th>@T("Field")</th>
+            <th>@T("Value")</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>@T("ID")</td>
+            <td>@Model.Submission.Id</td>
+        </tr>
+        <tr>
+            <td>@T("Created")</td>
+            <td>@Display.DateTime(DateTimeUtc: Model.Submission.CreatedUtc)</td>
+        </tr>
+        @foreach (string key in Model.NameValues) {
+            <tr>
+                <td>@key</td>
+                <td>@Model.NameValues[key]</td>
+            </tr>
+        }
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/SubmissionAdmin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/SubmissionAdmin/Index.cshtml
new file mode 100644
index 000000000..4cb021a3e
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/SubmissionAdmin/Index.cshtml
@@ -0,0 +1,53 @@
+@using System.Data
+@using Orchard.Utility.Extensions
+@model Orchard.DynamicForms.ViewModels.SubmissionsIndexViewModel
+@{
+    Style.Include("forms-admin.css");
+    Script.Require("ShapesBase");
+    Layout.Title = T("Submissions for {0}", Model.FormName);
+}
+@{
+    var dataColumns = new List<DataColumn>();
+    var dataColumnCount = Model.Submissions.Columns.Count > 11 ? 11 : Model.Submissions.Columns.Count;
+
+    for (var i = 0; i < dataColumnCount; i++) {
+        dataColumns.Add(Model.Submissions.Columns[i]);
+    }
+}
+@using (Html.BeginFormAntiForgeryPost()) {
+    <fieldset class="bulk-actions">
+        <label for="publishActions">@T("Actions:")</label>
+        <select id="publishActions" name="Options.BulkAction">
+            @Html.SelectOption("", false, T("Choose action...").ToString())
+            @Html.SelectOption("Delete", false, T("Delete").ToString())
+        </select>
+        <button type="submit" name="submit.BulkEdit" value="yes">@T("Apply")</button>
+    </fieldset>
+    <table class="items dynamic-forms-submissions">
+        <thead>
+            <tr>
+                <th><input type="checkbox" class="check-all" /></th>
+                @foreach (var dataColumn in dataColumns) {
+                    <th>@dataColumn.ToString().CamelFriendly()</th>
+                }
+                <th></th>
+            </tr>
+        </thead>
+        <tbody class="submissions">
+            @foreach (DataRow dataRow in Model.Submissions.Rows) {
+                var id = dataRow["Id"];
+                <tr>
+                    <td><input type="checkbox" value="@id" name="submissionIds" /></td>
+                    @foreach (var dataColumn in dataColumns) {
+                        <td>@dataRow[dataColumn]</td>
+                    }
+                    <td>
+                        @Html.ActionLink(T("Details").Text, "Details", "SubmissionAdmin", new { id = id, area = "Orchard.DynamicForms" }, null) @T(" | ")
+                        @Html.ActionLink(T("Remove").Text, "Delete", "SubmissionAdmin", new { id = id, area = "Orchard.DynamicForms" }, new { itemprop = "RemoveUrl UnsafeUrl" })
+                    </td>
+                </tr>
+            }
+        </tbody>
+    </table>
+    @Display(Model.Pager)
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config b/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
new file mode 100644
index 000000000..980856b01
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<configuration>
+  <configSections>
+    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <remove name="host"/>
+      <remove name="pages"/>
+      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false"/>
+      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false"/>
+    </sectionGroup>
+  </configSections>
+  <system.web.webPages.razor>
+    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+    <pages pageBaseType="Orchard.Mvc.ViewEngines.Razor.WebViewPage">
+      <namespaces>
+        <add namespace="System.Web.Mvc"/>
+        <add namespace="System.Web.Mvc.Ajax"/>
+        <add namespace="System.Web.Mvc.Html"/>
+        <add namespace="System.Web.Routing"/>
+        <add namespace="System.Web.WebPages"/>
+        <add namespace="System.Linq"/>
+        <add namespace="System.Collections.Generic"/>
+        <add namespace="Orchard.Mvc.Html"/>
+      </namespaces>
+    </pages>
+  </system.web.webPages.razor>
+  <!--
+    For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
+
+    The following attributes can be set on the <httpRuntime> tag.
+      <system.Web>
+        <httpRuntime targetFramework="4.5.1" />
+      </system.Web>
+  -->
+  <system.web>
+    <compilation targetFramework="4.5.1">
+      <assemblies>
+        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+        <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+        <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+        <add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+        <add assembly="System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <add assembly="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+      </assemblies>
+    </compilation>
+  </system.web>
+</configuration>
\ No newline at end of file
diff --git a/src/Orchard.sln b/src/Orchard.sln
index e72c3f6a5..9426ecded 100644
--- a/src/Orchard.sln
+++ b/src/Orchard.sln
@@ -245,6 +245,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.AuditTrail", "Orcha
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Layouts", "Orchard.Web\Modules\Orchard.Layouts\Orchard.Layouts.csproj", "{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.DynamicForms", "Orchard.Web\Modules\Orchard.DynamicForms\Orchard.DynamicForms.csproj", "{82190F52-2901-46D6-8A4C-34649959483F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CodeCoverage|Any CPU = CodeCoverage|Any CPU
@@ -1020,6 +1022,16 @@ Global
 		{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}.FxCop|Any CPU.Build.0 = Release|Any CPU
 		{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82190F52-2901-46D6-8A4C-34649959483F}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU
+		{82190F52-2901-46D6-8A4C-34649959483F}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU
+		{82190F52-2901-46D6-8A4C-34649959483F}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
+		{82190F52-2901-46D6-8A4C-34649959483F}.Coverage|Any CPU.Build.0 = Release|Any CPU
+		{82190F52-2901-46D6-8A4C-34649959483F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82190F52-2901-46D6-8A4C-34649959483F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82190F52-2901-46D6-8A4C-34649959483F}.FxCop|Any CPU.ActiveCfg = Release|Any CPU
+		{82190F52-2901-46D6-8A4C-34649959483F}.FxCop|Any CPU.Build.0 = Release|Any CPU
+		{82190F52-2901-46D6-8A4C-34649959483F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82190F52-2901-46D6-8A4C-34649959483F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1100,5 +1112,6 @@ Global
 		{14A96B1A-9DC9-44C8-A675-206329E15263} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
 		{3DD574CD-9C5D-4A45-85E1-EBBA64C22B5F} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
 		{6BD8B2FA-F2E3-4AC8-A4C3-2925A653889A} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
+		{82190F52-2901-46D6-8A4C-34649959483F} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
 	EndGlobalSection
 EndGlobal