Merge pull request #436 from kgiszewski/feature/slow-the-updates-roll

Feature/slow the updates roll
Merge logic
2017-10-07 07:10:36 -04:00 · 2017-10-03 13:31:43 -04:00 · 2017-10-03 13:28:25 -04:00 · 2017-10-03 13:27:03 -04:00 · 2017-10-03 11:07:10 -04:00 · 2017-10-03 08:56:52 -04:00
118 changed files with 7538 additions and 1578 deletions
@@ -13,16 +13,20 @@ $RECYCLE.BIN/
 app/less/*.css
 dist/
 node_modules/
-pkg/tmp/
+tmp/
 pkg/*.nupkg
 pkg/*.zip

+*_versioned*
+
+
 [Dd]ebug/
 [Bb]uild/
 [Rr]elease/
 [Bb]in/
 [Oo]bj/
 [Pp]ackages/
+VersionInfo.cs

 *.aps
 *.bak
@@ -58,4 +62,5 @@ pkg/*.zip
 .builds
 .svn
 .hg
-.hgignore
+.hgignore
+app/Umbraco/.vs/config/applicationhost.config
@@ -1,54 +1,77 @@
 module.exports = function(grunt) {
+  require('load-grunt-tasks')(grunt);
+  var path = require('path');
+  
  grunt.initConfig({
    pkg: grunt.file.readJSON('package.json'),
-    pkgMeta: grunt.file.readJSON('pkg/meta.json'),
-    dest: 'dist',
-    package_dir: 'pkg',
-    package_temp_dir: '<%= package_dir %>/tmp/',
+    pkgMeta: grunt.file.readJSON('config/meta.json'),
+    dest: grunt.option('target') || 'dist',
+    basePath: path.join('<%= dest %>', 'App_Plugins', '<%= pkgMeta.name %>'),

-
-    watch: {
-      less: {
-        files: ['app/less/*.less', 'lib/**/*.less'],
-        tasks: ['less:build'],
+    'string-replace': {
+      version: {
+        files: {
+          "app/controllers/controller_versioned.js": "app/controllers/controller.js",
+          "app/less/archetype_versioned.less": "app/less/archetype.less",
+          "app/views/archetype.config.developer.dialog_versioned.html": "app/views/archetype.config.developer.dialog.html",
+          "app/views/archetype.config.stylescript.dialog_versioned.html": "app/views/archetype.config.stylescript.dialog.html",
+          "app/views/archetype.config.fieldset.dialog_versioned.html": "app/views/archetype.config.fieldset.dialog.html",
+          "app/views/archetype.config_versioned.html": "app/views/archetype.config.html",
+          "app/views/archetype_versioned.html": "app/views/archetype.html",
+          "app/views/archetype.default_versioned.html": "app/views/archetype.default.html"
+        },
        options: {
-          spawn: false
-        }
-      },
-
-      js: {
-        files: ['app/**/*.js', 'lib/**/*.js'],
-        tasks: ['concat', 'jshint'],
-        options: {
-          spawn: false
-        }
-      },
-
-      dev: {
-        files: ['app/**'],
-        tasks: ['deploy'],
-        options: {
-          spawn: false
+          replacements: [{
+            pattern: /{{VERSION}}/g,
+            replacement: '/* Version <%= pkgMeta.version %> */'
+          },
+          {
+            pattern: /{{VERSION_HTML}}/g,
+            replacement: '<!-- Version <%= pkgMeta.version %> -->'
+          }]
        }
      }
    },
-
-    jshint: {
+    
+    watch: {
      options: {
-        jshintrc: '.jshintrc'
+        spawn: false,
+        atBegin: true
      },
-      src: {
-        src: ['app/**/*.js', 'lib/**/*.js']
+
+      less: {
+        files: ['app/**/*.less'],
+        tasks: ['string-replace', 'less:dist']
+      },
+
+      js: {
+        files: ['app/**/*.js'],
+        tasks: ['string-replace', 'concat:dist']
+      },
+
+      html: {
+        files: ['app/**/*.html'],
+        tasks: ['string-replace', 'copy:html']
+      },
+
+      dll: {
+        files: ['app/Umbraco/**/*.dll'],
+        tasks: ['copy:dll']
+      },
+      
+      assets: {
+        files: ['assets/*.*'],
+        tasks: ['copy:assets']
      }
    },

    less: {
-      build: {
+      dist: {
        options: {
          paths: ["app/less", "lib/less", "vendor"],
        },
        files: {
-          '<%= dest %>/css/archetype.css': 'app/less/archetype.less',
+          '<%= basePath %>/css/archetype.css': 'app/less/archetype_versioned.less',
        }
      }
    },
@@ -57,149 +80,247 @@ module.exports = function(grunt) {
      options: {
        stripBanners: false
      },
-      application: {
+      dist: {
        src: [
-          'app/controllers/controller.js',
+          'app/controllers/controller_versioned.js',
          'app/controllers/config.controller.js',
+          'app/controllers/config.dialog.controller.js',
+          'app/controllers/config.global.controller.js',
          'app/directives/archetypeproperty.js',
-          'app/directives/localize.js',
-          'app/services/localization.js',
-          'app/resources/propertyeditor.js'
+          'app/directives/archetypesubmitwatcher.js',
+          'app/directives/archetypecustomview.js',
+          'app/directives/archetypeLocalize.js',
+          'app/directives/archetypeclickoutside.js',
+          'app/services/archetypeLocalizationService.js',
+          'app/helpers/sampleLabelHelpers.js',
+          'app/resources/archetypePropertyEditorResource.js',
+          'app/services/archetypeService.js',
+          'app/services/archetypeLabelService.js',
+          'app/services/archetypeCacheService.js',
+          'app/services/archetypeGlobalConfigService.js'
        ],
-        dest: '<%= dest %>/js/archetype.js'
+        dest: '<%= basePath %>/js/archetype.js'
+      }
+    },
+
+    copy: {
+      html: {
+        cwd: 'app/views/',
+        src: [
+            'archetype_versioned.html', 
+            'archetype.default_versioned.html', 
+            'archetype.config_versioned.html', 
+            'archetype.config.fieldset.dialog_versioned.html', 
+            'archetype.config.stylescript.dialog_versioned.html', 
+            'archetype.config.developer.dialog_versioned.html'
+        ],
+        dest: '<%= basePath %>/views/',
+        expand: true,
+        rename: function(dest, src) {
+            return dest + src.replace('_versioned','');
+          }
+      },
+      assets: {
+        cwd: 'assets/',
+        src: ['*.*'],
+        dest: '<%= basePath %>/assets',
+        expand: true
+      },
+      dll: {
+        cwd: 'app/Umbraco/Umbraco.Archetype/bin/Release/',
+        src: 'Archetype.dll',
+        dest: '<%= dest %>/bin/',
+        expand: true
+      },
+      config: {
+        files: [
+          {
+            cwd: 'app/langs/',
+            src: ['**'],
+            dest: '<%= basePath %>/langs',
+            expand: true
+          }
+        ]
+      },
+      nuget: {
+        files: [
+          {
+            cwd: '<%= dest %>',
+            src: ['**/*', '!bin', '!bin/*'],
+            dest: 'tmp/nuget/content',
+            expand: true
+          },
+          {
+            cwd: '<%= dest %>/bin',
+            src: ['*.dll'],
+            dest: 'tmp/nuget_binaries/lib/net40',
+            expand: true
+          },
+          {
+            cwd: 'app/Umbraco/Archetype.Courier/bin/Release/',
+            src: ['Archetype.Courier.dll'],
+            dest: 'tmp/nuget_courier/lib/net40',
+            expand: true
+          }
+        ]
+      },
+      umbraco: {
+        cwd: '<%= dest %>',
+        src: '**/*',
+        dest: 'tmp/umbraco',
+        expand: true
      }
    },

    nugetpack: {
-    	dist: {
-    		src: '<%= package_temp_dir %>/nuget/package.nuspec',
-    		dest: '<%= package_dir %>'
-    	}
+        dist: {
+            src: 'tmp/nuget/package.nuspec',
+            dest: 'pkg'
+        },
+        dist_binaries: {
+            src: 'tmp/nuget_binaries/package_binaries.nuspec',
+            dest: 'pkg'
+        },
+        dist_courier: {
+            src: 'tmp/nuget_courier/package_courier.nuspec',
+            dest: 'pkg'
+        }
    },

    template: {
-    	'nuget_manifest': {
-			'options': {
-    			'data': { 
-            name: '<%= pkgMeta.name %>',
-    				version: '<%= pkgMeta.version %>',
-            url: '<%= pkgMeta.url %>',
-            license: '<%= pkgMeta.license %>',
-            licenseUrl: '<%= pkgMeta.licenseUrl %>',
-            author: '<%= pkgMeta.author %>',
-            authorUrl: '<%= pkgMeta.authorUrl %>',
+        'nuspec': {
+            'options': {
+                'data': { 
+                    name: '<%= pkgMeta.name %>',
+                    version: '<%= pkgMeta.version %>',
+                    url: '<%= pkgMeta.url %>',
+                    license: '<%= pkgMeta.license %>',
+                    licenseUrl: '<%= pkgMeta.licenseUrl %>',
+                    author: '<%= pkgMeta.author %>',
+                    authorUrl: '<%= pkgMeta.authorUrl %>'
+                }
+            },
+            'files': { 
+                'tmp/nuget/package.nuspec': ['config/package.nuspec']
+            }
+        },
+        'nuspec_binaries': {
+            'options': {
+                'data': { 
+                    name: '<%= pkgMeta.name %>.Binaries',
+                    version: '<%= pkgMeta.version %>',
+                    url: '<%= pkgMeta.url %>',
+                    license: '<%= pkgMeta.license %>',
+                    licenseUrl: '<%= pkgMeta.licenseUrl %>',
+                    author: '<%= pkgMeta.author %>',
+                    authorUrl: '<%= pkgMeta.authorUrl %>'
+                }
+            },
+            'files': { 
+                'tmp/nuget_binaries/package_binaries.nuspec': ['config/package_binaries.nuspec']
+            }
+        },
+        'nuspec_courier': {
+            'options': {
+                'data': { 
+                    name: '<%= pkgMeta.name %>.Courier',
+                    version: '<%= pkgMeta.version %>',
+                    url: '<%= pkgMeta.url %>',
+                    license: '<%= pkgMeta.license %>',
+                    licenseUrl: '<%= pkgMeta.licenseUrl %>',
+                    author: '<%= pkgMeta.author %>',
+                    authorUrl: '<%= pkgMeta.authorUrl %>'
+                }
+            },
+            'files': { 
+                'tmp/nuget_courier/package_courier.nuspec': ['config/package_courier.nuspec']
+            }
+        }
+    },

-    				files: [{ path: '..\\..\\..\\<%= dest %>\\**', target: 'content\\App_Plugins\\Archetype'}]
-	    		}
-    		},
-    		'files': { 
-    			'<%= package_temp_dir %>/nuget/package.nuspec': ['<%= package_dir %>/nuget/package.nuspec']
-    		}
-    	}
+    umbracoPackage: {
+      dist: {
+        src: 'tmp/umbraco',
+        dest: 'pkg',
+        options: {
+          name: "<%= pkgMeta.name %>",
+          version: '<%= pkgMeta.version %>',
+          url: '<%= pkgMeta.url %>',
+          license: '<%= pkgMeta.license %>',
+          licenseUrl: '<%= pkgMeta.licenseUrl %>',
+          author: '<%= pkgMeta.author %>',
+          authorUrl: '<%= pkgMeta.authorUrl %>',
+          readme: '<%= grunt.file.read("config/readme.txt") %>'
+        }
+      }
    },

    clean: {
-  		build: ['<%= dest %>']
+      build: '<%= grunt.config("basePath").substring(0, 4) == "dist" ? "dist/**/*" : "null" %>',
+      tmp: ['tmp'],
+      html: [
+        'app/views/*.html',
+        '!app/views/archetype.html', 
+        '!app/views/archetype.default.html', 
+        '!app/views/archetype.config.html', 
+        '!app/views/archetype.config.fieldset.dialog.html', 
+        '!app/views/archetype.config.stylescript.dialog.html', 
+        '!app/views/archetype.config.developer.dialog.html'
+        ],
+      js: [
+        'app/controllers/*.js',
+        '!app/controllers/controller.js',
+        '!app/controllers/config.controller.js',
+        '!app/controllers/config.dialog.controller.js',
+        '!app/controllers/config.global.controller.js'
+      ],
+      less: [
+        'app/less/*.less',
+        '!app/less/archetype.less'
+      ]
    },

-    copy: {
-      build: {
-       files: [
-        {expand: true, cwd: 'app/', src: ['package.manifest'], dest: '<%= dest %>', flatten: true},
-        {expand: true, cwd: 'app/views/', src: ['archetype.html', 'archetype.config.html'], dest: '<%= dest %>/views', flatten: true},
-        {expand: true, cwd: 'app/config/', src: ['propertyEditors.views.js'], dest: '<%= dest %>/js', flatten: true},
-        {expand: true, cwd: 'app/langs/', src: ['**'], dest: '<%= dest %>/langs', flatten: true},
-        {expand: true, cwd: 'app/Umbraco/Umbraco.Archetype/bin/Debug/', src: ['Archetype.dll'], dest: '<%= dest %>/bin', flatten: true} 
-        ]
-      },
-      deploy: {
-        files: [
-          {expand: true, cwd: '<%= dest %>/', src: ['**/*', '!bin/*'], dest: '<%= grunt.option("target") %>\\App_Plugins\\Archetype', flatten: false},
-          {expand: true, cwd: '<%= dest %>/', src: ['bin/*'], dest: '<%= grunt.option("target") %>\\bin', flatten: false},
-        ]
-      },
-      nuget_prepare: {
-        files: [
-          {expand: true, cwd: '<%= dest %>/', src: ['**/*', '!bin/*'], dest: '<%= package_temp_dir %>/nuget/content/', flatten: false},
-          {expand: true, cwd: '<%= dest %>/', src: ['bin/*'], dest: '<%= package_temp_dir %>/nuget/lib/net40/', flatten: false}
-        ]
-      },
-      umbracopackage: {
-        files: [
-          {expand: true, cwd: '<%= dest %>/', src: ['**/*', "!bin/*"], dest: 'pkg/tmp/umbraco/App_Plugins/Archetype', flatten: false},
-          {expand: true, cwd: '<%= dest %>/', src: ['bin/*'], dest: 'pkg/tmp/umbraco', flatten: false}
-        ]
+    assemblyinfo: {
+      options: {
+        files: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj', 'app/Umbraco/Archetype.Courier/Archetype.Courier.csproj'],
+        filename: 'VersionInfo.cs',
+        info: {
+          version: '<%= (pkgMeta.version.indexOf("-") > 0 ? pkgMeta.version.substring(0, pkgMeta.version.indexOf("-")) : pkgMeta.version) %>', 
+          fileVersion: '<%= pkgMeta.version %>'
+        }
      }
    },

    touch: {
-      options: {},
      webconfig: {
        src: ['<%= grunt.option("target") %>\\Web.config']
      }
    },

-    umbracoPackage: {
-      options: {
-        name: "<%= pkgMeta.name %>",
-        version: '<%= pkgMeta.version %>',
-        url: '<%= pkgMeta.url %>',
-        license: '<%= pkgMeta.license %>',
-        licenseUrl: '<%= pkgMeta.licenseUrl %>',
-        author: '<%= pkgMeta.author %>',
-        authorUrl: '<%= pkgMeta.authorUrl %>',
-        manifest: 'pkg/umbraco/package.xml',
-        readme: 'pkg/umbraco/readme.txt',
-        sourceDir: 'pkg/tmp/umbraco',
-        outputDir: 'pkg',
-      }
-    },
-
-    clean: {
-      build: ['<%= dest %>'],
-      package_temp: ['pkg/tmp'],
-      package_artifacts: ['pkg/*.zip', 'pkg/*.nupkg'],
-    },
-
    msbuild: {
-        dev: {
-            src: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj'],
-            options: {
-                projectConfiguration: 'Debug',
-                targets: ['Clean', 'Rebuild'],
-                stdout: true,
-                maxCpuCount: 4,
-                buildParameters: {
-                    WarningLevel: 2
-                },
-                verbosity: 'quiet'
-            }
+      options: {
+        stdout: true,
+        verbosity: 'quiet',
+        maxCpuCount: 4,
+        version: 4.0,
+        buildParameters: {
+          WarningLevel: 2,
+          NoWarn: 1607
        }
+      },
+      dist: {
+        src: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj','app/Umbraco/Archetype.Courier/Archetype.Courier.csproj'],
+        options: {
+          projectConfiguration: 'Release',
+          targets: ['Clean', 'Rebuild'],
+        }
+      }
    }
-
  });

-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-contrib-less');
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-nuget');
-  grunt.loadNpmTasks('grunt-template');
-  grunt.loadNpmTasks('grunt-touch');
-  grunt.loadNpmTasks('grunt-msbuild');
-  grunt.loadTasks('tasks');
-
-
-  grunt.registerTask('package', ['clean:package_artifacts', 'default', 'package:nuget', 'package:umbraco']);
-  grunt.registerTask('package:nuget', ['copy:nuget_prepare', 'template:nuget_manifest', 'nugetpack', 'clean:package_temp']);
-  grunt.registerTask('package:umbraco', ['copy:umbracopackage', 'umbracoPackage', 'clean:package_temp']);
-  grunt.registerTask('touchwebconfigifenabled', function() { if (grunt.option("touch")) grunt.task.run("touch:webconfig") });
-  grunt.registerTask('deploy', ['default', 'copy:deploy', 'touchwebconfigifenabled']);
-  grunt.registerTask('css:build', ['less']);
-  grunt.registerTask('js:build', ['concat']);
-  grunt.registerTask('default', ['clean', 'css:build', 'js:build', 'copy:build', 'msbuild:dev']);
-};
-
+  grunt.registerTask('default', ['clean', 'string-replace', 'less', 'concat', 'assemblyinfo', 'msbuild:dist', 'copy:dll', 'copy:assets', 'copy:html', 'copy:config', 'clean:html', 'clean:js', 'clean:less']);
+  grunt.registerTask('nuget',   ['copy:nuget', 'template:nuspec', 'template:nuspec_binaries', 'template:nuspec_courier', 'nugetpack']);
+  grunt.registerTask('umbraco', ['copy:umbraco', 'umbracoPackage']);
+  grunt.registerTask('package', ['clean:tmp', 'default', 'nuget', 'copy:umbraco', 'umbracoPackage', 'clean:tmp']);
+  grunt.registerTask('assets',  ['clean', 'string-replace', 'less', 'concat', 'assemblyinfo', 'copy:assets', 'copy:html', 'copy:config', 'clean:html', 'clean:js', 'clean:less']);
+};
@@ -0,0 +1,13 @@
+# Information Collection Disclosure
+
+As of version v1.16.0, we are checking your installed version of Archetype against the current version. In this process we collect the current version of Archetype along with the current version of Umbraco that you are running. We use these values to help determine a response message to you. You may opt-out of this process by 'un-checking' the option in any of the Archetypes you have configured in the `Developer->Data Types` section of Umbraco. 
+
+![opt out](assets/optout3.png)
+
+This is a global setting that will set an `AppSetting` and update a file located at `~/config/archetype.config.js`. If you manually change the setting it will require an app reload to refresh to runtime values. If somehow this file becomes corrupt, a new file will be generated and you will again have to opt out.
+
+We identify your install only by a randomly generated GUID. We WILL NOT store your IP address or hostname during the update check. 
+
+Part of the reason we collect this information is to also ascertain how many active installs exist. If this number is sufficiently high, we can plan accordingly and attempt to keep this project going.
+
+We would ask that you reach out to the Archetype team via creating an issue on this site if you have any questions or concerns. We truly want Archetype to be a win-win for all involved. 
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2014 Imulus
+Copyright (c) 2016 Kevin Giszewski LLC

 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -1,12 +1,36 @@
 Archetype
 =========
+![alt tag](http://kgiszewski.github.io/Archetype/images/logo.png)
+
+![alt tag](http://kgiszewski.github.io/Archetype/images/example1.png)

 ## Installation
-Install the selected <a href='https://github.com/imulus/Archetype/releases'>release</a> through the Umbraco package installer or via <a href='http://www.nuget.org/packages/Archetype/'>NuGet</a>.
-
+Install the selected <a href='https://github.com/kgiszewski/Archetype/releases'>release</a> through the Umbraco package installer or via <a href='http://www.nuget.org/packages/Archetype/'>NuGet</a>.

 ## Official Docs ##
-http://imulus.github.io/Archetype
+https://github.com/kgiszewski/ArchetypeManual
+
+Get up and running in 15 minutes! https://www.youtube.com/watch?v=79LksNwGjLk
+
+## News and Updates ##
+Follow us on Twitter https://twitter.com/ArchetypeKit
+
+## Core Team ##
+* Kevin Giszewski (founder/project lead) - Tonic - https://kevin.giszewski.com/
+* Tom Fulton (founder) - Tonic - http://hellotonic.com/
+* Lee Kelleher - Umbrella - http://www.umbrellainc.co.uk/
+* Matt Brailsford - The Outfield - http://www.theoutfield.co.uk/
+* Kenn Jacobsen - Vertica - http://kennjacobsen.dk/
+
+## Sponsor us\Donate!
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KBKWLURGLGU6L)
+
+This project is funded by the core team members' time only. We don't charge for Archetype but it does take quite a bit of effort to keep it up-to-date with Umbraco core changes. If you're making a few bucks off of Archetype, we wouldn't refuse a donation :)
+
+[Learn more](Sponsors.md) about sponsorship!
+
+## Information Collection Disclosure
+Please read the information disclosure [here](Information%20Collection%20Disclosure.md).

 ## Contribute ##

@@ -21,10 +45,14 @@ Want to contribute to Archetype?  You'll want to use Grunt (our task runner) to
 ### Build ###
    grunt

+   Builds the project to `/dist/`.  These files can be dropped into an Umbraco 7 site, or you can build directly to a site using:
+
+    grunt --target="D:\inetpub\mysite"
+
+You can also watch for changes using:
+
+    grunt watch
+    grunt watch --target="D:\inetpub\mysite"

-### Deploy ###
-    grunt deploy --target=C:\\path\\to\\umbraco\\site
-    grunt watch:dev --target=C:\\path\to\\umbraco\\site

 Add `--touch` to either command to automatically touch the web.config on a deploy
-
@@ -0,0 +1,13 @@
+# Sponsorship
+
+Are you a company that depends on Archetype? We would love for you to sponsor us! Here's some suggested ways below!
+
+## Sponsor a Sprint
+
+We have a [backlog](https://github.com/kgiszewski/Archetype/issues), it gets worked on when either we have a personal need, we get bored or when we get a sponsorship. If you want to sponsor a sprint, we can give you thanks on social media and if you're really generous, we can put your logo and link on a well placed spot in a version release. [Contact us](https://twitter.com/ArchetypeKit) to get started.
+
+## Donations
+
+If you want to quietly support us, you can also send us a donation:
+
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KBKWLURGLGU6L)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.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>
+    <ProjectGuid>{FE8BE437-8B11-4E49-9B02-F45994E6D723}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Archetype.Courier</RootNamespace>
+    <AssemblyName>Archetype.Courier</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="businesslogic">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="cms">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\cms.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="interfaces">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\interfaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="log4net">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\log4net.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Xml" />
+    <Reference Include="umbraco">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Umbraco.Core">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Umbraco.Courier.Core">
+      <HintPath>lib\Umbraco.Courier.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Umbraco.Courier.DataResolvers">
+      <HintPath>lib\Umbraco.Courier.DataResolvers.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Umbraco.Courier.Providers">
+      <HintPath>lib\Umbraco.Courier.Providers.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="umbraco.providers">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.providers.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Umbraco.Archetype\Properties\VersionInfo.cs">
+      <Link>Properties\VersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="DataResolvers\ArchetypeDataResolver.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Archetype\Archetype.Umbraco.csproj">
+      <Project>{7d185d41-4228-4978-acb8-83f9a48ad94f}</Project>
+      <Name>Archetype.Umbraco</Name>
+      <Private>True</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <!-- 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">
+  </Target>
+  -->
+</Project>
@@ -0,0 +1,260 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Archetype.Extensions;
+using Archetype.Models;
+using Newtonsoft.Json;
+using Umbraco.Core;
+using Umbraco.Courier.Core;
+using Umbraco.Courier.Core.Logging;
+using Umbraco.Courier.Core.ProviderModel;
+using Umbraco.Courier.DataResolvers;
+using Umbraco.Courier.ItemProviders;
+
+namespace Archetype.Courier.DataResolvers
+{
+    /// <summary>
+    /// Lee Kelleher's implementation of Courier's PropertyDataResolverProvider for Archetype.
+    /// </summary>
+	public class ArchetypeDataResolver : PropertyDataResolverProvider
+	{
+		private enum Direction
+		{
+			Extracting,
+			Packaging
+		}
+
+        /// <summary>
+        /// Gets the editor alias.
+        /// </summary>
+        /// <value>
+        /// The editor alias.
+        /// </value>
+		public override string EditorAlias
+		{
+			get
+			{
+				return Constants.PropertyEditorAlias;
+			}
+		}
+
+        /// <summary>
+        /// Extractings the type of the data.
+        /// </summary>
+        /// <param name="item">The item.</param>
+		public override void ExtractingDataType(DataType item)
+		{
+			// No longer need to extract the DataType (int) Ids as Archetype now references the Guid [LK]
+		}
+
+        /// <summary>
+        /// Extractings the property.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="propertyData">The property data.</param>
+		public override void ExtractingProperty(Item item, ContentProperty propertyData)
+		{
+			ReplacePropertyDataIds(item, propertyData, Direction.Extracting);
+		}
+
+        /// <summary>
+        /// Packagings the type of the data.
+        /// </summary>
+        /// <param name="item">The item.</param>
+		public override void PackagingDataType(DataType item)
+		{
+			AddDataTypeDependencies(item);
+		}
+
+        /// <summary>
+        /// Packages the property.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="propertyData">The property data.</param>
+		public override void PackagingProperty(Item item, ContentProperty propertyData)
+		{
+			ReplacePropertyDataIds(item, propertyData, Direction.Packaging);
+		}
+
+        /// <summary>
+        /// Adds the datatype dependencies.
+        /// </summary>
+        /// <param name="item">The item.</param>
+		private void AddDataTypeDependencies(DataType item)
+		{
+			if (item.Prevalues != null && item.Prevalues.Count > 0)
+			{
+				var prevalue = item.Prevalues[0];
+				if (prevalue.Alias.InvariantEquals(Constants.PreValueAlias) && !string.IsNullOrWhiteSpace(prevalue.Value))
+				{
+					var config = JsonConvert.DeserializeObject<ArchetypePreValue>(prevalue.Value);
+
+					if (config != null && config.Fieldsets != null)
+					{
+						foreach (var property in config.Fieldsets.SelectMany(x => x.Properties))
+						{
+							item.Dependencies.Add(property.DataTypeGuid.ToString(), ItemProviderIds.dataTypeItemProviderGuid);
+						}
+
+						item.Prevalues[0].Value = JsonConvert.SerializeObject(config, Formatting.None);
+					}
+				}
+			}
+		}
+
+        /// <summary>
+        /// Replaces the property data Ids.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="propertyData">The property data.</param>
+        /// <param name="direction">The direction.</param>
+		private void ReplacePropertyDataIds(Item item, ContentProperty propertyData, Direction direction)
+		{
+			if (propertyData != null && propertyData.Value != null)
+			{
+				var dataType = ExecutionContext.DatabasePersistence.RetrieveItem<DataType>(new ItemIdentifier(propertyData.DataType.ToString(),
+					ItemProviderIds.dataTypeItemProviderGuid));
+
+				//Fetch the Prevalues for the current Property's DataType (if its an 'Archetype config')
+				var prevalue = dataType.Prevalues.FirstOrDefault(x => x.Alias.ToLowerInvariant().Equals("archetypeconfig"));
+				var archetypePreValue = prevalue == null
+					? null
+					: JsonConvert.DeserializeObject<ArchetypePreValue>(prevalue.Value,
+						ArchetypeHelper.Instance.JsonSerializerSettings);
+				RetrieveAdditionalProperties(ref archetypePreValue);
+
+				//Deserialize the value of the current Property to an ArchetypeModel and set additional properties before converting values
+				var sourceJson = propertyData.Value.ToString();
+				var archetype = JsonConvert.DeserializeObject<ArchetypeModel>(sourceJson, ArchetypeHelper.Instance.JsonSerializerSettings);
+				RetrieveAdditionalProperties(ref archetype, archetypePreValue);
+
+				if (archetype != null)
+				{
+					// get the `PropertyItemProvider` from the collection.
+					var propertyItemProvider = ItemProviderCollection.Instance.GetProvider(ItemProviderIds.propertyDataItemProviderGuid, ExecutionContext);
+
+					foreach (var property in archetype.Fieldsets.SelectMany(x => x.Properties))
+					{
+						if (property == null || string.IsNullOrWhiteSpace(property.PropertyEditorAlias))
+							continue;
+
+						// create a 'fake' item for Courier to process
+						var fakeItem = new ContentPropertyData
+						{
+							ItemId = item.ItemId,
+							Name = string.Format("{0} [{1}: Nested {2} ({3})]", new[] { item.Name, EditorAlias, property.PropertyEditorAlias, property.Alias }),
+							Data = new List<ContentProperty>
+							{
+								new ContentProperty
+								{
+									Alias = property.Alias,
+									DataType = ExecutionContext.DatabasePersistence.GetUniqueId(property.DataTypeId, UmbracoNodeObjectTypeIds.DataType),
+									PropertyEditorAlias = property.PropertyEditorAlias,
+									Value = property.Value
+								}
+							}
+						};
+
+						if (direction == Direction.Packaging)
+						{
+							try
+							{
+								// run the 'fake' item through Courier's data resolvers
+								ResolutionManager.Instance.PackagingItem(fakeItem, propertyItemProvider);
+							}
+							catch (Exception ex)
+							{
+								CourierLogHelper.Error<ArchetypeDataResolver>(string.Concat("Error packaging data value: ", fakeItem.Name), ex);
+							}
+
+							// pass up the dependencies and resources
+							item.Dependencies.AddRange(fakeItem.Dependencies);
+							item.Resources.AddRange(fakeItem.Resources);
+						}
+						else if (direction == Direction.Extracting)
+						{
+							try
+							{
+								// run the 'fake' item through Courier's data resolvers
+								ResolutionManager.Instance.ExtractingItem(fakeItem, propertyItemProvider);
+							}
+							catch (Exception ex)
+							{
+								CourierLogHelper.Error<ArchetypeDataResolver>(string.Concat("Error extracting data value: ", fakeItem.Name), ex);
+							}
+						}
+
+						if (fakeItem.Data != null && fakeItem.Data.Any())
+						{
+							var firstDataType = fakeItem.Data.FirstOrDefault();
+							if (firstDataType != null)
+							{
+								// set the resolved property data value
+								property.Value = firstDataType.Value;
+
+								// (if packaging) add a dependency for the property's data-type
+								if (direction == Direction.Packaging)
+									item.Dependencies.Add(firstDataType.DataType.ToString(), ItemProviderIds.dataTypeItemProviderGuid);
+							}
+						}
+					}
+
+					// serialize the Archetype back to a string
+					propertyData.Value = archetype.SerializeForPersistence();
+				}
+			}
+		}
+
+        /// <summary>
+        /// Retrieves the additional properties.
+        /// </summary>
+        /// <param name="preValue">The pre value.</param>
+		private void RetrieveAdditionalProperties(ref ArchetypePreValue preValue)
+		{
+			if (preValue == null)
+				return;
+
+			foreach (var fieldset in preValue.Fieldsets)
+			{
+				foreach (var property in fieldset.Properties)
+				{
+					var dataType = ExecutionContext.DatabasePersistence.RetrieveItem<DataType>(
+						new ItemIdentifier(property.DataTypeGuid.ToString(),
+							ItemProviderIds.dataTypeItemProviderGuid));
+
+					if (dataType == null)
+						continue;
+
+					property.PropertyEditorAlias = dataType.PropertyEditorAlias;
+				}
+			}
+		}
+
+        /// <summary>
+        /// Retrieves the additional properties.
+        /// </summary>
+        /// <param name="archetype">The archetype.</param>
+        /// <param name="preValue">The pre value.</param>
+		private void RetrieveAdditionalProperties(ref ArchetypeModel archetype, ArchetypePreValue preValue)
+		{
+			foreach (var fieldset in preValue.Fieldsets)
+			{
+				var fieldsetAlias = fieldset.Alias;
+				foreach (var fieldsetInst in archetype.Fieldsets.Where(x => x.Alias == fieldsetAlias))
+				{
+					foreach (var property in fieldset.Properties)
+					{
+						var propertyAlias = property.Alias;
+						foreach (var propertyInst in fieldsetInst.Properties.Where(x => x.Alias == propertyAlias))
+						{
+							propertyInst.DataTypeGuid = property.DataTypeGuid.ToString();
+							propertyInst.DataTypeId = ExecutionContext.DatabasePersistence.GetNodeId(
+								property.DataTypeGuid, UmbracoNodeObjectTypeIds.DataType);
+							propertyInst.PropertyEditorAlias = property.PropertyEditorAlias;
+						}
+					}
+				}
+			}
+		}
+	}
+}
@@ -0,0 +1,14 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Archetype.Courier")]
+[assembly: AssemblyDescription("A set of tools to support Archetype with Umbraco Courier")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Umbrella Inc Ltd")]
+[assembly: AssemblyProduct("Archetype.Courier")]
+[assembly: AssemblyCopyright("Copyright \xa9 Lee Kelleher, Umbrella Inc Ltd 2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+[assembly: Guid("6F05C431-ABBF-4D77-9D3D-5AF6C8E318AF")]
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
+  <package id="ClientDependency" version="1.7.1.2" targetFramework="net45" />
+  <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
+  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
+  <package id="ImageProcessor" version="1.8.7.0" targetFramework="net45" />
+  <package id="ImageProcessor.Web" version="3.2.1.0" targetFramework="net45" />
+  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
+  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
+  <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
+  <package id="UmbracoCms.Core" version="7.1.2" targetFramework="net45" />
+  <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
+</packages>
@@ -31,29 +31,242 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="AutoMapper">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="AutoMapper.Net4">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="businesslogic, Version=1.0.5242.22740, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ClientDependency.Core">
+      <HintPath>..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ClientDependency.Core.Mvc">
+      <HintPath>..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="cms, Version=1.0.5242.22741, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\cms.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="controls, Version=1.0.5242.22742, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\controls.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="CookComputing.XmlRpcV2">
+      <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Examine, Version=0.1.55.2941, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Examine.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="HtmlAgilityPack">
+      <HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ImageProcessor, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ImageProcessor.1.9.0.0\lib\ImageProcessor.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ImageProcessor.Web, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ImageProcessor.Web.3.2.3.0\lib\net45\ImageProcessor.Web.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="interfaces, Version=1.0.5242.22737, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\interfaces.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Lucene.Net">
+      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.Web.Helpers.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.Mvc.FixedDisplayModes">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="MiniProfiler">
+      <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
    <Reference Include="Moq">
      <HintPath>..\packages\Moq.4.2.1312.1622\lib\net40\Moq.dll</HintPath>
+      <Private>True</Private>
    </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+    <Reference Include="MySql.Data">
+      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLCE4Umbraco, Version=1.0.5242.22741, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\SQLCE4Umbraco.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="System.Data" />
    <Reference Include="System.Xml" />
-    <Reference Include="Umbraco.Core">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\Umbraco.Core.dll</HintPath>
+    <Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\TidyNet.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="umbraco, Version=1.0.5242.22743, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Umbraco.Core, Version=1.0.5242.22738, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="umbraco.DataLayer, Version=1.0.5242.22740, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.DataLayer.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="umbraco.editorControls, Version=1.0.5242.22746, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.editorControls.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="umbraco.MacroEngines, Version=1.0.5242.22747, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.MacroEngines.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="umbraco.providers, Version=1.0.5242.22742, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.providers.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Umbraco.Web.UI, Version=1.0.5242.22748, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Web.UI.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="umbraco.XmlSerializers, Version=1.0.5242.22743, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.XmlSerializers.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="UmbracoExamine, Version=0.6.0.22741, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UmbracoExamine.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
+      <Private>True</Private>
    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Models\FieldsetTests.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="PropertyValueConverter\PropertyValueConverterTests.cs" />
+    <Compile Include="PublishedContent\ArchetypePublishedContentTests.cs" />
+    <Compile Include="PublishedContent\TypeConverterTests.cs" />
  </ItemGroup>
  <ItemGroup>
+    <None Include="app.config" />
    <None Include="Data\sample-1.json" />
    <None Include="packages.config" />
  </ItemGroup>
@@ -61,10 +274,22 @@
    <ProjectReference Include="..\Umbraco.Archetype\Archetype.Umbraco.csproj">
      <Project>{7D185D41-4228-4978-ACB8-83F9A48AD94F}</Project>
      <Name>Archetype.Umbraco</Name>
+      <Private>True</Private>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
  <!-- 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">
@@ -1,21 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Archetype.Umbraco.PropertyConverters;
+using Archetype.PropertyConverters;
 using NUnit.Framework;

 namespace Archetype.Tests.Models
 {
-
+    /// <summary>
+    /// Tests designed for the fieldsets.
+    /// </summary>
    [TestFixture]
    public class FieldsetTests
    {
-
        private string _sampleJson;

+        /// <summary>
+        /// Sets up the test to use sample JSON data.
+        /// </summary>
        [SetUp]
        public void SetUp()
        {
@@ -26,7 +26,7 @@ namespace Archetype.Tests.Models
        public void Can_Get_Fieldset_Property_By_Alias()
        {
            var converter = new ArchetypeValueConverter();
-            var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
+            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);

            var fieldset = result.Fieldsets.First();
            var propertyValue = fieldset.GetValue("boxHeadline");
@@ -34,24 +34,36 @@ namespace Archetype.Tests.Models
            Assert.That(propertyValue == "Box 1 Title");
        }

+        [Test]
+        public void Can_Get_Fieldset_Property_Default_Value_By_Alias() 
+		{
+            var converter = new ArchetypeValueConverter();
+            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
+
+            var fieldset = result.Fieldsets.First();
+            var propertyValue = fieldset.GetValue<string>("noSuchProperty", "noSuchProperty default value");
+
+            Assert.That(propertyValue == "noSuchProperty default value");
+        }
+
        [Test]
        public void Can_Convert_Property_Value_Types()
        {
            var converter = new ArchetypeValueConverter();
-            var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
+            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);

            var fieldset = result.Fieldsets.First();

            Assert.That(fieldset.GetValue<int>("link") == 3175);
            Assert.That(fieldset.GetValue<bool>("show") == true);
            Assert.That(fieldset.GetValue<string>("blurb") == "A blurb here");
-        }
+        }  

        [Test]
        public void Returns_String_When_No_Type_Specified()
        {
            var converter = new ArchetypeValueConverter();
-            var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
+            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);

            var fieldset = result.Fieldsets.First();

@@ -59,6 +71,5 @@ namespace Archetype.Tests.Models
            Assert.That(property is string);
            Assert.That(property == "3175");
        }
-
    }
 }
@@ -1,22 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Archetype.Umbraco.PropertyConverters;
-using Moq;
+using Archetype.PropertyConverters;
 using NUnit.Framework;
-using Umbraco.Core.Models.PublishedContent;

 namespace Archetype.Tests.PropertyValueConverter
 {
+    /// <summary>
+    /// Tests designed to test the PVC.
+    /// </summary>
    [TestFixture]
    public class PropertyValueConverterTests
    {
-
        private string _sampleJson;

+        /// <summary>
+        /// Sets up the test to use JSON data.
+        /// </summary>
        [SetUp]
        public void SetUp()
        {
@@ -24,39 +23,37 @@ namespace Archetype.Tests.PropertyValueConverter
        }

        [Test]
-        public void Returns_Null_When_Data_Is_Null()
+        [TestCase(null)]
+        [TestCase("")]
+        public void Returns_Empty_Archetype_When_Data_Is_Null_Or_Empty(object data)
        {
-            var converter = new ArchetypeValueConverter();
-            var result = converter.ConvertDataToSource(null, null, false);
-
-            Assert.IsNull(result);
-        }
-
-        [Test]
-        public void Returns_Empty_String_When_Data_Is_Empty_String()
-        {
-            var data = "";
            var converter = new ArchetypeValueConverter();
            var result = converter.ConvertDataToSource(null, data, false);

-            Assert.AreEqual("", result);
+            Assert.AreEqual(result.GetType(), typeof (Archetype.Models.ArchetypeModel));
+
+            var fieldsets = (Archetype.Models.ArchetypeModel) result;
+            Assert.IsTrue(fieldsets.Count() == 0);
        }

        [Test]
-        public void Returns_Original_String_When_Data_Is_Invalid_Json()
+        public void Returns_Empty_Archetype_When_Data_Is_Invalid_Json()
        {
            var data = "{ invalid";
            var converter = new ArchetypeValueConverter();
            var result = converter.ConvertDataToSource(null, data, false);
            
-            Assert.AreEqual(data, result);
+            Assert.AreEqual(result.GetType(), typeof (Archetype.Models.ArchetypeModel));
+
+            var fieldsets = (Archetype.Models.ArchetypeModel) result;
+            Assert.IsTrue(fieldsets.Count() == 0);
        }

        [Test]
        public void Can_Serialize_From_Json_Model()
        {
            var converter = new ArchetypeValueConverter();
-            var result = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, _sampleJson, false);
+            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);

            Assert.That(result != null);
            Assert.That(result.Fieldsets.Count() == 2);
@@ -0,0 +1,156 @@
+using System;
+using System.Linq;
+using Archetype.Extensions;
+using Archetype.Models;
+using Archetype.PropertyConverters;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Web;
+
+namespace Archetype.Tests.PublishedContent
+{
+    [TestFixture]
+    public class ArchetypePublishedContentTests
+    {
+        private ArchetypeModel _archetype;
+
+        [TestFixtureSetUp]
+        public void Init()
+        {
+            var archetypeJson = System.IO.File.ReadAllText("..\\..\\Data\\sample-1.json");
+            var converter = new ArchetypeValueConverter();
+
+            _archetype = (ArchetypeModel)converter.ConvertDataToSource(null, archetypeJson, false);
+        }
+
+        [Test]
+        public void ArchetypeModel_Initialized()
+        {
+            Assert.IsNotNull(_archetype);
+            Assert.IsNotEmpty(_archetype.Fieldsets);
+        }
+
+        [Test]
+        public void ArchetypeModel_To_PublishedContentSet()
+        {
+            var contentSet = _archetype.ToPublishedContentSet();
+
+            Assert.That(contentSet, Is.Not.Null);
+            Assert.That(contentSet, Is.Not.Empty);
+            Assert.That(contentSet, Is.All.InstanceOf<IPublishedContent>());
+        }
+
+        [Test]
+        public void ArchetypeFieldsetModel_To_PublishedContent()
+        {
+            var fieldset = _archetype.Fieldsets.FirstOrDefault();
+            var content = fieldset.ToPublishedContent();
+
+            Assert.That(content, Is.Not.Null);
+            Assert.That(content, Is.InstanceOf<IPublishedContent>());
+            Assert.That(content.Properties, Is.Not.Empty);
+            Assert.That(content.Properties, Is.All.InstanceOf<IPublishedProperty>());
+        }
+
+        [TestCase("boxHeadline", "Box 1 Title")]
+        [TestCase("link", "3175")]
+        [TestCase("link", 3175)]
+        [TestCase("show", "1")]
+        [TestCase("show", true)]
+        [TestCase("show", 1)]
+        public void ArchetypePublishedContent_Typed_Properties<T>(string propertyAlias, T expected)
+        {
+            var fieldset = _archetype.Fieldsets.FirstOrDefault();
+            var content = fieldset.ToPublishedContent();
+
+            var actual = content.GetPropertyValue<T>(propertyAlias);
+
+            Assert.AreEqual(actual, expected);
+        }
+
+        [Test]
+        public void Null_ArchetypeModel_Throws_Exception()
+        {
+            TestDelegate code = () =>
+            {
+                ArchetypeModel archetype = null;
+                archetype.ToPublishedContentSet();
+            };
+
+            Assert.Throws<ArgumentNullException>(code);
+        }
+
+        [Test]
+        public void Null_ArchetypeFieldsetModel_Throws_Exception()
+        {
+            TestDelegate code = () =>
+            {
+                ArchetypeFieldsetModel fieldset = null;
+                fieldset.ToPublishedContent();
+            };
+
+            Assert.Throws<ArgumentNullException>(code);
+        }
+
+        [Test]
+        public void ArchetypePublishedContent_GetIndex()
+        {
+            var contentSet = _archetype.ToPublishedContentSet();
+            var i = 0;
+
+            foreach (var content in contentSet)
+            {
+                Assert.AreEqual(content.GetIndex(), i);
+                i++;
+            }
+        }
+
+        [Test]
+        public void ArchetypePublishedContentSet_IsFirstIsLast()
+        {
+            var contentSet = _archetype.ToPublishedContentSet();
+
+            foreach (var content in contentSet)
+            {
+                var value = content.GetPropertyValue<string>("boxHeadline");
+
+                Assert.That(value == "Box 1 Title", Is.EqualTo(content.IsFirst()));
+                Assert.That(value == "Another Box", Is.EqualTo(content.IsLast()));
+            }
+        }
+
+        [Test]
+        public void ArchetypePublishedContentSet_PreviousNext()
+        {
+            var contentSet = _archetype.ToPublishedContentSet();
+            var list = contentSet.ToList();
+
+            Assert.That(list.Count, Is.EqualTo(2));
+
+            var first = list[0];
+            var last = list[1];
+
+            var next = first.Next();
+            Assert.AreEqual(next, last);
+
+            var prev = last.Previous();
+            Assert.AreEqual(prev, first);
+        }
+
+        [Test, ExpectedException(typeof(NullReferenceException))]
+        public void ArchetypePublishedContentSet_Siblings()
+        {
+            var contentSet = _archetype.ToPublishedContentSet();
+            var content = contentSet.FirstOrDefault();
+
+            var siblings = content.Siblings();
+            Assert.That(siblings, Is.Not.Null);
+
+            var following = content.FollowingSibling();
+            Assert.That(following, Is.Not.Null);
+
+            var preceding = content.PrecedingSibling();
+            Assert.That(preceding, Is.Not.Null);
+        }
+    }
+}
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Archetype.Models;
+using Archetype.PropertyConverters;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+
+namespace Archetype.Tests.PublishedContent
+{
+    [TestFixture]
+    public class TypeConverterTests
+    {
+        private ArchetypeModel _archetype;
+
+        [TestFixtureSetUp]
+        public void Init()
+        {
+            var archetypeJson = System.IO.File.ReadAllText("..\\..\\Data\\sample-1.json");
+            var converter = new ArchetypeValueConverter();
+
+            _archetype = (ArchetypeModel)converter.ConvertDataToSource(null, archetypeJson, false);
+        }
+
+        [TestCase(typeof(ArchetypeModel), true)]
+        [TestCase(typeof(ArchetypePublishedContentSet), true)]
+        [TestCase(typeof(IEnumerable<IPublishedContent>), true)]
+        [TestCase(typeof(string), true)]
+        [TestCase(typeof(int), false)]
+        [TestCase(typeof(ArchetypeFieldsetModel), false)]
+        public void ArchetypeModel_ConvertsTo_EnumerablePublishedContent(Type destinationType, bool expected)
+        {
+            Assert.IsNotNull(_archetype);
+
+            var attempt = _archetype.TryConvertTo(destinationType);
+
+            Assert.That(attempt.Success, Is.EqualTo(expected));
+
+            if (attempt.Success)
+            {
+                Assert.IsNotNull(attempt.Result);
+                Assert.That(attempt.Result, Is.InstanceOf(destinationType));
+            }
+        }
+
+        [TestCase(typeof(ArchetypeFieldsetModel), true)]
+        [TestCase(typeof(ArchetypePublishedContent), true)]
+        [TestCase(typeof(IPublishedContent), true)]
+        [TestCase(typeof(string), true)]
+        [TestCase(typeof(int), false)]
+        [TestCase(typeof(ArchetypeModel), false)]
+        public void ArchetypeFieldsetModel_ConvertsTo_PublishedContent(Type destinationType, bool expected)
+        {
+            CollectionAssert.IsNotEmpty(_archetype.Fieldsets);
+
+            var attempt = _archetype.First().TryConvertTo(destinationType);
+
+            Assert.That(attempt.Success, Is.EqualTo(expected));
+
+            if (attempt.Success)
+            {
+                Assert.IsNotNull(attempt.Result);
+                Assert.That(attempt.Result, Is.InstanceOf(destinationType));
+            }
+        }
+    }
+}
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <configSections>
+      <sectionGroup name="umbracoConfiguration">
+        <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
+      </sectionGroup>
+    </configSections>
+    <umbracoConfiguration>
+      <settings configSource="config\umbracoSettings.config" />
+    </umbracoConfiguration>
+    <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
+  <package id="ClientDependency" version="1.7.1.2" targetFramework="net45" />
+  <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
+  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
+  <package id="ImageProcessor" version="1.9.0.0" targetFramework="net45" />
+  <package id="ImageProcessor.Web" version="3.2.3.0" targetFramework="net45" />
+  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
+  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
  <package id="Moq" version="4.2.1312.1622" targetFramework="net45" />
-  <package id="NUnit" version="2.6.3" targetFramework="net45" />
+  <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
+  <package id="UmbracoCms.Core" version="7.1.2" targetFramework="net45" />
+  <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
 </packages>
@@ -1,6 +1,8 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.40629.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archetype.Umbraco", "Umbraco.Archetype\Archetype.Umbraco.csproj", "{7D185D41-4228-4978-ACB8-83F9A48AD94F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D84AA4ED-85A6-484F-9E72-BE7AC9835821}"
@@ -12,6 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D84AA4
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archetype.Tests", "Archetype.Tests\Archetype.Tests.csproj", "{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archetype.Courier", "Archetype.Courier\Archetype.Courier.csproj", "{FE8BE437-8B11-4E49-9B02-F45994E6D723}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -26,6 +30,10 @@ Global
 		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE8BE437-8B11-4E49-9B02-F45994E6D723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE8BE437-8B11-4E49-9B02-F45994E6D723}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE8BE437-8B11-4E49-9B02-F45994E6D723}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE8BE437-8B11-4E49-9B02-F45994E6D723}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -0,0 +1,171 @@
+using System.Collections.Generic;
+using System;
+using System.Linq;
+using System.Net;
+using System.Web.Http;
+using AutoMapper;
+using Umbraco.Core.Models;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.Editors;
+using Archetype.Extensions;
+using Archetype.Models;
+
+namespace Archetype.Api
+{
+    /// <summary>
+    /// Controller that handles datatype related interactions.
+    /// </summary>
+    /// <seealso cref="Umbraco.Web.Editors.UmbracoAuthorizedJsonController" />
+    [PluginController("ArchetypeApi")]
+    public class ArchetypeDataTypeController : UmbracoAuthorizedJsonController
+    {
+        private static DateTime _lastVersionCheck;
+        private const int IntervalInDaysBetweenVersionChecks = 7;
+
+        public IEnumerable<object> GetAllPropertyEditors()
+        {
+            return
+                global::Umbraco.Core.PropertyEditors.PropertyEditorResolver.Current.PropertyEditors
+                    .Select(x => new { defaultPreValues = x.DefaultPreValuesForArchetype(), alias = x.Alias, view = x.ValueEditor.View });
+        }
+
+        /// <summary>
+        /// Gets all datatypes.
+        /// </summary>
+        /// <returns>System.Object.</returns>
+        public object GetAll()
+        {
+            var dataTypes = Services.DataTypeService.GetAllDataTypeDefinitions();
+            return dataTypes.Select(t => new { guid = t.Key, name = t.Name });
+        }
+
+        /// <summary>
+        /// Gets all details.
+        /// </summary>
+        /// <returns>System.Object.</returns>
+        public object GetAllDetails()
+        {
+            var dataTypes = Services.DataTypeService.GetAllDataTypeDefinitions();
+
+            var list = new List<object>();
+
+            foreach (var dataType in dataTypes)
+            {
+                var dataTypeDisplay = Mapper.Map<IDataTypeDefinition, DataTypeDisplay>(dataType);
+
+                list.Add(new { selectedEditor = dataTypeDisplay.SelectedEditor, preValues = dataTypeDisplay.PreValues, dataTypeGuid = dataType.Key });
+            }
+
+            return list;
+        }
+
+        /// <summary>
+        /// Gets the datatype by GUID.
+        /// </summary>
+        /// <param name="guid">The unique identifier.</param>
+        /// <returns></returns>
+        /// <exception cref="System.Web.Http.HttpResponseException"></exception>
+        public object GetByGuid(Guid guid)
+        {
+            var dataType = Services.DataTypeService.GetDataTypeDefinitionById(guid);
+            if (dataType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var dataTypeDisplay = Mapper.Map<IDataTypeDefinition, DataTypeDisplay>(dataType);
+            return new { selectedEditor = dataTypeDisplay.SelectedEditor, preValues = dataTypeDisplay.PreValues };
+        }
+
+        /// <summary>
+        /// Gets the datatype by GUID.
+        /// </summary>
+        /// <param name="guid">The unique identifier.</param>
+        /// <param name="contentTypeAlias">The content type alias.</param>
+        /// <param name="propertyTypeAlias">The property type alias.</param>
+        /// <param name="archetypeAlias">The archetype alias.</param>
+        /// <param name="nodeId">The node identifier.</param>
+        /// <returns></returns>
+        /// <exception cref="System.Web.Http.HttpResponseException"></exception>
+        public object GetByGuid(Guid guid, string contentTypeAlias, string propertyTypeAlias, string archetypeAlias, int nodeId)
+        {
+            var dataType = Services.DataTypeService.GetDataTypeDefinitionById(guid);
+
+            if (dataType == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            var dataTypeDisplay = Mapper.Map<IDataTypeDefinition, DataTypeDisplay>(dataType);
+
+            return new { selectedEditor = dataTypeDisplay.SelectedEditor, preValues = dataTypeDisplay.PreValues, contentTypeAlias = contentTypeAlias, propertyTypeAlias = propertyTypeAlias, archetypeAlias = archetypeAlias, nodeId = nodeId };
+        }
+
+        /// <summary>
+        /// Returns the DLL version from the file.
+        /// </summary>
+        /// <returns></returns>
+        public object GetDllVersion()
+        {
+            return new { dllVersion = ArchetypeHelper.Instance.DllVersion() };
+        }
+
+        /// <summary>
+        /// Globals the settings.
+        /// </summary>
+        /// <returns>System.Object.</returns>
+        [HttpGet]
+        public object GlobalSettings()
+        {
+            return new
+            {
+                isCheckingForUpdates = ArchetypeGlobalSettings.Instance.CheckForUpdates
+            };
+        }
+
+        /// <summary>
+        /// Sets the check for updates.
+        /// </summary>
+        /// <param name="isChecking">if set to <c>true</c> [is checking].</param>
+        [HttpPost]
+        public void SetCheckForUpdates([FromBody] bool isChecking)
+        {
+            ArchetypeGlobalSettings.Instance.CheckForUpdates = isChecking;
+            ArchetypeGlobalSettings.Instance.Save();
+        }
+
+        /// <summary>
+        /// Checks for updates.
+        /// </summary>
+        /// <returns>System.Object.</returns>
+        [HttpPost]
+        public object CheckForUpdates()
+        {
+            if (!ArchetypeGlobalSettings.Instance.CheckForUpdates || !IsItTimeToCheck())
+            {
+                return new
+                {
+                    isUpdateAvailable = false
+                };
+            }
+
+            var updateNotificationModel = ArchetypeHelper.Instance.CheckForUpdates();
+            _lastVersionCheck = DateTime.UtcNow;
+
+            return new
+            {
+                isUpdateAvailable = updateNotificationModel.IsUpdateAvailable,
+                headline = updateNotificationModel.Headline,
+                type = updateNotificationModel.Type,
+                message = updateNotificationModel.Message,
+                url = updateNotificationModel.Url
+            };
+        }
+
+        internal bool IsItTimeToCheck()
+        {
+            return _lastVersionCheck.AddDays(IntervalInDaysBetweenVersionChecks) < DateTime.UtcNow;
+        }
+    }
+}
@@ -7,7 +7,7 @@
    <ProjectGuid>{7D185D41-4228-4978-ACB8-83F9A48AD94F}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Archetype.Umbraco</RootNamespace>
+    <RootNamespace>Archetype</RootNamespace>
    <AssemblyName>Archetype</AssemblyName>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
@@ -34,114 +34,148 @@
  <ItemGroup>
    <Reference Include="AutoMapper">
      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="AutoMapper.Net4">
      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="businesslogic">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\businesslogic.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="ClientDependency.Core">
-      <HintPath>..\packages\ClientDependency.1.7.0.4\lib\ClientDependency.Core.dll</HintPath>
+      <HintPath>..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="ClientDependency.Core.Mvc">
      <HintPath>..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="cms">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\cms.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\cms.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="controls">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\controls.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\controls.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="CookComputing.XmlRpcV2">
      <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="Examine">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\Examine.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Examine.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="HtmlAgilityPack">
      <HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="ICSharpCode.SharpZipLib">
      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ImageProcessor">
+      <HintPath>..\packages\ImageProcessor.1.9.0.0\lib\ImageProcessor.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ImageProcessor.Web">
+      <HintPath>..\packages\ImageProcessor.Web.3.2.3.0\lib\net45\ImageProcessor.Web.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="interfaces">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\interfaces.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\interfaces.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="log4net">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\log4net.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\log4net.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="Lucene.Net">
      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="Microsoft.ApplicationBlocks.Data">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="Microsoft.Web.Helpers">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\Microsoft.Web.Helpers.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.Web.Helpers.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Web.Mvc.FixedDisplayModes">
      <HintPath>..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="MiniProfiler">
      <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="MySql.Data">
      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="SQLCE4Umbraco">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\SQLCE4Umbraco.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\SQLCE4Umbraco.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Core" />
    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
+      <Private>False</Private>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll</HintPath>
    </Reference>
    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+      <Private>False</Private>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
    </Reference>
    <Reference Include="System.Net.Http" />
    <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Web" />
    <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
      <HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
    </Reference>
    <Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
    </Reference>
    <Reference Include="System.Xml.Linq" />
@@ -150,51 +184,83 @@
    <Reference Include="System.Data" />
    <Reference Include="System.Xml" />
    <Reference Include="TidyNet">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\TidyNet.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\TidyNet.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="umbraco">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="Umbraco.Core">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\Umbraco.Core.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Core.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="umbraco.DataLayer">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.DataLayer.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.DataLayer.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="umbraco.editorControls">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.editorControls.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.editorControls.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="umbraco.MacroEngines">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.MacroEngines.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.MacroEngines.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="umbraco.providers">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.providers.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.providers.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="Umbraco.Web.UI">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\Umbraco.Web.UI.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Web.UI.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="umbraco.XmlSerializers">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.XmlSerializers.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.XmlSerializers.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="UmbracoExamine">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\UmbracoExamine.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UmbracoExamine.dll</HintPath>
+      <Private>False</Private>
    </Reference>
    <Reference Include="UrlRewritingNet.UrlRewriter">
-      <HintPath>..\packages\UmbracoCms.Core.7.0.1\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
+      <Private>False</Private>
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Extensions\Extensions.cs" />
-    <Compile Include="Models\Archetype.cs" />
+    <Compile Include="Api\ArchetypeDataTypeController.cs" />
+    <Compile Include="Constants.cs" />
+    <Compile Include="Events\ExpireCache.cs" />
+    <Compile Include="Extensions\ArchetypeFieldsetModelExtensions.cs" />
+    <Compile Include="Extensions\ArchetypeHelper.cs" />
+    <Compile Include="Extensions\ArchetypeModelExtensions.cs" />
+    <Compile Include="Extensions\HtmlHelperExtensions.cs" />
+    <Compile Include="Extensions\ArchetypePropertyModelExtensions.cs" />
+    <Compile Include="Extensions\PropertyEditorExtensions.cs" />
+    <Compile Include="Extensions\StringExtensions.cs" />
+    <Compile Include="Models\ArchetypeConfigFileModel.cs" />
+    <Compile Include="Models\ArchetypeGlobalSettings.cs" />
+    <Compile Include="Models\ArchetypeModel.cs" />
    <Compile Include="Models\ArchetypePreValue.cs" />
    <Compile Include="Models\ArchetypePreValueFieldset.cs" />
+    <Compile Include="Models\ArchetypePreValueFieldsetGroup.cs" />
    <Compile Include="Models\ArchetypePreValueProperty.cs" />
-    <Compile Include="Models\Fieldset.cs" />
-    <Compile Include="Models\Property.cs" />
+    <Compile Include="Models\ArchetypeFieldsetModel.cs" />
+    <Compile Include="Models\ArchetypePropertyModel.cs" />
+    <Compile Include="Models\ArchetypePublishedContent.cs" />
+    <Compile Include="Models\ArchetypePublishedContentSet.cs" />
+    <Compile Include="Models\ArchetypePublishedProperty.cs" />
+    <Compile Include="Models\ArchetypeUpdateNotification.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\VersionInfo.cs" />
    <Compile Include="PropertyConverters\ArchetypeValueConverter.cs" />
+    <Compile Include="PropertyEditors\ArchetypePropertyEditor.cs" />
+    <Compile Include="TypeConverters\ArchetypeFieldsetModelConverter.cs" />
+    <Compile Include="TypeConverters\ArchetypeModelConverter.cs" />
  </ItemGroup>
  <ItemGroup>
+    <None Include="app.config" />
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup />
@@ -0,0 +1,19 @@
+namespace Archetype
+{
+    /// <summary>
+    /// Archetype constants.
+    /// </summary>
+    public static class Constants
+    {
+        public const string PropertyEditorAlias = "Imulus.Archetype";
+
+        public const string PreValueAlias = "archetypeConfig";
+
+        public const string CacheKey_DataTypeByGuid = "";
+
+        public const string CacheKey_PreValueFromDataTypeId = "Archetype_GetArchetypePreValueFromDataTypeId_";
+
+        public const string UmbracoVersionAlias = "umbracoConfigurationStatus";
+        public const string NotificationUrl = "https://api.gizmo42.com/v1/archetype/check-for-updates";
+    }
+}
@@ -0,0 +1,35 @@
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+
+namespace Archetype.Events
+{
+    public class ExpireCache : ApplicationEventHandler
+    {
+        /// <summary>
+        /// Registers our ExpirePreValueCache handler on app starting.
+        /// </summary>
+        /// <param name="umbracoApplication"></param>
+        /// <param name="applicationContext"></param>
+        protected override void ApplicationStarting(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+        {
+            base.ApplicationStarting(umbracoApplication, applicationContext);
+            
+            DataTypeService.Saved += ExpirePreValueCache;
+        }
+
+        /// <summary>
+        /// Expires the pre value cache when a datatype is saved.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="Umbraco.Core.Events.SaveEventArgs{IDataTypeDefinition}"/> instance containing the event data.</param>
+        void ExpirePreValueCache(IDataTypeService sender, global::Umbraco.Core.Events.SaveEventArgs<IDataTypeDefinition> e)
+        {
+            foreach (var dataType in e.SavedEntities)
+            {
+                ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheItem(Constants.CacheKey_PreValueFromDataTypeId + dataType.Id);
+                ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheItem(Constants.CacheKey_DataTypeByGuid + dataType.Key);
+            }
+        }
+    }
+}
@@ -0,0 +1,25 @@
+using System.Linq;
+using Archetype.Models;
+using Umbraco.Core.Models;
+
+namespace Archetype.Extensions
+{
+    public static class ArchetypeFieldsetModelExtensions
+    {
+        public static IPublishedContent ToPublishedContent(this ArchetypeFieldsetModel fieldset)
+        {
+            return new ArchetypePublishedContent(fieldset);
+        }
+
+        public static IPublishedContent ToPublishedContent(this ArchetypeFieldsetModel fieldset, ArchetypeModel archetype)
+        {
+            var contentSet = archetype.ToPublishedContentSet();
+
+            var first = contentSet
+                .Cast<ArchetypePublishedContent>()
+                .FirstOrDefault(x => x.ArchetypeFieldset == fieldset);
+
+            return first ?? new ArchetypePublishedContent(fieldset);
+        }
+    }
+}
@@ -0,0 +1,310 @@
+using System;
+using System.Configuration;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using Archetype.Models;
+using Newtonsoft.Json;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+using System.Reflection;
+using System.Diagnostics;
+using System.Net;
+
+/// <summary>
+/// The Extensions namespace.
+/// </summary>
+namespace Archetype.Extensions
+{
+    /// <summary>
+    /// Helper class that handles several Archetype related interactions.
+    /// </summary>
+    public class ArchetypeHelper
+    {
+        /// <summary>
+        /// The json settings
+        /// </summary>
+        protected JsonSerializerSettings _jsonSettings;
+        /// <summary>
+        /// The application
+        /// </summary>
+        protected ApplicationContext _app;
+        /// <summary>
+        /// The pad lock
+        /// </summary>
+        private static readonly object _padLock = new object();
+        /// <summary>
+        /// The instance
+        /// </summary>
+        private static ArchetypeHelper _instance = new ArchetypeHelper();
+
+        /// <summary>
+        /// Gets the instance.
+        /// </summary>
+        /// <value>The instance.</value>
+        internal static ArchetypeHelper Instance {
+            get
+            {
+                if (_instance == null)
+                {
+                    lock (_padLock)
+                    {
+                        if (_instance == null)
+                        {
+                            _instance = new ArchetypeHelper();
+                        }
+                    }
+                }
+
+                return _instance;
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArchetypeHelper" /> class.
+        /// </summary>
+        private ArchetypeHelper()
+        {
+            var dcr = new Newtonsoft.Json.Serialization.DefaultContractResolver();
+            dcr.DefaultMembersSearchFlags |= BindingFlags.NonPublic;
+
+            _jsonSettings = new JsonSerializerSettings { ContractResolver = dcr };
+            _app = ApplicationContext.Current;
+        }
+
+        /// <summary>
+        /// Gets the json serializer settings.
+        /// </summary>
+        /// <value>The json serializer settings.</value>
+        internal JsonSerializerSettings JsonSerializerSettings { get { return _jsonSettings; } }
+
+        /// <summary>
+        /// Deserializes the JSON to archetype.
+        /// </summary>
+        /// <param name="sourceJson">The source JSON.</param>
+        /// <param name="dataTypePreValues">The data type pre values.</param>
+        /// <returns>ArchetypeModel.</returns>
+        internal ArchetypeModel DeserializeJsonToArchetype(string sourceJson, PreValueCollection dataTypePreValues)
+        {
+            try
+            {
+                var archetype = JsonConvert.DeserializeObject<ArchetypeModel>(sourceJson, _jsonSettings);
+
+                try
+                {
+                    // Get list of configured properties and their types and map them to the deserialized archetype model
+                    var preValue = GetArchetypePreValueFromPreValuesCollection(dataTypePreValues);
+                    RetrieveAdditionalProperties(ref archetype, preValue);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Error<ArchetypeHelper>("DeserializeJsonToArchetype", ex);
+                }
+
+                return archetype;
+            }
+            catch
+            {
+                return new ArchetypeModel();
+            }
+        }
+
+        /// <summary>
+        /// Deserializes the JSON to archetype.
+        /// </summary>
+        /// <param name="sourceJson">The source JSON.</param>
+        /// <param name="dataTypeId">The data type identifier.</param>
+        /// <param name="hostContentType">Type of the host content.</param>
+        /// <returns>ArchetypeModel.</returns>
+        internal ArchetypeModel DeserializeJsonToArchetype(string sourceJson, int dataTypeId, PublishedContentType hostContentType = null)
+        {
+            try
+            {
+                var archetype = JsonConvert.DeserializeObject<ArchetypeModel>(sourceJson, _jsonSettings);
+
+                try
+                {
+                    // Get list of configured properties and their types and map them to the deserialized archetype model
+                    var preValue = GetArchetypePreValueFromDataTypeId(dataTypeId);
+                    RetrieveAdditionalProperties(ref archetype, preValue, hostContentType);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Error<ArchetypeHelper>(string.Format("DeserializeJsonToArchetype Error DatatypeId=>{0} SourceJson=>{1}", dataTypeId, sourceJson), ex);
+                }
+
+                return archetype;
+            }
+            catch (Exception ex)
+            {
+                return new ArchetypeModel();
+            }
+        }
+
+        /// <summary>
+        /// Determines whether datatypeId has had it's PVC overridden.
+        /// </summary>
+        /// <param name="dataTypeId">The data type identifier.</param>
+        /// <returns><c>true</c> if [is property value converter overridden] [the specified data type identifier]; otherwise, <c>false</c>.</returns>
+        internal bool IsPropertyValueConverterOverridden(int dataTypeId)
+        {
+            var prevalues = GetArchetypePreValueFromDataTypeId(dataTypeId);
+
+            if (prevalues == null)
+                return false;
+
+            return prevalues.OverrideDefaultPropertyValueConverter;
+        }
+
+        /// <summary>
+        /// Checks for updates.
+        /// </summary>
+        /// <returns>ArchetypeUpdateNotification.</returns>
+        internal ArchetypeUpdateNotification CheckForUpdates()
+        {
+            try
+            {
+                using (var client = new HttpClient())
+                {
+                    var content = new StringContent(JsonConvert.SerializeObject(new
+                    {
+                        umbracoVersion = ConfigurationManager.AppSettings[Constants.UmbracoVersionAlias],
+                        archetypeVersion = DllVersion(),
+                        id = ArchetypeGlobalSettings.Instance.Id
+                    }), Encoding.UTF8, "application/json");
+
+                    client.DefaultRequestHeaders.Add("x-api-key-id", ArchetypeGlobalSettings.Instance.ApiKey.ToString());
+
+                    var response = client.PostAsync(new Uri(Constants.NotificationUrl), content).Result;
+
+                    if (response.StatusCode == HttpStatusCode.OK)
+                    {
+                        var responseString = response.Content.ReadAsStringAsync().Result;
+
+                        return JsonConvert.DeserializeObject<ArchetypeUpdateNotification>(responseString);
+                    }
+
+                    return new ArchetypeUpdateNotification
+                    {
+                        IsUpdateAvailable = false
+                    };
+                }
+            }
+            catch (Exception ex)
+            {
+                //if anything goes wrong let's make sure we don't break their site
+                return new ArchetypeUpdateNotification
+                {
+                    IsUpdateAvailable = false
+                };
+            }
+        }
+
+        /// <summary>
+        /// Gets the archetype pre value from data type identifier.
+        /// </summary>
+        /// <param name="dataTypeId">The data type identifier.</param>
+        /// <returns>ArchetypePreValue.</returns>
+        private ArchetypePreValue GetArchetypePreValueFromDataTypeId(int dataTypeId)
+        {
+            return _app.ApplicationCache.RuntimeCache.GetCacheItem(
+                Constants.CacheKey_PreValueFromDataTypeId + dataTypeId,
+                () =>
+                {
+                    var preValues = _app.Services.DataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeId);
+
+                    var configJson = preValues.IsDictionaryBased
+                        ? preValues.PreValuesAsDictionary[Constants.PreValueAlias].Value
+                        : preValues.PreValuesAsArray.First().Value;
+
+                    var config = JsonConvert.DeserializeObject<ArchetypePreValue>(configJson, _jsonSettings);
+                    RetrieveAdditionalProperties(ref config);
+
+                    return config;
+
+                }) as ArchetypePreValue;
+        }
+
+        /// <summary>
+        /// Gets the archetype pre value from pre values collection.
+        /// </summary>
+        /// <param name="dataTypePreValues">The data type pre values.</param>
+        /// <returns>ArchetypePreValue.</returns>
+        private ArchetypePreValue GetArchetypePreValueFromPreValuesCollection(PreValueCollection dataTypePreValues)
+        {
+            var preValueAsString = dataTypePreValues.PreValuesAsDictionary.First().Value.Value;
+            var preValue = JsonConvert.DeserializeObject<ArchetypePreValue>(preValueAsString, _jsonSettings);
+            return preValue;
+        }
+
+        /// <summary>
+        /// Gets the data type by unique identifier.
+        /// </summary>
+        /// <param name="guid">The unique identifier.</param>
+        /// <returns>IDataTypeDefinition.</returns>
+        internal IDataTypeDefinition GetDataTypeByGuid(Guid guid)
+        {
+            return (IDataTypeDefinition)ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem(
+                Constants.CacheKey_DataTypeByGuid + guid,
+                () => _app.Services.DataTypeService.GetDataTypeDefinitionById(guid));
+        }
+
+        /// <summary>
+        /// Retrieves additional metadata that isn't available on the stored model of an Archetype
+        /// </summary>
+        /// <param name="archetype">The Archetype to add the additional metadata to</param>
+        /// <param name="preValue">The configuration of the Archetype</param>
+        /// <param name="hostContentType">Type of the host content.</param>
+        private void RetrieveAdditionalProperties(ref ArchetypeModel archetype, ArchetypePreValue preValue, PublishedContentType hostContentType = null)
+        {
+            foreach (var fieldset in preValue.Fieldsets)
+            {
+                var fieldsetAlias = fieldset.Alias;
+                foreach (var fieldsetInst in archetype.Fieldsets.Where(x => x.Alias == fieldsetAlias))
+                {
+                    foreach (var property in fieldset.Properties)
+                    {
+                        var propertyAlias = property.Alias;
+                        foreach (var propertyInst in fieldsetInst.Properties.Where(x => x.Alias == propertyAlias))
+                        {
+                            propertyInst.DataTypeGuid = property.DataTypeGuid.ToString();
+                            propertyInst.DataTypeId = GetDataTypeByGuid(property.DataTypeGuid).Id;
+                            propertyInst.PropertyEditorAlias = property.PropertyEditorAlias;
+                            propertyInst.HostContentType = hostContentType;
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Retrieves additional metadata that isn't available on the stored model of an ArchetypePreValue
+        /// </summary>
+        /// <param name="preValue">The configuration of the Archetype</param>
+        private void RetrieveAdditionalProperties(ref ArchetypePreValue preValue)
+        {
+            foreach (var fieldset in preValue.Fieldsets)
+            {
+                foreach (var property in fieldset.Properties)
+                {
+                    property.PropertyEditorAlias = GetDataTypeByGuid(property.DataTypeGuid).PropertyEditorAlias;
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Gets the DLL version from the file.
+        /// </summary>
+        /// <returns>System.String.</returns>
+        internal string DllVersion()
+        {
+            var asm = Assembly.GetExecutingAssembly();
+            var fvi = FileVersionInfo.GetVersionInfo(asm.Location);
+
+            return fvi.FileVersion;
+        }
+    }
+}
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using Archetype.Models;
+using Umbraco.Core.Models;
+
+namespace Archetype.Extensions
+{
+    public static class ArchetypeModelExtensions
+    {
+        public static IEnumerable<IPublishedContent> ToPublishedContentSet(this ArchetypeModel archetype)
+        {
+            return new ArchetypePublishedContentSet(archetype);
+        }
+    }
+}
@@ -0,0 +1,39 @@
+using Archetype.Models;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PropertyEditors;
+
+namespace Archetype.Extensions
+{
+    /// <summary>
+    /// ArchetypePropertyModel extensions.
+    /// </summary>
+    public static class ArchetypePropertyModelExtensions
+    {
+        /// <summary>
+        /// Determines whether this instance is an archetype.
+        /// </summary>
+        /// <param name="prop">The property.</param>
+        /// <returns></returns>
+        public static bool IsArchetype(this ArchetypePropertyModel prop)
+        {
+            return prop.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditorAlias);
+        }
+
+        /// <summary>
+        /// Creates dummy property type.
+        /// </summary>
+        /// <param name="prop">The property.</param>
+        /// <returns></returns>
+        internal static PublishedPropertyType CreateDummyPropertyType(this ArchetypePropertyModel prop)
+        {
+            // We need to check if `PropertyValueConvertersResolver` exists,
+            // otherwise `PublishedPropertyType` will throw an exception outside of the Umbraco context.; e.g. unit-tests.
+            if (!PropertyValueConvertersResolver.HasCurrent)
+                return null;
+
+            return new PublishedPropertyType(prop.HostContentType, new PropertyType(new DataTypeDefinition(-1, prop.PropertyEditorAlias) { Id = prop.DataTypeId }));
+        }
+    }
+}
@@ -1,21 +0,0 @@
-using Umbraco.Core;
-using Archetype.Umbraco.Models;
-
-namespace Archetype.Umbraco.Extensions
-{
-    public static class Extensions
-    {
-        //lifted from the core as it is marked 'internal'
-        public static bool DetectIsJson(this string input)
-        {
-            input = input.Trim();
-            return input.StartsWith("{") && input.EndsWith("}")
-                   || input.StartsWith("[") && input.EndsWith("]");
-        }
-
-        public static bool IsArchetype(this Property prop)
-        {
-            return prop.PropertyEditorAlias.InvariantEquals("Imulus.Archetype");
-        }
-    }
-}
@@ -0,0 +1,160 @@
+using System.Text;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Mvc.Html;
+using Archetype.Models;
+using Umbraco.Core.Logging;
+
+namespace Archetype.Extensions
+{
+    /// <summary>
+    /// HtmlHelper extenions used for rendering an Archetype.
+    /// </summary>
+    public static class HtmlHelperExtensions
+    {
+        /// <summary>
+        /// Renders the partials based on the model, partial path and given viewdata dictionary.
+        /// </summary>
+        /// <param name="htmlHelper">The HTML helper.</param>
+        /// <param name="archetypeModel">The archetype model.</param>
+        /// <param name="partialPath">The partial path.</param>
+        /// <param name="viewDataDictionary">The view data dictionary.</param>
+        /// <returns></returns>
+        private static IHtmlString _renderPartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath, ViewDataDictionary viewDataDictionary)
+        {
+            var sb = new StringBuilder();
+
+            foreach (var fieldsetModel in archetypeModel)
+            {
+                sb.AppendLine(_renderPartial(htmlHelper, fieldsetModel, partialPath, viewDataDictionary).ToString());
+            }
+
+            return new HtmlString(sb.ToString());
+        }
+
+        /// <summary>
+        /// Renders the fieldset partial
+        /// </summary>
+        /// <param name="htmlHelper">The HTML helper.</param>
+        /// <param name="fieldsetModel"></param>
+        /// <param name="partialPath">The partial path.</param>
+        /// <param name="viewDataDictionary">The view data dictionary.</param>
+        /// <returns></returns>
+        private static IHtmlString _renderPartial(HtmlHelper htmlHelper, ArchetypeFieldsetModel fieldsetModel, string partialPath, ViewDataDictionary viewDataDictionary)
+        {
+            var context = HttpContext.Current;
+
+            if (fieldsetModel == null || context == null)
+            {
+                return new HtmlString("");
+            }
+
+            var sb = new StringBuilder();
+
+            //default
+            var pathToPartials = "~/Views/Partials/Archetype/";
+
+            if (!string.IsNullOrEmpty(partialPath))
+            {
+                pathToPartials = partialPath;
+            }
+
+            var partial = string.Format("{0}{1}.cshtml", pathToPartials, fieldsetModel.Alias);
+
+            if (System.IO.File.Exists(context.Server.MapPath(partial)))
+            {
+                sb.AppendLine(htmlHelper.Partial(partial, fieldsetModel, viewDataDictionary).ToString());
+            }
+            else
+            {
+                LogHelper.Info<ArchetypeModel>(string.Format("The partial for {0} could not be found.  Please create a partial with that name or rename your alias.", context.Server.MapPath(partial)));
+            }
+
+            return new HtmlString(sb.ToString());
+        }
+
+        /// <summary>
+        /// Renders a single archtype partial from a fieldset
+        /// </summary>
+        /// <param name="htmlHelper">The HTML helper.</param>
+        /// <param name="fieldsetModel">The fieldset model.</param>
+        /// <returns></returns>
+        public static IHtmlString RenderArchetypePartial(this HtmlHelper htmlHelper, ArchetypeFieldsetModel fieldsetModel)
+        {
+            return _renderPartial(htmlHelper, fieldsetModel, null, null);
+        }
+
+        /// <summary>
+        /// Renders the archetype partial.
+        /// </summary>
+        /// <param name="htmlHelper">The HTML helper.</param>
+        /// <param name="fieldsetModel">The fieldset model.</param>
+        /// <param name="partialView">The partial view.</param>
+        /// <returns></returns>
+        public static IHtmlString RenderArchetypePartial(this HtmlHelper htmlHelper, ArchetypeFieldsetModel fieldsetModel, string partialView)
+        {
+            return _renderPartial(htmlHelper, fieldsetModel, partialView, null);
+        }
+
+        /// <summary>
+        /// Renders the archetype partial.
+        /// </summary>
+        /// <param name="htmlHelper">The HTML helper.</param>
+        /// <param name="fieldsetModel">The fieldset model.</param>
+        /// <param name="partialView">The partial view.</param>
+        /// <param name="viewDataDictionary">The view data dictionary.</param>
+        /// <returns></returns>
+        public static IHtmlString RenderArchetypePartial(this HtmlHelper htmlHelper, ArchetypeFieldsetModel fieldsetModel, string partialView, ViewDataDictionary viewDataDictionary)
+        {
+            return _renderPartial(htmlHelper, fieldsetModel, partialView, viewDataDictionary);
+        }
+
+        /// <summary>
+        /// Renders the archetype partials.
+        /// </summary>
+        /// <param name="htmlHelper">The HTML helper.</param>
+        /// <param name="archetypeModel">The archetype model.</param>
+        /// <returns></returns>
+        public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel)
+        {
+            return _renderPartials(htmlHelper, archetypeModel, null, null);
+        }
+
+        /// <summary>
+        /// Renders the archetype partials.
+        /// </summary>
+        /// <param name="htmlHelper">The HTML helper.</param>
+        /// <param name="archetypeModel">The archetype model.</param>
+        /// <param name="partialPath">The partial path.</param>
+        /// <returns></returns>
+        public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath)
+        {
+            return _renderPartials(htmlHelper, archetypeModel, partialPath, null);
+        }
+
+        /// <summary>
+        /// Renders the archetype partials.
+        /// </summary>
+        /// <param name="htmlHelper">The HTML helper.</param>
+        /// <param name="archetypeModel">The archetype model.</param>
+        /// <param name="viewDataDictionary">The view data dictionary.</param>
+        /// <returns></returns>
+        public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, ViewDataDictionary viewDataDictionary)
+        {
+            return _renderPartials(htmlHelper, archetypeModel, null, viewDataDictionary);
+        }
+
+        /// <summary>
+        /// Renders the archetype partials.
+        /// </summary>
+        /// <param name="htmlHelper">The HTML helper.</param>
+        /// <param name="archetypeModel">The archetype model.</param>
+        /// <param name="partialPath">The partial path.</param>
+        /// <param name="viewDataDictionary">The view data dictionary.</param>
+        /// <returns></returns>
+        public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath, ViewDataDictionary viewDataDictionary)
+        {
+            return htmlHelper._renderPartials(archetypeModel, partialPath, viewDataDictionary);
+        }
+    }
+}
@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Umbraco.Core.PropertyEditors;
+
+namespace Archetype.Extensions
+{
+    /// <summary>
+    /// PropertyEditor extensions.
+    /// </summary>
+	public static class PropertyEditorExtensions
+    {
+		/// <summary>
+		/// Formats the default prevalues for a property editor for use within an Archetype clientside context
+		/// </summary>
+		/// <param name="propertyEditor">The property editor</param>
+		/// <returns>The formatted default prevalues</returns>
+		public static IDictionary<string, object> DefaultPreValuesForArchetype(this PropertyEditor propertyEditor)
+        {
+			if (propertyEditor.DefaultPreValues == null || propertyEditor.DefaultPreValues.Any() == false)
+			{
+				return propertyEditor.DefaultPreValues;
+			}
+			var view = propertyEditor.ValueEditor.View.ToLowerInvariant();
+
+			// This is the extension point for default prevalues formatting, in case we need to handle any other
+			// property editors later on. It should be replaced with a switch statement by then, or maybe some fancy 
+			// auto discovery of formatters :)
+			if (view == "imagecropper")
+			{
+				propertyEditor.FormatImageCropperDefaultPreValuesForArchetype();
+			}
+			return propertyEditor.DefaultPreValues;
+        }
+
+		/// <summary>
+		/// Format the default prevalues of the image cropper property editor
+		/// </summary>
+		/// <param name="propertyEditor"></param>
+		/// <remarks>
+		/// In order for the image cropper to work clientside, we need to make sure it's default prevalue "focalpoint" is returned
+		/// as a JSON object and not as the string it's defined as on the image cropper property editor.
+		/// </remarks>
+		private static void FormatImageCropperDefaultPreValuesForArchetype(this PropertyEditor propertyEditor)
+		{
+			const string focalPointKey = "focalPoint";
+
+			if (propertyEditor.DefaultPreValues.ContainsKey(focalPointKey) == false || propertyEditor.DefaultPreValues[focalPointKey] == null)
+			{
+				return;
+			}
+			var focalPoint = propertyEditor.DefaultPreValues[focalPointKey].ToString();
+			if (string.IsNullOrEmpty(focalPoint))
+			{
+				return;
+			}
+			// translate the JSON string to a JSON object
+			propertyEditor.DefaultPreValues[focalPointKey] = JsonConvert.DeserializeObject(focalPoint);
+		}
+    }
+}
@@ -0,0 +1,20 @@
+namespace Archetype.Extensions
+{
+    /// <summary>
+    /// String extensions.
+    /// </summary>
+    public static class StringExtensions
+    {
+        /// <summary>
+        /// Detects if the input string is JSON.
+        /// </summary>
+        /// <param name="input">The input.</param>
+        /// <returns></returns>
+        public static bool DetectIsJson(this string input)
+        {
+            input = input.Trim();
+            return input.StartsWith("{") && input.EndsWith("}")
+                   || input.StartsWith("[") && input.EndsWith("]");
+        }
+    }
+}
@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-
-namespace Archetype.Umbraco.Models
-{
-    public class Archetype
-    {
-	    public IEnumerable<Fieldset> Fieldsets { get; set; }
-
-        public Archetype()
-        {
-            Fieldsets = new List<Fieldset>();
-        }
-    }
-}
@@ -0,0 +1,10 @@
+using System;
+
+namespace Archetype.Models
+{
+    public class ArchetypeConfigFileModel
+    {
+        public Guid Id { get; set; }
+        public bool CheckForUpdates { get; set; }
+    }
+}
@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Web.Security;
+using Archetype.TypeConverters;
+using Newtonsoft.Json;
+using Umbraco.Core;
+
+namespace Archetype.Models
+{
+    /// <summary>
+    /// Model that represents a fieldset stored as content JSON.
+    /// </summary>
+    [TypeConverter(typeof(ArchetypeFieldsetModelConverter))]
+    public class ArchetypeFieldsetModel
+    {
+        [JsonProperty("alias")]
+        public string Alias { get; set; }
+
+        [JsonProperty("disabled")]
+        public bool Disabled { get; set; }
+
+        [JsonProperty("properties")]
+        public IEnumerable<ArchetypePropertyModel> Properties;
+
+        [JsonProperty("id")]
+        public Guid Id { get; set; }
+
+        [JsonProperty("releaseDate")]
+        public DateTime? ReleaseDate { get; set; }
+
+        [JsonProperty("expireDate")]
+        public DateTime? ExpireDate { get; set; }
+
+        [JsonProperty("allowedMemberGroups")]
+        public string AllowedMemberGroups { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArchetypeFieldsetModel"/> class.
+        /// </summary>
+        public ArchetypeFieldsetModel()
+        {
+            Properties = new List<ArchetypePropertyModel>();
+        }
+
+        #region Helper Methods
+
+        /// <summary>
+        /// Gets the value and returns as string.
+        /// </summary>
+        /// <param name="propertyAlias">The property alias.</param>
+        /// <returns></returns>
+        public string GetValue(string propertyAlias)
+        {
+            return GetValue<string>(propertyAlias);
+        }
+
+        /// <summary>
+        /// Gets the value based on the type passed in as a generic.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="propertyAlias">The property alias.</param>
+        /// <returns></returns>
+        public T GetValue<T>(string propertyAlias)
+        {
+            var property = GetProperty(propertyAlias);
+
+            if (IsEmptyProperty(property))
+            {
+                return default(T);
+            }
+
+            return property.GetValue<T>();
+        }
+
+        // issue 142: support default T value supplied by caller
+        // this code would look nicer if the two GetValue<T>() methods had one common implementation.
+        // however, this would require GetValue<T>(string propertyAlias) to call the common implementation
+        // with a default(T) value, which could in theory result in a performance hit, if T for some reason
+        // is costly to instantiate.
+        /// <summary>
+        /// Gets the value.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="propertyAlias">The property alias.</param>
+        /// <param name="defaultValue">The default value.</param>
+        /// <returns></returns>
+        public T GetValue<T>(string propertyAlias, T defaultValue)
+        {
+            var property = GetProperty(propertyAlias);
+
+            if (IsEmptyProperty(property))
+            {
+                return defaultValue;
+            }
+
+            return property.GetValue<T>();
+        }
+
+        /// <summary>
+        /// Determines whether the property is empty.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        /// <returns></returns>
+        private bool IsEmptyProperty(ArchetypePropertyModel property)
+        {
+            return (property == null || property.Value == null || string.IsNullOrEmpty(property.Value.ToString()));
+        }
+
+        /// <summary>
+        /// Determines whether the specified property alias has property.
+        /// </summary>
+        /// <param name="propertyAlias">The property alias.</param>
+        /// <returns></returns>
+        public bool HasProperty(string propertyAlias)
+        {
+            return GetProperty(propertyAlias) != null;
+        }
+
+        /// <summary>
+        /// Determines whether the specified property alias has value.
+        /// </summary>
+        /// <param name="propertyAlias">The property alias.</param>
+        /// <returns></returns>
+        public bool HasValue(string propertyAlias)
+        {
+            var property = GetProperty(propertyAlias);
+            if (property == null || property.Value == null)
+                return false;
+
+            return !string.IsNullOrEmpty(property.Value.ToString());
+        }
+
+        /// <summary>
+        /// Gets the property.
+        /// </summary>
+        /// <param name="propertyAlias">The property alias.</param>
+        /// <returns></returns>
+        private ArchetypePropertyModel GetProperty(string propertyAlias)
+        {
+            return Properties.FirstOrDefault(p => p.Alias.InvariantEquals(propertyAlias));
+        }
+
+        /// <summary>
+        /// Is this fieldset disabled, either explicitly or by other means?
+        /// </summary>
+        /// <returns>true if this fieldset is disabled, false otherwise</returns>
+        internal bool IsAvailable()
+        {
+            // explicitly disabled or implicitly disabled through publishing?
+            var disabled = Disabled
+                   || (ReleaseDate.HasValue && ReleaseDate > DateTime.UtcNow)
+                   || (ExpireDate.HasValue && DateTime.UtcNow > ExpireDate);
+            if (disabled)
+            {
+                // yes - the fieldset is not available
+                return false;
+            }
+            // limitation on member group access?
+            if (string.IsNullOrEmpty(AllowedMemberGroups))
+            {
+                // no - the fieldset is available
+                return true;
+            }
+            // maybe - the fieldset is available if the current member is a member of the configured member groups
+            var currentUserGroups = Roles.GetRolesForUser() ?? new string[0];
+            return currentUserGroups.ContainsAny(AllowedMemberGroups.Split(','));
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,134 @@
+using System;
+using System.IO;
+using System.Text;
+using Newtonsoft.Json;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+
+namespace Archetype.Models
+{
+    public class ArchetypeGlobalSettings
+    {
+        public bool CheckForUpdates { get; set; }
+        public Guid Id { get; set; }
+
+        public Guid ApiKey = _getApiKey();
+
+        private static ArchetypeGlobalSettings _instance;
+
+        private static string _pathToConfig = @"~/Config/Archetype.config.js";
+
+        private static readonly string _mappedPathToConfig = IOHelper.MapPath(_pathToConfig);
+
+        private static object _padLock = new object();
+
+        private ArchetypeGlobalSettings()
+        {
+            
+        }
+
+        public static ArchetypeGlobalSettings Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    lock (_padLock)
+                    {
+                        if (_instance == null)
+                        {
+                            _instance = new ArchetypeGlobalSettings();
+
+                            _loadSettingsFromConfigFile();
+                        }
+                    }
+                }
+
+                return _instance;
+            }
+        }
+
+        public void Save()
+        {
+            lock (_padLock)
+            {
+                //write to JSON
+                var configFileModel = new ArchetypeConfigFileModel
+                {
+                    Id = _instance.Id,
+                    CheckForUpdates = _instance.CheckForUpdates
+                };
+
+                var serializedJson = JsonConvert.SerializeObject(configFileModel, Formatting.Indented);
+
+                File.WriteAllText(_mappedPathToConfig, serializedJson);
+            }
+        }
+
+        private static void _loadSettingsFromConfigFile()
+        {
+            try
+            {
+                if (File.Exists(_mappedPathToConfig))
+                {
+                    //load
+                    var deserializedConfigFile = JsonConvert.DeserializeObject<ArchetypeConfigFileModel>(File.ReadAllText(_mappedPathToConfig));
+
+                    if (deserializedConfigFile != null)
+                    {
+                        _instance.Id = deserializedConfigFile.Id;
+                        _instance.CheckForUpdates = deserializedConfigFile.CheckForUpdates;
+                    }
+                    else
+                    {
+                        _createNewConfigFile("Config file model was null!");
+                    }
+                }
+                else
+                {
+                    _createNewConfigFile("Config file was missing!");
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error<ArchetypeGlobalSettings>(ex.Message, ex);
+
+                _createNewConfigFile("Exception!");
+            }
+        }
+
+        private static void _createNewConfigFile(string reason)
+        {
+            //write a new file with defaults
+            LogHelper.Info<ArchetypeGlobalSettings>(string.Format("Generating a new config file reason: {0}", reason));
+
+            _instance.Id = Guid.NewGuid();
+            _instance.CheckForUpdates = true;
+            _instance.Save();
+        }
+
+        private static Guid _getApiKey()
+        {
+            //this is just obfuscation and an attempt to keep out most but not the determined hacker
+            var array = new []
+            {
+                "RTA4MUZDRjA=",
+                "NzkzQS1BRDIw",
+                "OTI3QjFDNjkwQTYy",
+                "MjI0OQ=="
+            };
+
+            return new Guid(string.Format("{0}-{1}-{3}-{2}",
+                _decodeBase64(array[0]),
+                _decodeBase64(array[1]),
+                _decodeBase64(array[2]),
+                _decodeBase64(array[3])
+            ));
+        }
+
+        private static string _decodeBase64(string input)
+        {
+            return Encoding.UTF8.GetString(Convert.FromBase64String(input));
+        }
+    }
+}
@@ -0,0 +1,65 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using Archetype.TypeConverters;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Archetype.Models
+{
+    /// <summary>
+    /// Model that represents an entire Archetype.
+    /// </summary>
+    [JsonObject]
+    [TypeConverter(typeof(ArchetypeModelConverter))]
+    public class ArchetypeModel : IEnumerable<ArchetypeFieldsetModel>
+    {
+        [JsonProperty("fieldsets")]
+        public IEnumerable<ArchetypeFieldsetModel> Fieldsets { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArchetypeModel"/> class.
+        /// </summary>
+        public ArchetypeModel()
+        {
+            Fieldsets = new List<ArchetypeFieldsetModel>();
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the collection of fieldsets.
+        /// </summary>
+        /// <returns>
+        /// An enumerator that can be used to iterate through the collection.
+        /// </returns>
+        public IEnumerator<ArchetypeFieldsetModel> GetEnumerator()
+        {
+            return this.Fieldsets.Where(f => f.IsAvailable()).GetEnumerator();
+        }
+
+        //possibly obsolete?
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Serializes for persistence. This should be used for serialization as it cleans up the JSON before saving.
+        /// </summary>
+        /// <returns></returns>
+        public string SerializeForPersistence()
+        {
+            var json = JObject.Parse(JsonConvert.SerializeObject(this, new JsonSerializerSettings() { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }));
+
+            var propertiesToRemove = new String[] { "propertyEditorAlias", "dataTypeId", "dataTypeGuid", "hostContentType", "editorState" };
+
+            json.Descendants().OfType<JProperty>()
+              .Where(p => propertiesToRemove.Contains(p.Name))
+              .ToList()
+              .ForEach(x => x.Remove());
+
+            return json.ToString(Formatting.None);
+        }
+    }
+}
@@ -1,9 +1,88 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;

-namespace Archetype.Umbraco.Models
+namespace Archetype.Models
 {
-	internal class ArchetypePreValue
-	{
-		internal IEnumerable<ArchetypePreValueFieldset> Fieldsets { get; set; }
-	}
+    /// <summary>
+    /// Model that represents the configured Archetype options.
+    /// </summary>
+    public class ArchetypePreValue
+    {
+        [JsonProperty("showAdvancedOptions")]
+        public bool ShowAdvancedOptions { get; set; }
+
+        [JsonProperty("startWithAddButton")]
+        public bool StartWithAddButton { get; set; }
+
+        [JsonProperty("hideFieldsetToolbar")]
+        [Obsolete("This value is no longer used but is kept to prevent breaking changes.")]
+        public bool HideFieldsetToolbar { get; set; }
+
+        [JsonProperty("enableMultipleFieldsets")]
+        public bool EnableMultipleFieldsets { get; set; }
+
+        [JsonProperty("enableCollapsing")]
+        public bool EnableCollapsing { get; set; }
+
+        [JsonProperty("enableMultipleOpen")]
+        public bool EnableMultipleOpen { get; set; }
+
+        [JsonProperty("enableCloning")]
+        public bool EnableCloning { get; set; }
+
+        [JsonProperty("enableDisabling")]
+        public bool EnableDisabling { get; set; }
+
+        [JsonProperty("enablePublishing")]
+        public bool EnablePublishing { get; set; }
+
+        [JsonProperty("enableCrossDragging")]
+        public bool EnableCrossDragging { get; set; }
+        
+        [JsonProperty("enableMemberGroups")]
+        public bool EnableMemberGroups { get; set; }
+
+        [JsonProperty("hideFieldsetControls")]
+        public bool HideFieldsetControls { get; set; }
+
+        [JsonProperty("hidePropertyLabel")]
+        public bool HidePropertyLabel { get; set; }
+
+        [JsonProperty("minFieldsets", NullValueHandling = NullValueHandling.Ignore)]
+        public int MinFieldsets { get; set; }
+
+        [JsonProperty("maxFieldsets", NullValueHandling = NullValueHandling.Ignore)]
+        public int MaxFieldsets { get; set; }
+
+        [JsonProperty("fieldsets")]
+        public IEnumerable<ArchetypePreValueFieldset> Fieldsets { get; set; }
+
+        [JsonProperty("fieldsetGroups")]
+        public IEnumerable<ArchetypePreValueFieldsetGroup> FieldsetGroups { get; set; }
+
+        [JsonProperty("hidePropertyLabels")]
+        public bool HidePropertyLabels { get; set; }
+
+        [JsonProperty("customCssClass")]
+        public string CustomCssClass { get; set; }
+
+        [JsonProperty("customCssPath")]
+        public string CustomCssPath { get; set; }
+
+        [JsonProperty("customJsPath")]
+        public string CustomJsPath { get; set; }
+
+        [JsonProperty("customViewPath")]
+        public string CustomViewPath { get; set; }
+
+        [JsonProperty("enableDeepDatatypeRequests")]
+        public bool EnableDeepDatatypeRequests { get; set; }
+        
+        [JsonProperty("developerMode")]
+        public bool DeveloperMode { get; set; }
+
+        [JsonProperty("overrideDefaultPropertyValueConverter")]
+        public bool OverrideDefaultPropertyValueConverter { get; set; }
+    }
 }
@@ -1,10 +1,38 @@
 using System.Collections.Generic;
+using Newtonsoft.Json;

-namespace Archetype.Umbraco.Models
+namespace Archetype.Models
 {
-	internal class ArchetypePreValueFieldset
-	{
-		internal string Alias { get; set; }
-		internal IEnumerable<ArchetypePreValueProperty> Properties { get; set; }
-	}
-}
+    /// <summary>
+    /// Model that represents configured Archetype fieldsets.
+    /// </summary>
+    public class ArchetypePreValueFieldset
+    {
+        [JsonProperty("alias")]
+        public string Alias { get; set; }
+
+        [JsonProperty("remove")]
+        public bool Remove { get; set; }
+
+        [JsonProperty("collapse")]
+        public bool Collapse { get; set; }
+
+        [JsonProperty("labelTemplate")]
+        public string LabelTemplate { get; set; }
+
+        [JsonProperty("icon")]
+        public string Icon { get; set; }
+
+        [JsonProperty("label")]
+        public string Label { get; set; }
+
+        [JsonProperty("previewImage")]
+        public string PreviewImage { get; set; }
+
+        [JsonProperty("properties")]
+        public IEnumerable<ArchetypePreValueProperty> Properties { get; set; }
+
+        [JsonProperty("group")]
+        public ArchetypePreValueFieldsetGroup Group { get; set; }
+    }
+}
@@ -0,0 +1,13 @@
+using Newtonsoft.Json;
+
+namespace Archetype.Models
+{
+    /// <summary>
+    /// Model that represents configured groupings of Archetype fieldsets.
+    /// </summary>
+    public class ArchetypePreValueFieldsetGroup
+    {
+        [JsonProperty("name")]
+        public string Name { get; set; }
+    }
+}
@@ -1,9 +1,41 @@
-namespace Archetype.Umbraco.Models
+using System;
+using Newtonsoft.Json;
+
+namespace Archetype.Models
 {
-	internal class ArchetypePreValueProperty
-	{
-		internal string Alias { get; set; }
-		internal int DataTypeId { get; set; }
-		internal string PropertyEditorAlias { get; set; }
-	}
+    /// <summary>
+    /// Model that represents a configured property on an Archetype fieldset.
+    /// </summary>
+    public class ArchetypePreValueProperty
+    {
+        [JsonProperty("alias")]
+        public string Alias { get; set; }
+
+        [JsonProperty("remove")]
+        public bool Remove { get; set; }
+
+        [JsonProperty("collapse")]
+        public bool Collapse { get; set; }
+
+        [JsonProperty("label")]
+        public string Label { get; set; }
+
+        [JsonProperty("helpText")]
+        public string HelpText { get; set; }
+        
+        [JsonProperty("dataTypeGuid")]
+        public Guid DataTypeGuid { get; set; }
+
+        [JsonProperty("propertyEditorAlias")]
+        public string PropertyEditorAlias { get; set; }
+
+        [JsonProperty("value")]
+        public string Value { get; set; }
+
+        [JsonProperty("required")]
+        public bool Required { get; set; }
+
+        [JsonProperty("regEx")]
+        public string RegEx { get; set; }
+    }
 }
@@ -0,0 +1,120 @@
+using System.Collections.Generic;
+using System.Linq;
+using Archetype.Extensions;
+using Newtonsoft.Json;
+using Umbraco.Core;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Web;
+
+namespace Archetype.Models
+{
+    /// <summary>
+    /// Model that represents a stored property in Archetype.
+    /// </summary>
+    public class ArchetypePropertyModel
+    {
+        [JsonProperty("alias")]
+        public string Alias { get; set; }
+
+        [JsonProperty("value")]
+        public object Value { get; set; }
+
+        [JsonProperty("propertyEditorAlias")]
+        public string PropertyEditorAlias { get; internal set; }
+
+        [JsonProperty("dataTypeId")]
+        public int DataTypeId { get; internal set; }
+
+        [JsonProperty("dataTypeGuid")]
+        internal string DataTypeGuid { get; set; }
+
+        // container for temporary editor state from the Umbraco backend
+        [JsonProperty("editorState")]
+        internal UmbracoEditorState EditorState { get; set; }
+
+        [JsonProperty("hostContentType")]
+        internal PublishedContentType HostContentType { get; set; }
+
+        /// <summary>
+        /// Gets the value based on the type given.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public T GetValue<T>()
+        {
+            // Try Umbraco's PropertyValueConverters
+            var converters = UmbracoContext.Current != null ? PropertyValueConvertersResolver.Current.Converters : Enumerable.Empty<IPropertyValueConverter>();
+            if (!string.IsNullOrWhiteSpace(this.PropertyEditorAlias) && converters.Any())
+            {
+                var convertedAttempt = TryConvertWithPropertyValueConverters<T>(Value, converters);
+                if (convertedAttempt.Success)
+                    return convertedAttempt.Result;
+            }
+
+            // If the value is of type T, just return it
+            if (Value is T)
+                return (T)Value;
+
+            // No PropertyValueConverters matched, so try a regular type conversion
+            var convertAttempt2 = Value.TryConvertTo<T>();
+            if (convertAttempt2.Success)
+                return convertAttempt2.Result;
+
+            return default(T);
+        }
+
+        /// <summary>
+        /// Tries to convert the value with property value converters.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="value">The value.</param>
+        /// <param name="converters">The converters.</param>
+        /// <returns></returns>
+        private Attempt<T> TryConvertWithPropertyValueConverters<T>(object value, IEnumerable<IPropertyValueConverter> converters)
+        {
+            var properyType = this.CreateDummyPropertyType();
+
+            // In umbraco, there are default value converters that try to convert the 
+            // value if all else fails. The problem is, they are also in the list of
+            // converters, and the means for filtering these out is internal, so
+            // we currently have to try ALL converters to see if they can convert
+            // rather than just finding the most appropreate. If the ability to filter
+            // out default value converters becomes public, the following logic could
+            // and probably should be changed.
+            foreach (var converter in converters.Where(x => x.IsConverter(properyType)))
+            {
+                // Convert the type using a found value converter
+                var value2 = converter.ConvertDataToSource(properyType, value, false);
+
+                // If the value is of type T, just return it
+                if (value2 is T)
+                    return Attempt<T>.Succeed((T)value2);
+
+                // If ConvertDataToSource failed try ConvertSourceToObject.
+                var value3 = converter.ConvertSourceToObject(properyType, value2, false);
+
+                // If the value is of type T, just return it
+                if (value3 is T)
+                    return Attempt<T>.Succeed((T)value3);
+
+                // Value is not final value type, so try a regular type conversion aswell
+                var convertAttempt = value2.TryConvertTo<T>();
+                if (convertAttempt.Success)
+                    return Attempt<T>.Succeed(convertAttempt.Result);
+            }
+
+            return Attempt<T>.Fail();
+        }
+
+        /// <summary>
+        /// Model that represents the current UmbracoEditorState
+        /// </summary>
+        internal class UmbracoEditorState
+        {
+            // container for the names of any files selected for a property in the Umbraco backend
+            [JsonProperty("fileNames")]
+            public IEnumerable<string> FileNames;
+        }
+    }
+}
@@ -0,0 +1,186 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Archetype.Models
+{
+    public class ArchetypePublishedContent : IPublishedContent
+    {
+        private ArchetypeFieldsetModel _fieldset;
+
+        private IEnumerable<IPublishedContent> _parent;
+
+        private readonly Dictionary<string, IPublishedProperty> _properties;
+
+        public ArchetypePublishedContent(ArchetypeFieldsetModel fieldset, ArchetypePublishedContentSet parent = null)
+        {
+            if (fieldset == null)
+                throw new ArgumentNullException("fieldset");
+
+            _fieldset = fieldset;
+            _parent = parent ?? Enumerable.Empty<IPublishedContent>();
+
+            _properties = fieldset.Properties
+                .ToDictionary(
+                    x => x.Alias,
+                    x => new ArchetypePublishedProperty(x) as IPublishedProperty,
+                    StringComparer.InvariantCultureIgnoreCase);
+        }
+
+        internal ArchetypeFieldsetModel ArchetypeFieldset
+        {
+            get { return _fieldset; }
+        }
+
+        public IEnumerable<IPublishedContent> Children
+        {
+            get { return Enumerable.Empty<IPublishedContent>(); }
+        }
+
+        public IEnumerable<IPublishedContent> ContentSet
+        {
+            get { return _parent; }
+        }
+
+        public PublishedContentType ContentType
+        {
+            get { return default(PublishedContentType); }
+        }
+
+        public DateTime CreateDate
+        {
+            get { return DateTime.MinValue; }
+        }
+
+        public int CreatorId
+        {
+            get { return default(int); }
+        }
+
+        public string CreatorName
+        {
+            get { return default(string); }
+        }
+
+        public string DocumentTypeAlias
+        {
+            get { return _fieldset.Alias; }
+        }
+
+        public int DocumentTypeId
+        {
+            get { return default(int); }
+        }
+
+        public int GetIndex()
+        {
+            return _parent.IndexOf(this);
+        }
+
+        public IPublishedProperty GetProperty(string alias, bool recurse)
+        {
+            IPublishedProperty property;
+            return _properties.TryGetValue(alias, out property) ? property : null;
+        }
+
+        public IPublishedProperty GetProperty(string alias)
+        {
+            return this.GetProperty(alias, false);
+        }
+
+        public int Id
+        {
+            get { return default(int); }
+        }
+
+        public bool IsDraft
+        {
+            get { return _fieldset.IsAvailable() == false; }
+        }
+
+        public PublishedItemType ItemType
+        {
+            get { return PublishedItemType.Content; }
+        }
+
+        public int Level
+        {
+            get { return default(int); }
+        }
+
+        public string Name
+        {
+            get { return default(string); }
+        }
+
+        public IPublishedContent Parent
+        {
+            get { return default(IPublishedContent); }
+        }
+
+        public string Path
+        {
+            get { return default(string); }
+        }
+
+        public ICollection<IPublishedProperty> Properties
+        {
+            get { return _properties.Values; }
+        }
+
+        public int SortOrder
+        {
+            get { return default(int); }
+        }
+
+        public int TemplateId
+        {
+            get { return default(int); }
+        }
+
+        public DateTime UpdateDate
+        {
+            get { return default(DateTime); }
+        }
+
+        public string Url
+        {
+            get { return default(string); }
+        }
+
+        public string UrlName
+        {
+            get { return default(string); }
+        }
+
+        public Guid Version
+        {
+            get { return Guid.Empty; }
+        }
+
+        public int WriterId
+        {
+            get { return default(int); }
+        }
+
+        public string WriterName
+        {
+            get { return default(string); }
+        }
+
+        public object this[string alias]
+        {
+            get
+            {
+                var property = this.GetProperty(alias);
+
+                return property == null
+                    ? null
+                    : property.Value;
+            }
+        }
+    }
+}
@@ -0,0 +1,39 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Archetype.Models
+{
+    public class ArchetypePublishedContentSet : IEnumerable<ArchetypePublishedContent>
+    {
+        private IEnumerable<ArchetypePublishedContent> _items { get; set; }
+
+        public ArchetypePublishedContentSet(ArchetypeModel archetype)
+        {
+            if (archetype == null)
+                throw new ArgumentNullException("archetype");
+
+            this.ArchetypeModel = archetype;
+
+            var count = archetype.Fieldsets.Count();
+
+            _items = archetype.Fieldsets
+                .Where(x => x.IsAvailable())
+                .Select(x => new ArchetypePublishedContent(x, this))
+                .ToArray();
+        }
+
+        internal ArchetypeModel ArchetypeModel { get; private set; }
+
+        public IEnumerator<ArchetypePublishedContent> GetEnumerator()
+        {
+            return _items.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+    }
+}
@@ -0,0 +1,94 @@
+using System;
+using Archetype.Extensions;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Archetype.Models
+{
+    public class ArchetypePublishedProperty : IPublishedProperty
+    {
+        private readonly object _rawValue;
+        private readonly Lazy<object> _sourceValue;
+        private readonly Lazy<object> _objectValue;
+        private readonly Lazy<object> _xpathValue;
+        private readonly ArchetypePropertyModel _property;
+        private readonly PublishedPropertyType _propertyType;
+
+        public ArchetypePublishedProperty(ArchetypePropertyModel property)
+        {
+            if (property == null)
+                throw new ArgumentNullException("property");
+
+            var preview = false;
+
+            _property = property;
+            _rawValue = property.Value;
+
+			// #418 - need to wrap this in a try/catch to prevent orphaned properties from breaking everything
+	        try
+	        {
+				_propertyType = property.CreateDummyPropertyType();
+
+				if (_propertyType != null)
+				{
+					_sourceValue = new Lazy<object>(() => _propertyType.ConvertDataToSource(_rawValue, preview));
+					_objectValue = new Lazy<object>(() => _propertyType.ConvertSourceToObject(_sourceValue.Value, preview));
+					_xpathValue = new Lazy<object>(() => _propertyType.ConvertSourceToXPath(_sourceValue.Value, preview));
+				}
+	        }
+	        catch(Exception ex)
+	        {
+		        LogHelper.Warn<ArchetypePublishedProperty>(string.Format("Could not create an IPublishedProperty for property: {0} - the error was: {1}", property.Alias, ex.Message));
+	        }
+        }
+
+        internal ArchetypePropertyModel ArchetypeProperty
+        {
+            get { return _property; }
+        }
+
+        public object DataValue
+        {
+            get
+            {
+                return _sourceValue != null
+                    ? _sourceValue.Value
+                    : _rawValue;
+            }
+        }
+
+        public bool HasValue
+        {
+            get
+            {
+                return _rawValue != null && !string.IsNullOrEmpty(_rawValue.ToString());
+            }
+        }
+
+        public string PropertyTypeAlias
+        {
+            get { return _property.Alias; }
+        }
+
+        public object Value
+        {
+            get
+            {
+                return _objectValue != null
+                    ? _objectValue.Value
+                    : _rawValue;
+            }
+        }
+
+        public object XPathValue
+        {
+            get
+            {
+                return _xpathValue != null
+                    ? _xpathValue.Value
+                    : _rawValue;
+            }
+        }
+    }
+}
@@ -0,0 +1,11 @@
+namespace Archetype.Models
+{
+    public class ArchetypeUpdateNotification
+    {
+        public bool IsUpdateAvailable { get; set; }
+        public string Headline { get; set; }
+        public string Type { get; set; }
+        public string Message { get; set; }
+        public string Url { get; set; }
+    }
+}
@@ -1,43 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Umbraco.Core;
-
-namespace Archetype.Umbraco.Models
-{
-    public class Fieldset
-    {
-        public string Alias { get; set; }
-
-		public IEnumerable<Property> Properties;
-
-        public Fieldset()
-        {
-            Properties = new List<Property>();
-        }
-
-		#region Helper Methods
-
-		public string GetValue(string propertyAlias)
-        {
-            return GetValue<string>(propertyAlias);
-        }
-
-        public T GetValue<T>(string propertyAlias)
-        {
-            var property = GetProperty(propertyAlias);
-
-			if (property == null || string.IsNullOrEmpty(property.Value.ToString()))
-				return default(T);
-
-	        return property.GetValue<T>();
-        }
-
-        private Property GetProperty(string propertyAlias)
-        {
-            return Properties.FirstOrDefault(p => p.Alias.InvariantEquals(propertyAlias));
-		}
-
-		#endregion
-
-    }
-}
@@ -1,71 +0,0 @@
-using System.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PropertyEditors;
-
-namespace Archetype.Umbraco.Models
-{
-	public class Property
-    {
-		public string Alias { get; internal set; }
-		public object Value { get; internal set; }
-        public string PropertyEditorAlias { get; internal set; }
-
-		internal int DataTypeId { get; set; }
-
-		public T GetValue<T>()
-		{
-			// If the value is of type T, just return it
-			if (Value is T)
-				return (T)Value;
-
-			// Umbraco has the concept of a IPropertyEditorValueConverter which it 
-			// also queries for property resolvers. However I'm not sure what these
-			// are for, nor can I find any implementations in core, so am currently
-			// just ignoring these when looking up converters.
-			// NB: IPropertyEditorValueConverter not to be confused with
-			// IPropertyValueConverter which are the ones most people are creating
-			var properyType = CreateDummyPropertyType(DataTypeId, PropertyEditorAlias);
-			var converters = PropertyValueConvertersResolver.Current.Converters.ToArray();
-
-			// In umbraco, there are default value converters that try to convert the 
-			// value if all else fails. The problem is, they are also in the list of
-			// converters, and the means for filtering these out is internal, so
-			// we currently have to try ALL converters to see if they can convert
-			// rather than just finding the most appropreate. If the ability to filter
-			// out default value converters becomes public, the following logic could
-			// and probably should be changed.
-			foreach (var converter in converters.Where(x => x.IsConverter(properyType)))
-			{
-				// Convert the type using a found value converter
-				var value2 = converter.ConvertDataToSource(properyType, Value, false);
-
-				// If the value is of type T, just return it
-				if (value2 is T)
-					return (T)value2;
-
-				// Value is not final value type, so try a regular type conversion aswell
-				var convertAttempt = value2.TryConvertTo<T>();
-				if (convertAttempt.Success)
-					return convertAttempt.Result;
-			}
-
-			// Value is not final value type, so try a regular type conversion
-			var convertAttempt2 = Value.TryConvertTo<T>();
-			if (convertAttempt2.Success)
-				return convertAttempt2.Result;
-
-			return default(T);
-		}
-
-		private PublishedPropertyType CreateDummyPropertyType(int dataTypeId, string propertyEditorAlias)
-		{
-			return new PublishedPropertyType(null,
-				new PropertyType(new DataTypeDefinition(-1, propertyEditorAlias)
-				{
-					Id = dataTypeId
-				}));
-		}
-    }
-}
@@ -2,36 +2,17 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

-// 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("Archetype")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Archetype's supporting code library for Umbraco")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Kevin Giszewski LLC")]
 [assembly: AssemblyProduct("Archetype")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyCopyright("MIT Licensed")]
 [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)]
+[assembly: Guid("E37E94F9-C7BA-4B54-B7E1-64419B3DBA0B")]

-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("e37e94f9-c7ba-4b54-b7e1-64419b3dba0b")]
-
-// 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 Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.0.0")]
-[assembly: AssemblyFileVersion("0.1.0.0")]
-[assembly: AssemblyInformationalVersion("0.1.0-alpha")]
+[assembly: InternalsVisibleTo("Archetype.Courier")]
+[assembly: InternalsVisibleTo("Archetype.Tests")]
@@ -0,0 +1,4 @@
+using System.Reflection;
+
+[assembly: AssemblyVersion("1.17.1")]
+[assembly: AssemblyFileVersion("1.17.1")]
@@ -1,110 +1,73 @@
-using System;
-using System.Linq;
-using Newtonsoft.Json;
-using Umbraco.Core;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Models.PublishedContent;
-using Archetype.Umbraco.Models;
-using Archetype.Umbraco.Extensions;
-using Umbraco.Core.Services;
-
-namespace Archetype.Umbraco.PropertyConverters
-{
-    /* based on the Tim Geyssens sample at:  https://github.com/TimGeyssens/MatrixPropEditor/blob/master/SamplePropertyValueConverter/SamplePropertyValueConverter/MatrixValueConverter.cs */
-    [PropertyValueType(typeof(Archetype.Umbraco.Models.Archetype))]
-    [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
-    public class ArchetypeValueConverter : PropertyValueConverterBase
-    {
-	    protected JsonSerializerSettings _jsonSettings;
-
-	    public ArchetypeValueConverter()
-	    {
-			var dcr = new Newtonsoft.Json.Serialization.DefaultContractResolver();
-			dcr.DefaultMembersSearchFlags |= System.Reflection.BindingFlags.NonPublic;
-
-			_jsonSettings = new JsonSerializerSettings { ContractResolver = dcr };
-	    }
-
-	    public ServiceContext Services
-	    {
-		    get { return ApplicationContext.Current.Services; }
-	    }
-
-        public override bool IsConverter(PublishedPropertyType propertyType)
-        {
-            return propertyType.PropertyEditorAlias.Equals("Imulus.Archetype");
-        }
-
-        public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
-        {
-            if (source == null) return null;
-            
-            var sourceString = source.ToString();         
-
-            if (sourceString.DetectIsJson())
-            {
-                try
-                {
-					// Deserialize value to archetype model
-					var archetype = JsonConvert.DeserializeObject<Models.Archetype>(sourceString, _jsonSettings);
-
-					// Get list of configured properties and their types 
-					// and map them to the deserialized archetype model
-					var preValue = GetArchetypePreValueFromDataTypeId(propertyType.DataTypeId);
-	                foreach (var fieldset in preValue.Fieldsets)
-	                {
-		                var fieldsetAlias = fieldset.Alias;
-						foreach (var fieldsetInst in archetype.Fieldsets.Where(x => x.Alias == fieldsetAlias))
-		                {
-							foreach (var property in fieldset.Properties)
-							{
-								var propertyAlias = property.Alias;
-								foreach (var propertyInst in fieldsetInst.Properties.Where(x => x.Alias == propertyAlias))
-								{
-									propertyInst.DataTypeId = property.DataTypeId;
-									propertyInst.PropertyEditorAlias = property.PropertyEditorAlias;
-								}
-							}
-		                }
-	                }
-
-                    return archetype;
-                }
-                catch (Exception ex)
-                {
-                    return null;
-                }
-            }
-
-            return sourceString;
-        }
-
-	    internal ArchetypePreValue GetArchetypePreValueFromDataTypeId(int dataTypeId)
-	    {
-			var preValues = Services.DataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeId);
-
-			var configJson = preValues.IsDictionaryBased
-				? preValues.PreValuesAsDictionary["archetypeConfig"].Value
-				: preValues.PreValuesAsArray.First().Value;
-
-			var config = JsonConvert.DeserializeObject<Models.ArchetypePreValue>(configJson, _jsonSettings);
-
-		    foreach (var fieldset in config.Fieldsets)
-		    {
-			    foreach (var property in fieldset.Properties)
-			    {
-				    // Lookup the properties property editor alias
-					// (See if we've already looked it up first though to save a database hit)
-				    var propertyWithSameDataType = config.Fieldsets.SelectMany(x => x.Properties)
-					    .FirstOrDefault(x => x.DataTypeId == property.DataTypeId && !string.IsNullOrWhiteSpace(x.PropertyEditorAlias));
-
-				    property.PropertyEditorAlias = propertyWithSameDataType != null 
-						? propertyWithSameDataType.PropertyEditorAlias
-						: Services.DataTypeService.GetDataTypeDefinitionById(property.DataTypeId).PropertyEditorAlias;
-			    }
-		    }
-
-		    return config;
-	    }
-    }
-}
+using System;
+using Archetype.Extensions;
+using Archetype.Models;
+using Umbraco.Core;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+
+namespace Archetype.PropertyConverters
+{
+    /// <summary>
+    /// Default property value converter that models the JSON to a C# object.
+    /// </summary>
+    [PropertyValueType(typeof(Models.ArchetypeModel))]
+    [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
+    public class ArchetypeValueConverter : PropertyValueConverterBase
+    {
+        /// <summary>
+        /// Gets the services.
+        /// </summary>
+        /// <value>
+        /// The services.
+        /// </value>
+        public ServiceContext Services
+        {
+            get { return ApplicationContext.Current.Services; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified property type is converter for Archetype.
+        /// </summary>
+        /// <param name="propertyType">Type of the property.</param>
+        /// <returns></returns>
+        public override bool IsConverter(PublishedPropertyType propertyType)
+        {
+            var isArcheTypePropertyEditor = !String.IsNullOrEmpty(propertyType.PropertyEditorAlias) 
+                && propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditorAlias);
+            if (!isArcheTypePropertyEditor)
+                return false;
+
+            return !ArchetypeHelper.Instance.IsPropertyValueConverterOverridden(propertyType.DataTypeId);
+        }
+
+        /// <summary>
+        /// Converts the data to source.
+        /// </summary>
+        /// <param name="propertyType">Type of the property.</param>
+        /// <param name="source">The source.</param>
+        /// <param name="preview">if set to <c>true</c> [preview].</param>
+        /// <returns></returns>
+        public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
+        {
+            var defaultValue = new ArchetypeModel();
+
+            if (source == null)
+                return defaultValue;
+
+            var sourceString = source.ToString();
+
+            if (!sourceString.DetectIsJson())
+                return defaultValue;
+
+			using (var timer = DisposableTimer.DebugDuration<ArchetypeValueConverter>(string.Format("ConvertDataToSource ({0})", propertyType != null ? propertyType.PropertyTypeAlias : "null")))
+            {
+                var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(sourceString,
+                    (propertyType != null ? propertyType.DataTypeId : -1),
+                    (propertyType != null ? propertyType.ContentType : null));
+
+                return archetype;
+            }
+        }
+    }
+}
@@ -0,0 +1,278 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Archetype.Extensions;
+using Archetype.Models;
+using ClientDependency.Core;
+using Newtonsoft.Json;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Editors;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+using Umbraco.Web.PropertyEditors;
+using Umbraco.Web.Models.ContentEditing;
+
+namespace Archetype.PropertyEditors
+{
+    /// <summary>
+    /// C# representation of the property editor. This is often done with package manifest instead.
+    /// </summary>
+	[PropertyEditorAsset(ClientDependencyType.Javascript, "../App_Plugins/Archetype/js/archetype.js")]
+	[PropertyEditor(Constants.PropertyEditorAlias, "Archetype", "../App_Plugins/Archetype/views/archetype.html", ValueType = "JSON")]
+	public class ArchetypePropertyEditor : PropertyEditor
+	{
+		#region Pre Value Editor
+
+        /// <summary>
+        /// Creates a pre value editor instance
+        /// </summary>
+        /// <returns></returns>
+		protected override PreValueEditor CreatePreValueEditor()
+		{
+			return new ArchetypePreValueEditor();
+		}
+
+        /// <summary>
+        /// Class that represents the prevalue editor. This is often done with a package manifest instead.
+        /// </summary>
+		internal class ArchetypePreValueEditor : PreValueEditor
+		{
+			[PreValueField("archetypeConfig", "Config", "../App_Plugins/Archetype/views/archetype.config.html",
+				Description = "(Required) Describe your Archetype.")]
+			public string Config { get; set; }
+
+			[PreValueField("hideLabel", "Hide Label", "boolean",
+				Description = "Hide the Umbraco property title and description, making the Archetype span the entire page width")]
+			public bool HideLabel { get; set; }
+		}
+
+		#endregion
+
+		#region Value Editor
+
+        /// <summary>
+        /// Creates a value editor instance
+        /// </summary>
+        /// <returns></returns>
+		protected override PropertyValueEditor CreateValueEditor()
+		{
+			return new ArchetypePropertyValueEditor(base.CreateValueEditor());
+		}
+
+        /// <summary>
+        /// Class that represents the actual data editor. This is often done with a package manifest instead.
+        /// </summary>
+		internal class ArchetypePropertyValueEditor : PropertyValueEditorWrapper
+		{
+			protected JsonSerializerSettings _jsonSettings;
+
+			public ArchetypePropertyValueEditor(PropertyValueEditor wrapped)
+				: base(wrapped)
+			{
+			}
+
+            /// <summary>
+            /// Converts the property value for use in the front-end cache
+            /// </summary>
+            /// <param name="property"></param>
+            /// <param name="propertyType"></param>
+            /// <param name="dataTypeService"></param>
+            /// <returns></returns>
+			public override string ConvertDbToString(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
+			{
+				if(property.Value == null || property.Value.ToString() == "")
+					return string.Empty;
+
+				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(property.Value.ToString(), propertyType.DataTypeDefinitionId);
+
+				foreach (var fieldset in archetype.Fieldsets)
+				{
+					foreach (var propDef in fieldset.Properties.Where(p => p.DataTypeGuid != null))
+					{
+						try
+						{
+							if(propDef == null || propDef.DataTypeGuid == null) continue;
+							var dtd = ArchetypeHelper.Instance.GetDataTypeByGuid(Guid.Parse(propDef.DataTypeGuid));
+							var propType = new PropertyType(dtd) {Alias = propDef.Alias};
+							var prop = new Property(propType, propDef.Value);
+							var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
+							propDef.Value = propEditor.ValueEditor.ConvertDbToString(prop, propType, dataTypeService);
+						}
+						catch (Exception ex)
+						{
+							LogHelper.Error<ArchetypePropertyValueEditor>(ex.Message, ex);
+						}
+					}
+				}
+
+				return archetype.SerializeForPersistence();
+			}
+
+            /// <summary>
+            /// A method used to format the database value to a value that can be used by the editor
+            /// </summary>
+            /// <param name="property"></param>
+            /// <param name="propertyType"></param>
+            /// <param name="dataTypeService"></param>
+            /// <returns></returns>
+            /// <remarks>
+            /// The object returned will automatically be serialized into json notation. For most property editors
+            /// the value returned is probably just a string but in some cases a json structure will be returned.
+            /// </remarks>
+			public override object ConvertDbToEditor(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
+			{
+				if(property.Value == null || property.Value.ToString() == "")
+					return string.Empty;
+
+				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(property.Value.ToString(), propertyType.DataTypeDefinitionId);
+
+				foreach (var fieldset in archetype.Fieldsets)
+				{
+					foreach (var propDef in fieldset.Properties.Where(p => p.DataTypeGuid != null))
+					{
+						try
+						{
+							var dtd = ArchetypeHelper.Instance.GetDataTypeByGuid(Guid.Parse(propDef.DataTypeGuid));
+							var propType = new PropertyType(dtd) {Alias = propDef.Alias};
+							var prop = new Property(propType, propDef.Value);
+							var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
+							propDef.Value = propEditor.ValueEditor.ConvertDbToEditor(prop, propType, dataTypeService);
+						}
+						catch (Exception ex)
+						{
+							LogHelper.Error<ArchetypePropertyValueEditor>(ex.Message, ex);
+						}
+					}
+				}
+
+				return archetype;
+			}
+
+            /// <summary>
+            /// A method to deserialize the string value that has been saved in the content editor
+            /// to an object to be stored in the database.
+            /// </summary>
+            /// <param name="editorValue"></param>
+            /// <param name="currentValue">The current value that has been persisted to the database for this editor. This value may be usesful for
+            /// how the value then get's deserialized again to be re-persisted. In most cases it will probably not be used.</param>
+            /// <returns></returns>
+            /// <remarks>
+            /// By default this will attempt to automatically convert the string value to the value type supplied by ValueType.
+            /// If overridden then the object returned must match the type supplied in the ValueType, otherwise persisting the
+            /// value to the DB will fail when it tries to validate the value type.
+            /// </remarks>
+			public override object ConvertEditorToDb(ContentPropertyData editorValue, object currentValue)
+			{
+				if(editorValue.Value == null || editorValue.Value.ToString() == "")
+					return string.Empty;
+
+				// attempt to deserialize the current property value as an Archetype
+				var currentArchetype = currentValue != null ? ArchetypeHelper.Instance.DeserializeJsonToArchetype(currentValue.ToString(), editorValue.PreValues) : null;
+				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(editorValue.Value.ToString(), editorValue.PreValues);
+
+				// get all files uploaded via the file manager (if any)
+				var uploadedFiles = editorValue.AdditionalData.ContainsKey("files") ? editorValue.AdditionalData["files"] as IEnumerable<ContentItemFile> : null;
+				foreach (var fieldset in archetype.Fieldsets)
+				{
+					// make sure the publishing dates are in UTC
+					fieldset.ReleaseDate = EnsureUtcDate(fieldset.ReleaseDate);
+					fieldset.ExpireDate = EnsureUtcDate(fieldset.ExpireDate);
+
+					// assign an id to the fieldset if it has none (e.g. newly created fieldset)
+					fieldset.Id = fieldset.Id == Guid.Empty ? Guid.NewGuid() : fieldset.Id;
+					// find the corresponding fieldset in the current Archetype value (if any)
+					var currentFieldset = currentArchetype != null ? currentArchetype.Fieldsets.FirstOrDefault(f => f.Id == fieldset.Id) : null;
+					foreach (var propDef in fieldset.Properties)
+					{
+						try
+						{
+							// find the corresponding property in the current Archetype value (if any)
+							var currentProperty = currentFieldset != null ? currentFieldset.Properties.FirstOrDefault(p => p.Alias == propDef.Alias) : null;
+							var dtd = ArchetypeHelper.Instance.GetDataTypeByGuid(Guid.Parse(propDef.DataTypeGuid));
+							var preValues = ApplicationContext.Current.Services.DataTypeService.GetPreValuesCollectionByDataTypeId(dtd.Id);
+
+							var additionalData = new Dictionary<string, object>();
+
+							// figure out if we need to pass a files collection in the additional data to the property value editor
+							if(uploadedFiles != null)
+							{
+								if(dtd.PropertyEditorAlias == Constants.PropertyEditorAlias)
+								{
+									// it's a nested Archetype - just pass all uploaded files to the value editor
+									additionalData["files"] = uploadedFiles.ToList();
+								}
+								else if (propDef.EditorState != null && propDef.EditorState.FileNames != null && propDef.EditorState.FileNames.Any())
+								{
+									// pass the uploaded files that belongs to this property (if any) to the value editor
+									var propertyFiles = propDef.EditorState.FileNames.Select(fileName =>
+											uploadedFiles.FirstOrDefault(u => u.FileName != null &&
+												// #384, #389 and #394 - look for "safe" file names (using the ToSafeFileName() extension)
+												// - for backwards compatibility we'll look for the raw filename as well as the "safe" file name
+												(u.FileName.Equals(fileName, StringComparison.OrdinalIgnoreCase) || u.FileName.Equals(fileName.ToSafeFileName(), StringComparison.OrdinalIgnoreCase))
+											)
+                                        ).Where(f => f != null).ToList();
+									if(propertyFiles.Any())
+									{
+										additionalData["files"] = propertyFiles;
+									}
+								}
+							}
+							// #397 - pass along "cuid" and "puid" (part of the Umbraco 7.6 scheme)
+							if(editorValue.AdditionalData.ContainsKey("cuid"))
+							{
+								additionalData["cuid"] = editorValue.AdditionalData["cuid"];
+							}
+							if(editorValue.AdditionalData.ContainsKey("puid"))
+							{
+								additionalData["puid"] = editorValue.AdditionalData["puid"];
+							}
+							var propData = new ContentPropertyData(propDef.Value, preValues, additionalData);
+							var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
+							// make sure to send the current property value (if any) to the PE ValueEditor
+							propDef.Value = propEditor.ValueEditor.ConvertEditorToDb(propData, currentProperty != null ? currentProperty.Value : null);
+						}
+						catch (Exception ex)
+						{
+							LogHelper.Error<ArchetypePropertyValueEditor>(ex.Message, ex);
+						}
+					}
+				}
+
+				return archetype.SerializeForPersistence();
+			}
+
+            /// <summary>
+            /// Gets the property editor.
+            /// </summary>
+            /// <param name="dtd">The DTD.</param>
+            /// <returns></returns>
+			internal virtual PropertyEditor GetPropertyEditor(IDataTypeDefinition dtd)
+			{
+				if(dtd.Id != 0)
+					return PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
+
+				return dtd.PropertyEditorAlias.Equals(Constants.PropertyEditorAlias)
+					? new ArchetypePropertyEditor()
+					: (PropertyEditor) new TextboxPropertyEditor();
+			}
+
+			/// <summary>
+			/// Ensures that a datetime is in UTC
+			/// </summary>
+			/// <param name="dateTime">The datetime</param>
+			/// <returns>The datetime in UTC (or null if it's not set)</returns>
+			private DateTime? EnsureUtcDate(DateTime? dateTime)
+			{
+				if(dateTime.HasValue == false || dateTime.Value.Kind == DateTimeKind.Utc)
+				{
+					return dateTime;
+				}
+				return new DateTime(dateTime.Value.Ticks, DateTimeKind.Utc);
+			}
+		}
+
+		#endregion
+	}
+}
@@ -0,0 +1,39 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using Archetype.Extensions;
+using Archetype.Models;
+using Umbraco.Core.Models;
+
+namespace Archetype.TypeConverters
+{
+    public class ArchetypeFieldsetModelConverter : TypeConverter
+    {
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(IPublishedContent) ||
+                destinationType == typeof(ArchetypePublishedContent))
+            {
+                return true;
+            }
+
+            if (destinationType == typeof(string))
+            {
+                // NOTE: The converter needs to return false here, otherwise `ArchetypeHelper.DeserializeJsonToArchetype` fails.
+                return false;
+            }
+
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (value is ArchetypeFieldsetModel && (destinationType == typeof(IPublishedContent) || destinationType == typeof(ArchetypePublishedContent)))
+            {
+                return ((ArchetypeFieldsetModel)value).ToPublishedContent();
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+    }
+}
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using Archetype.Extensions;
+using Archetype.Models;
+using Umbraco.Core.Models;
+
+namespace Archetype.TypeConverters
+{
+    public class ArchetypeModelConverter : TypeConverter
+    {
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(ArchetypePublishedContentSet) ||
+                destinationType == typeof(IEnumerable<IPublishedContent>))
+            {
+                return true;
+            }
+
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (value is ArchetypeModel && (destinationType == typeof(ArchetypePublishedContentSet) || destinationType == typeof(IEnumerable<IPublishedContent>)))
+            {
+                return ((ArchetypeModel)value).ToPublishedContentSet();
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+    }
+}
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
-  <package id="ClientDependency" version="1.7.0.4" targetFramework="net45" />
+  <package id="ClientDependency" version="1.7.1.2" targetFramework="net45" />
  <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
+  <package id="ImageProcessor" version="1.9.0.0" targetFramework="net45" />
+  <package id="ImageProcessor.Web" version="3.2.3.0" targetFramework="net45" />
  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net45" />
@@ -17,8 +19,8 @@
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
  <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="UmbracoCms.Core" version="7.0.1" targetFramework="net45" />
+  <package id="UmbracoCms.Core" version="7.1.2" targetFramework="net45" />
  <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
 </packages>
@@ -1,148 +0,0 @@
-[
-	{
-		"propertyEditorAlias": "Umbraco.CheckBoxList",
-		"view": "checkboxlist"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.ColorPickerAlias",
-		"view": "colorpicker"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.ContentPickerAlias",
-		"view": "contentpicker"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.Date",
-		"view": "datepicker",
-		"defaultPreValues": [{ "format": "yyyy-MM-dd", "pickTime": false }]
-	},
-	{
-		"propertyEditorAlias": "Umbraco.DateTime",
-		"view": "datepicker",
-		"format": "yyyy-MM-dd hh:mm:ss"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.DropDown",
-		"view": "dropdown"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.DropDownMultiple",
-		"view": "dropdown"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.DropDownMultiplePublishKeys",
-		"view": "dropdown"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.DropdownlistPublishingKeys",
-		"view": "dropdown"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.EmailAddress",
-		"view": "email"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.UploadField",
-		"view": "fileupload"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.FolderBrowser",
-		"view": "folderbrowser"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.Integer",
-		"view": "integer"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.NoEdit",
-		"view": "readonlyvalue"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.ListView",
-		"view": "listview"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.MacroContainer",
-		"view": "macrocontainer"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.MarkdownEditor",
-		"view": "markdowneditor"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.MediaPicker",
-		"view": "mediapicker",
-		"defaultPreValues": [{ "multiPicker": "0" }]
-	},
-	{
-		"propertyEditorAlias": "Umbraco.MemberGroupPicker",
-		"view": "membergrouppicker"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.MemberPicker",
-		"view": "memberpicker"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.MultiNodeTreePicker",
-		"view": "contentpicker",
-		"defaultPreValues": [{ "multiPicker": "1" }]
-	},
-	{
-		"propertyEditorAlias": "Umbraco.MultipleMediaPicker",
-		"view": "mediapicker"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.MultipleTextstring",
-		"view": "multipletextbox"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.RadioButtonList",
-		"view": "radiobuttons"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.RelatedLinks",
-		"view": "relatedlinks"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.TinyMCEv3",
-		"view": "rte"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.Slider",
-		"view": "slider"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.Tags",
-		"view": "tags",
-		"defaultPreValues": [{ "group": "default" }]
-	},
-	{
-		"propertyEditorAlias": "Umbraco.TextboxMultiple",
-		"view": "textarea"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.Textbox",
-		"view": "textbox"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.TrueFalse",
-		"view": "boolean"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.UserPicker",
-		"view": "entitypicker",
-		"defaultPreValues": [{ "entityType": "User" }]
-	},
-	{
-		"propertyEditorAlias": "Umbraco.NoEdit",
-		"view": "readonlyvalue"
-	},
-	{
-		"propertyEditorAlias": "Umbraco.Textbox",
-		"view": "textbox"
-	},
-	{
-		"propertyEditorAlias": "Imulus.Archetype",
-		"view": "/App_Plugins/Archetype/views/archetype.html"
-	}
-]
@@ -1,19 +1,36 @@
-angular.module("umbraco").controller("Imulus.ArchetypeConfigController", function ($scope, $http, assetsService, dialogService, archetypePropertyEditorResource) {
-    
-    //$scope.model.value = ""; 
-    //console.log($scope.model.value); 
+angular.module("umbraco").controller("Imulus.ArchetypeConfigController", function ($scope, $http, assetsService, dialogService, archetypePropertyEditorResource, archetypeGlobalConfigService, notificationsService) {
+
+    //$scope.model.value = "";
+    //console.log($scope.model.value);

    //define empty items
-    var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeId": "-88", "value": ""}';
-    var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "icon": "", "label": "", "properties": [' + newPropertyModel + ']}';
-    var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "fieldsets": [' + newFieldsetModel + ']}');
+    var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeGuid": "0cc0eba1-9960-42c9-bf9b-60e150b429ae", "value": ""}';
+    var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "icon": "", "label": "", "properties": [' + newPropertyModel + '], "group": null}';
+    var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "startWithAddButton": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "enableCollapsing": true, "enableMultipleOpen": true, "enableCloning": false, "enableDisabling": true, "enableDeepDatatypeRequests": false, "enablePublishing": false, "enableMemberGroups": false, "enableCrossDragging": false, "fieldsets": [' + newFieldsetModel + '], "fieldsetGroups": []}');

    //ini the model
    $scope.model.value = $scope.model.value || defaultFieldsetConfigModel;
-    
+
+    $scope.dllVersion = "";
+
+    archetypePropertyEditorResource.getDllVersion().then(function(data){
+        $scope.dllVersion = data.dllVersion;
+    });
+       
+    archetypeGlobalConfigService.checkForUpdates().then(function(data) {
+        if(data.isUpdateAvailable) {
+            notificationsService.add({
+                headline: data.headline,
+                type: data.type,
+                message: data.message,
+                url: data.url
+            });
+        }
+    });
+
    //ini the render model
    initConfigRenderModel();
- 
+
    //get the available datatypes
    archetypePropertyEditorResource.getAllDataTypes().then(function(data) {
        $scope.availableDataTypes = data;
@@ -40,20 +57,27 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio

        }
    };
-    
+
+    // added to track loaded fieldsets 
+    $scope.loadedFieldsets = [];
+    $scope.isLoaded = function (fieldset) {
+        return $scope.loadedFieldsets.indexOf(fieldset) >= 0;
+    }
+
    //function that determines how to manage expanding/collapsing fieldsets
    $scope.focusFieldset = function(fieldset){
        var iniState;
-        
+
        if(fieldset)
        {
            iniState = fieldset.collapse;
        }
-        
+
        _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
            if($scope.archetypeConfigRenderModel.fieldsets.length == 1 && fieldset.remove == false)
            {
                fieldset.collapse = false;
+                $scope.loadedFieldsets.push(fieldset);
                return;
            }

@@ -64,12 +88,14 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
            else
            {
                fieldset.collapse = false;
+                $scope.loadedFieldsets.push(fieldset);
            }
        });
-        
+
        if(iniState)
        {
            fieldset.collapse = !iniState;
+            $scope.loadedFieldsets.push(fieldset);
        }
    }

@@ -79,7 +105,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
    //function that determines how to manage expanding/collapsing properties
    $scope.focusProperty = function(properties, property){
        var iniState;
-        
+
        if(property)
        {
            iniState = property.collapse;
@@ -95,7 +121,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
                property.collapse = false;
            }
        });
-        
+
        if(iniState)
        {
            property.collapse = !iniState;
@@ -104,29 +130,40 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio

    //ini the properties
    _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
-            $scope.focusProperty(fieldset.properties);
+        $scope.focusProperty(fieldset.properties);
    });
-    
+
    //setup JSON.stringify helpers
    $scope.archetypeConfigRenderModel.toString = stringify;
-    
+
    //encapsulate stringify (should be built into browsers, not sure of IE support)
    function stringify() {
        return JSON.stringify(this);
    }
-    
+
    //watch for changes
    $scope.$watch('archetypeConfigRenderModel', function (v) {
-        //console.log(v);
-        if (typeof v === 'string') {     
+        if (typeof v === 'string') {
            $scope.archetypeConfigRenderModel = JSON.parse(v);
            $scope.archetypeConfigRenderModel.toString = stringify;
        }
    });
-    
+
+    $scope.autoPopulateAlias = function (modelProperty) {
+        if (modelProperty && !modelProperty.aliasIsDirty) {
+            modelProperty.alias = modelProperty.label.toUmbracoAlias();
+        }
+    }
+
+    $scope.markAliasDirty = function (modelProperty) {
+        if (modelProperty && !modelProperty.aliasIsDirty) {
+            modelProperty.aliasIsDirty = true;;
+        }
+    }
+
    //helper that returns if an item can be removed
    $scope.canRemoveFieldset = function ()
-    {   
+    {
        return countVisibleFieldset() > 1;
    }

@@ -135,10 +172,10 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
    {
        return countVisibleFieldset() > 1;
    }
-    
+
    //helper that returns if an item can be removed
    $scope.canRemoveProperty = function (fieldset)
-    {   
+    {
        return countVisibleProperty(fieldset) > 1;
    }

@@ -148,17 +185,17 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
        return countVisibleProperty(fieldset) > 1;
    }

-    $scope.getDataTypeNameById = function (id) {
+    $scope.getDataTypeNameByGuid = function (guid) {
        if ($scope.availableDataTypes == null) // Might not be initialized yet?
            return "";
-
+        
        var dataType = _.find($scope.availableDataTypes, function(d) {
-            return d.id == id;
+            return d.guid == guid;
        });

        return dataType == null ? "" : dataType.name;
    }
-    
+
    //helper to count what is visible
    function countVisibleFieldset()
    {
@@ -172,7 +209,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio

        return count;
    }
-    
+
    //determines how many properties are visible
    function countVisibleProperty(fieldset)
    {
@@ -186,13 +223,13 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio

        return count;
    }
-   
+
    //handles a fieldset add
    $scope.addFieldsetRow = function ($index, $event) {
        $scope.archetypeConfigRenderModel.fieldsets.splice($index + 1, 0, JSON.parse(newFieldsetModel));
        $scope.focusFieldset();
    }
-    
+
    //rather than splice the archetypeConfigRenderModel, we're hiding this and cleaning onFormSubmitting
    $scope.removeFieldsetRow = function ($index) {
        if ($scope.canRemoveFieldset()) {
@@ -201,12 +238,12 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
            }
        }
    }
-    
+
    //handles a property add
    $scope.addPropertyRow = function (fieldset, $index) {
        fieldset.properties.splice($index + 1, 0, JSON.parse(newPropertyModel));
    }
-    
+
    //rather than splice the archetypeConfigRenderModel, we're hiding this and cleaning onFormSubmitting
    $scope.removePropertyRow = function (fieldset, $index) {
        if ($scope.canRemoveProperty(fieldset)) {
@@ -215,15 +252,27 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
            }
        }
    }
-    
+
    //helper to ini the render model
    function initConfigRenderModel()
    {
        $scope.archetypeConfigRenderModel = $scope.model.value;
+        if (!$scope.archetypeConfigRenderModel.fieldsetGroups) {
+            $scope.archetypeConfigRenderModel.fieldsetGroups = [];
+        }

-        _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
+        _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset) {
+
+            if (fieldset.group) {
+                // tie the fieldset group back up to the actual group object, not the clone that's been persisted
+                fieldset.group = _.find($scope.archetypeConfigRenderModel.fieldsetGroups, function(fieldsetGroup) {
+                    return fieldsetGroup.name == fieldset.group.name;
+                })
+            }

            fieldset.remove = false;
+            if (fieldset.alias.length > 0)
+                fieldset.aliasIsDirty = true;

            if(fieldset.label)
            {
@@ -232,41 +281,61 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio

            _.each(fieldset.properties, function(fieldset){
                fieldset.remove = false;
+                if (fieldset.alias.length > 0)
+                    fieldset.aliasIsDirty = true;
            });
        });
    }
-    
+
    //sync things up on save
    $scope.$on("formSubmitting", function (ev, args) {
        syncModelToRenderModel();
    });
-    
+
    //helper to sync the model to the renderModel
    function syncModelToRenderModel()
    {
        $scope.model.value = $scope.archetypeConfigRenderModel;
        var fieldsets = [];
-        
+
        _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
            //check fieldsets
            if (!fieldset.remove) {
                fieldsets.push(fieldset);
-                
+
                var properties = [];

                _.each(fieldset.properties, function(property){
                   if (!property.remove) {
                        properties.push(property);
-                    } 
+                    }
                });

                fieldset.properties = properties;
            }
        });
-        
+
        $scope.model.value.fieldsets = fieldsets;
    }
-    
+
+    $scope.showOptions = function ($event, template) {
+        $event.preventDefault();
+
+        dialogService.closeAll();
+
+        dialogService.open({
+            template: template,
+            show: true,
+            callback: function (data) {
+                // replace the entire render model if it was changed (in developer options)
+                if (data.model && data.modelChanged) {
+                    $scope.archetypeConfigRenderModel = data.model;
+                }
+            },
+            dialogData: { model: $scope.archetypeConfigRenderModel }
+        });
+    }
+
    //archetype css
-    assetsService.loadCss("/App_Plugins/Archetype/css/archetype.css");
+    assetsService.loadCss("../App_Plugins/Archetype/css/archetype.css");
 });
@@ -0,0 +1,16 @@
+angular.module('umbraco').controller('ArchetypeConfigOptionsController', function ($scope) {
+    
+    //handles a fieldset group add
+    $scope.addFieldsetGroup = function () {
+        $scope.dialogData.model.fieldsetGroups.push({ name: "" });
+    }
+
+    //handles a fieldset group removal
+    $scope.removeFieldsetGroup = function ($index) {
+        $scope.dialogData.model.fieldsetGroups.splice($index, 1);
+    }
+
+    $scope.apply = function(index) {
+        $scope.submit($scope.dialogData);
+    }
+});
@@ -0,0 +1,21 @@
+angular.module('umbraco').controller('ArchetypeConfigGlobalOptionsController', function ($scope, archetypeGlobalConfigService) {
+    $scope.globalSettings = {};
+  
+    $scope.confirmCheckNewVersionChange = function() {      
+        archetypeGlobalConfigService.setCheckForUpdates($scope.globalSettings.checkForNewVersion);
+    }
+    
+    function getGlobalSettings()
+    {
+        archetypeGlobalConfigService.globalSettings().then(function(data) {          
+            $scope.globalSettings.checkForNewVersion = data.isCheckingForUpdates;
+        });
+    }    
+    
+    init();
+       
+    function init()
+    {      
+        getGlobalSettings();
+    }
+});
@@ -12,7 +12,7 @@ angular.module("umbraco.directives").directive('archetypeLocalize', function (ar

 	return {
 	    restrict: "E",
-	    rep1ace: true,
+	    replace: true,
 	    link: linker,
 	    scope: {
 	    	key: '@'
@@ -0,0 +1,29 @@
+angular.module("umbraco.directives")
+    .directive('archetypeClickOutside', function ($timeout, $parse) {
+        return {
+            restrict: 'A',
+            link: function (scope, element, attrs, ctrl) {
+                var fn = $parse(attrs.archetypeClickOutside);
+
+                // add click event handler (delayed so we don't trigger the callback immediately if this directive itself was triggered by a mouse click)
+                $timeout(function () {
+                  $(document).on("click", mouseClick);
+                }, 500);
+
+                function mouseClick(event) {  
+                    if($(event.target).closest(element).length > 0) {
+                        return;
+                    }
+                    var callback = function () {
+                        fn(scope, { $event: event });
+                    };
+                    scope.$apply(callback);
+                }
+
+                // unbind event
+                scope.$on('$destroy', function () {
+                    $(document).off("click", mouseClick);
+                });
+            }
+        };
+    });
@@ -0,0 +1,22 @@
+angular.module("umbraco.directives").directive('archetypeCustomView', function ($compile, $http) {
+    var linker = function (scope, element, attrs) {
+
+        var view = "../App_plugins/Archetype/views/archetype.default.html";
+        if(scope.model.config.customViewPath) {
+            view = scope.model.config.customViewPath;
+        }
+
+        $http.get(view, { cache: true }).then(function(data) {
+
+            element.html(data.data).show();
+
+            $compile(element.contents())(scope);
+        });
+    }
+
+    return {
+        restrict: "A",
+        replace: true,
+        link: linker
+    }
+});
@@ -1,71 +1,28 @@
-angular.module("umbraco.directives").directive('archetypeProperty', function ($compile, $http, archetypePropertyEditorResource, umbPropEditorHelper) {
-    
-    function getFieldsetByAlias(fieldsets, alias)
-    {
-        return _.find(fieldsets, function(fieldset){
-            return fieldset.alias == alias;
-        });
-    }
-
-    function getPropertyIndexByAlias(properties, alias){
-        for (var i in properties)
-        {
-            if (properties[i].alias == alias) {
-                return i;
-            }
-        }
-    }
-
-    function getPropertyByAlias(fieldset, alias){
-        return _.find(fieldset.properties, function(property){
-            return property.alias == alias; 
-        });
-    }
-
-    //helper that returns a JS ojbect from 'value' string or the original string
-    function jsonOrString(value, developerMode, debugLabel){
-        if(value && typeof value == 'string'){
-            try{
-                if(developerMode == '1'){
-                    console.log("Trying to parse " + debugLabel + ": " + value); 
-                }
-                value = JSON.parse(value);
-            }
-            catch(exception)
-            {
-                if(developerMode == '1'){
-                    console.log("Failed to parse " + debugLabel + "."); 
-                }
-            }
-        }
-
-        if(value && developerMode == '1'){
-            console.log(debugLabel + " post-parsing: ");
-            console.log(value); 
-        }
-
-        return value;
-    }
+angular.module("umbraco.directives").directive('archetypeProperty', function ($compile, $http, archetypePropertyEditorResource, umbPropEditorHelper, $timeout, $rootScope, $q, fileManager, editorState, archetypeService) {

    var linker = function (scope, element, attrs, ngModelCtrl) {
-        var configFieldsetModel = getFieldsetByAlias(scope.archetypeConfig.fieldsets, scope.fieldset.alias);
+        var configFieldsetModel = archetypeService.getFieldsetByAlias(scope.archetypeConfig.fieldsets, scope.fieldset.alias);
        var view = "";
        var label = configFieldsetModel.properties[scope.propertyConfigIndex].label;
-        var dataTypeId = configFieldsetModel.properties[scope.propertyConfigIndex].dataTypeId;
+        var dataTypeGuid = configFieldsetModel.properties[scope.propertyConfigIndex].dataTypeGuid;
        var config = null;
        var alias = configFieldsetModel.properties[scope.propertyConfigIndex].alias;
        var defaultValue = configFieldsetModel.properties[scope.propertyConfigIndex].value;
-
+        var propertyAliasParts = [];
+        var propertyAlias = archetypeService.getUniquePropertyAlias(scope, propertyAliasParts);
+        
        //try to convert the defaultValue to a JS object
-        defaultValue = jsonOrString(defaultValue, scope.archetypeConfig.developerMode, "defaultValue");
+        defaultValue = archetypeService.jsonOrString(defaultValue, scope.archetypeConfig.developerMode, "defaultValue");

        //grab info for the selected datatype, prepare for view
-        archetypePropertyEditorResource.getDataType(dataTypeId).then(function (data) {
+        archetypePropertyEditorResource.getDataType(dataTypeGuid, scope.archetypeConfig.enableDeepDatatypeRequests, editorState.current.contentTypeAlias, scope.propertyEditorAlias, alias, editorState.current.id).then(function (data) {
            //transform preValues array into object expected by propertyeditor views
            var configObj = {};
+
            _.each(data.preValues, function(p) {
                configObj[p.key] = p.value;
            });
+            
            config = configObj;

            //determine the view to use [...] and load it
@@ -74,47 +31,21 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c

                //load in the DefaultPreValues for the PropertyEditor, if any
                var defaultConfigObj =  {};
-                if (propertyEditor.hasOwnProperty('defaultPreValues')) {
-                    _.each(propertyEditor.defaultPreValues, function(p) {
-                        _.extend(defaultConfigObj, p)
-                    });
+                if (propertyEditor.hasOwnProperty('defaultPreValues') && propertyEditor.defaultPreValues != null) {
+                    _.extend(defaultConfigObj, propertyEditor.defaultPreValues);
                }
+
                var mergedConfig = _.extend(defaultConfigObj, config);

-                loadView(pathToView, mergedConfig, defaultValue, alias, scope, element, ngModelCtrl);
+                loadView(pathToView, mergedConfig, defaultValue, alias, propertyAlias, scope, element, ngModelCtrl, configFieldsetModel);
            });
        });
-
-        ngModelCtrl.$parsers.push(validate);
-        ngModelCtrl.$formatters.push(validate);
-
-        function validate(renderModel){
-            var valid = true;
-
-            _.each(renderModel, function(fieldset){
-                fieldset.isValid = true;
-                _.each(fieldset.properties, function(property){
-                    property.isValid = true;
-
-                    var propertyConfig = getPropertyByAlias(configFieldsetModel, property.alias);
-
-                    if(propertyConfig && propertyConfig.required && property.value == ""){
-                        fieldset.isValid = false;
-                        property.isValid = false;
-                        valid = false;
-                    }
-                });
-            });
-
-            ngModelCtrl.$setValidity('validation', valid);
-            return renderModel;
-        }
    }

-    function loadView(view, config, defaultValue, alias, scope, element, ngModelCtrl) {
+    function loadView(view, config, defaultValue, alias, propertyAlias, scope, element, ngModelCtrl, configFieldsetModel) {
        if (view)
        {
-            $http.get(view).success(function (data) {
+            $http.get(view, { cache: true }).success(function (data) {
                if (data) {
                    if (scope.archetypeConfig.developerMode == '1')
                    {
@@ -122,35 +53,131 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                    }

                    //define the initial model and config
+                    scope.form = scope.umbracoForm;
                    scope.model = {};
                    scope.model.config = {};

                    //ini the property value after test to make sure a prop exists in the renderModel
-                    var renderModelPropertyIndex = getPropertyIndexByAlias(scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties, alias);
+                    scope.renderModelPropertyIndex = archetypeService.getPropertyIndexByAlias(archetypeService.getFieldset(scope).properties, alias);

-                    if (!renderModelPropertyIndex)
+                    if (!scope.renderModelPropertyIndex)
                    {
-                        scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties.push(JSON.parse('{"alias": "' + alias + '", "value": "' + defaultValue + '"}'));
-                        renderModelPropertyIndex = getPropertyIndexByAlias(scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties, alias);
+                        var propertyValue = { alias: alias, value: defaultValue };
+                        archetypeService.getFieldset(scope).properties.push(propertyValue);
+                        scope.renderModelPropertyIndex = archetypeService.getPropertyIndexByAlias(archetypeService.getFieldset(scope).properties, alias);
+                    }
+
+                    scope.renderModel = {};
+                    scope.model.value = archetypeService.getFieldsetProperty(scope).value;
+
+                    // init the property editor state (while ensuring the temporary ID is retained
+                    // from any prior initializations).
+                    var fieldsetProperty = archetypeService.getFieldsetProperty(scope);
+                    var oldState = fieldsetProperty.editorState;
+                    archetypeService.ensureTemporaryId(fieldsetProperty);
+                    if (oldState) {
+                        fieldsetProperty.editorState.temporaryId = oldState.temporaryId;
                    }
-                    scope.model.value = scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties[renderModelPropertyIndex].value;

                    //set the config from the prevalues
                    scope.model.config = config;

+                    /*
+                        Property Specific Hacks
+
+                        Preference is to not do these, but unless we figure out core issues, this is quickest fix.
+                    */
+
+                    //MNTP *single* hack
+                    if(scope.model.config.maxNumber && scope.model.config.multiPicker)
+                    {
+                        if(scope.model.config.maxNumber == "1")
+                        {
+                            scope.model.config.multiPicker = "0";
+                        }
+                    }
+
+                    //hacks for various built-in datatyps including upload, colorpicker and tags
+                    if (!scope.propertyForm) {
+                        scope.propertyForm = scope.form;
+                    }
+                    if (!scope.model.validation) {
+                        scope.model.validation = {};
+                        scope.model.validation.mandatory = 0;
+                    }
+
                    //some items need an alias
-                    scope.model.alias = "archetype-property-" + scope.fieldsetIndex + "-" + scope.propertyConfigIndex;
+                    scope.model.alias = "archetype-property-" + propertyAlias;
+                    //some items also need an id (file upload for example)
+                    scope.model.id = propertyAlias;

                    //watch for changes since there is no two-way binding with the local model.value
                    scope.$watch('model.value', function (newValue, oldValue) {
-                        scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties[renderModelPropertyIndex].value = newValue;
+                        
+                        archetypeService.getFieldsetProperty(scope).value = newValue;

-                        //trigger the validation pipeline
-                        ngModelCtrl.$setViewValue(ngModelCtrl.$viewValue);
+                        // notify the linker that the property value changed
+                        archetypeService.propertyValueChanged(archetypeService.getFieldset(scope), archetypeService.getFieldsetProperty(scope));
+                    });
+
+                    scope.$on('archetypeFormSubmitting', function (ev, args) {
+                        // #385 - revert the changes made in #311 to avoid publishing invalid fieldsets (leaving the code from #311 here, in case we figure out how to re-introduce "save as draft")
+                        // if(args.action !== 'save') {
+                        // validate all fieldset properties
+                        _.each(scope.fieldset.properties, function (property) {
+                            archetypeService.validateProperty(scope.fieldset, property, configFieldsetModel);
+                        });
+
+                        var validationKey = "validation-f" + scope.fieldsetIndex;
+
+                        ngModelCtrl.$setValidity(validationKey, scope.fieldset.isValid);
+                        // }
+
+                        // did the value change (if it did, it most likely did so during the "formSubmitting" event)
+                        var property = archetypeService.getFieldsetProperty(scope);
+
+                        var currentValue = property.value;
+
+                        if (currentValue != scope.model.value) {
+                            archetypeService.getFieldsetProperty(scope).value = scope.model.value;
+
+                            // notify the linker that the property value changed
+                            archetypeService.propertyValueChanged(archetypeService.getFieldset(scope), archetypeService.getFieldsetProperty(scope));
+                        }
+                    });
+
+                    // issue 114: handle file selection on property editors
+                    scope.$on("filesSelected", function (event, args) {
+                        // populate the fileNames collection on the property editor state
+                        var property = archetypeService.getFieldsetProperty(scope);
+
+                        property.editorState.fileNames = [];
+
+                        _.each(args.files, function (item) {
+                            property.editorState.fileNames.push(item.name);
+                        });
+
+                        // remove the files set for this property
+                        // NOTE: we can't use property.alias because the file manager registers the selected files on the assigned Archetype property alias (e.g. "archetype-property-archetype-property-archetype-property-content-0-2-0-1-0-0")
+                        fileManager.setFiles(scope.model.alias, []);
+
+                        // now tell the containing Archetype to pick up the selected files
+                        scope.archetypeRenderModel.setFiles(args.files);
+                    });
+
+                    scope.$on("archetypeRemoveFieldset", function (ev, args) {
+                        var validationKey = "validation-f" + args.index;
+                        ngModelCtrl.$setValidity(validationKey, true);
                    });

                    element.html(data).show();
                    $compile(element.contents())(scope);
+
+                    $timeout(function() {
+                        var def = $q.defer();
+                        def.resolve(true);
+                        $rootScope.$apply();
+                    }, 500);
                }
            });
        }
@@ -159,15 +186,18 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
    return {
        require: "^ngModel",
        restrict: "E",
-        rep1ace: true,
+        replace: true,
        link: linker,
        scope: {
            property: '=',
            propertyConfigIndex: '=',
+            propertyEditorAlias: '=',
            archetypeConfig: '=',
            fieldset: '=',
            fieldsetIndex: '=',
-            archetypeRenderModel: '='
+            archetypeRenderModel: '=',
+            umbracoPropertyAlias: '=',
+            umbracoForm: '='
        }
    }
 });
@@ -0,0 +1,25 @@
+angular.module("umbraco.directives").directive('archetypeSubmitWatcher', function ($rootScope) {
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+        // call the load callback on scope to obtain the ID of this submit watcher
+        var id = scope.loadCallback ? scope.loadCallback() : 0;
+
+        scope.$on("formSubmitting", function (ev, args) {
+            // on the "formSubmitting" event, call the submit callback on scope to notify the Archetype controller to do it's magic
+            if (id == scope.activeSubmitWatcher) {
+                scope.submitCallback(args);
+            }
+        });
+    }
+
+    return {
+        restrict: "E",
+        replace: true,
+        link: linker,
+        template: "",
+        scope: {
+            loadCallback: '=',
+            submitCallback: '=',
+            activeSubmitWatcher: '='
+        }
+    }
+});
@@ -1,15 +0,0 @@
-angular.module('umbraco.filters').filter("archetypeLocale", function(){
-	return function(key, locales){
-
-		if(!locales)
-			return key;
-
-		if(!locales.defaultLocale)
-			return key;
-
-		if(!locales.locale)
-			return key;
-
-		return locales.locale[key] || locales.defaultLocale[key] || key;
-	}
-})
@@ -0,0 +1,51 @@
+//create a namespace (optional)
+var ArchetypeSampleLabelHelpers = {};
+
+//create a function
+//you will add it to your label template field as `{{ArchetypeSampleLabelHelpers.testPromise(someArchetypePropertyAlias)}}`
+ArchetypeSampleLabelHelpers.testPromise = function(value) {   
+    //you can inject services
+    return function ($timeout, archetypeCacheService) {        
+        //best to return a promise
+        //NOTE: $timeout returns a promise
+        return $timeout(function () {
+            return "As Promised: " + value;
+        }, 1000);
+    }
+}
+
+ArchetypeSampleLabelHelpers.testEntityPromise = function(value, scope, args) {
+    //hey look, args!
+    //{{ArchetypeSampleLabelHelpers.testEntityPromise(someArchetypePropertyAlias, {foo: 1})}}
+    console.log(args);
+    
+    return function ($q, entityResource) {    
+        var deferred = $q.defer();
+    
+        entityResource.getById(args.foo, 'document').then(function(entity) {
+            console.log("Hello from testEntityPromise");
+            console.log(entity);
+            deferred.resolve(entity.name);
+        });
+    
+        return deferred.promise;
+    }
+}
+
+ArchetypeSampleLabelHelpers.testEntityPromise2 = function(value, scope, args) {  
+    //hey look, args but we're also using the built-in archetypeCacheService
+    //{{ArchetypeSampleLabelHelpers.testEntityPromise(someArchetypePropertyAlias, {foo: 1234})}}
+    console.log(args);        
+    
+    return function ($q, archetypeCacheService) {    
+        var deferred = $q.defer();
+    
+        archetypeCacheService.getEntityById(args.foo, 'document').then(function(entity) {
+            console.log("Hello from testEntityPromise2");
+            console.log(entity);
+            deferred.resolve(entity.name);
+        });
+    
+        return deferred.promise;
+    }
+}
@@ -1,34 +1,62 @@
 {
 	"label": "Label",
 	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon"
+	"addFieldset": "Tilføj et element",
+	"hideFieldsetControls": "Skjul fieldsets?",
+	"hideFieldsetControlsDescription": "Skjuler kontrollerne tilføj/fjern/sortér.",
+	"toggleAdvanced": "Slå avancerede muligheder til/fra",
+	"toggleAdvancedDescription": "Vis avancerede muligheder.",
+	"hidePropertyLabels": "Skjul labels på egenskaber?",
+	"hidePropertyLabelsDescription": "Skjuler labels på egenskaber.",
+	"maxFieldsets": "Maks antal fieldsets",
+	"maxFieldsetsDescription": "Hvor mange fieldsets er tilladt? Hvis der skrives '1' vil deaktivere kontrollerne. Som standard er det ubegrænset.",
+	"enableMultipleFieldsets": "Aktivér flere Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Tillader flere typer af fieldsets i denne archetype.",
+	"hideFieldsetToolbar": "Skjul Fieldset værktøjslinie?",
+	"hideFieldsetToolbarDescription": "Skjuler den fieldset værktøjslinie der fremkommer når der findes mere end ét fieldset.",
+	"customWrapperClass": "Egen Wrapper Class",
+	"customWrapperClassDescription": "(Mulighed) Angiv din egen CSS class som tilføjes på wrapper div'en.",
+	"cssFile": "CSS fil",
+	"cssFileDescription": "(Mulighed) Tilføj en sti til din egen CSS fil der skal inkluderes på siden.",
+	"jsFile": "JavaScript fil",
+	"jsFileDescription": "(Mulighed) Tilføj en sti til din egen JavaScript fil der skal inkluderes på siden.",
+	"toggleDeveloperMode": "Slå udvikler muligheder til/fra.",
+	"toggleDeveloperModeDescription": "Aktivér på udvikler muligheder.",
+	"configModel": "Konfigurationsmodel",
+	"configModelDescription": "Vær forsigt med at redigere teksten for neden, den kontrollerer skemaet for denne archetype.",
+	"helpText": "Hjælpe tekst",
+	"defaultValue": "Standard værdi",
+	"dataType": "Datatype",
+	"required": "Påkrævet",
+	"regEx": "RegEx validering",
+	"properties": "Egenskaber",
+	"labelTemplate": "Label skabelon",
+	"select": "Vælg",
+	"icon": "Ikon",
+	"enableDisabling": "Aktivér fieldset-deaktivering?",
+	"enableDisablingDescription": "Tillad brugere at aktivere/deaktivere individuelle fieldsets.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset-grupper",
+  "fieldsetGroupsDescription":"Hvis du har mange fieldsets, skal du måske overveje at gruppere dem i fieldset-vælgeren. Når du først har defineret dine grupper her, vil en gruppe-vælger dukke op i fieldset-editoren, og du kan derefter vælge grupper for alle dine fieldsets.",
+  "fieldsetGroupName":"Navn",
+  "addFieldsetGroup":"Tilføj gruppe",
+  "enablePublishing": "Aktivér fieldset-publicering?",
+  "enablePublishingDescription": "Tillad automatisk udgivelse og udløb for fieldsets",
+  "publish": "Publicering",
+  "publishHelpText": "Konfigurér udgivelses- og udløbsdato for dette element",
+  "publishReleaseDate": "Udgivelsesdato",
+  "publishExpireDate": "Udløbsdato",
+  "settings": "Indstillinger",
+  "enableMemberGroups": "Aktivér medlems-grupper",
+  "enableMemerGroupsDescription": "Tillad at fieldsets kun vises for specifikke medlems-grupper",
+  "allowedMemberGroups": "Tilladte medlems-grupper",
+  "allowedMemberGroupsHelpText": "Vælg de medlems-grupper, der skal kunne se dette element. Hvis der ikke er valgt nogen, kan alle se elementet.",
+  "previewFieldsetOpen": "(se eksempel)",
+  "previewFieldsetHeader": "Eksempel: ",
+  "previewFieldsetClose": "(luk eksempel)"
 }
@@ -0,0 +1,62 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"addFieldset": "Tilføj et element",
+	"hideFieldsetControls": "Skjul fieldsets?",
+	"hideFieldsetControlsDescription": "Skjuler kontrollerne tilføj/fjern/sortér.",
+	"toggleAdvanced": "Slå avancerede muligheder til/fra",
+	"toggleAdvancedDescription": "Vis avancerede muligheder.",
+	"hidePropertyLabels": "Skjul labels på egenskaber?",
+	"hidePropertyLabelsDescription": "Skjuler labels på egenskaber.",
+	"maxFieldsets": "Maks antal fieldsets",
+	"maxFieldsetsDescription": "Hvor mange fieldsets er tilladt? Hvis der skrives '1' vil deaktivere kontrollerne. Som standard er det ubegrænset.",
+	"enableMultipleFieldsets": "Aktivér flere Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Tillader flere typer af fieldsets i denne archetype.",
+	"hideFieldsetToolbar": "Skjul Fieldset værktøjslinie?",
+	"hideFieldsetToolbarDescription": "Skjuler den fieldset værktøjslinie der fremkommer når der findes mere end ét fieldset.",
+	"customWrapperClass": "Egen Wrapper Class",
+	"customWrapperClassDescription": "(Mulighed) Angiv din egen CSS class som tilføjes på wrapper div'en.",
+	"cssFile": "CSS fil",
+	"cssFileDescription": "(Mulighed) Tilføj en sti til din egen CSS fil der skal inkluderes på siden.",
+	"jsFile": "JavaScript fil",
+	"jsFileDescription": "(Mulighed) Tilføj en sti til din egen JavaScript fil der skal inkluderes på siden.",
+	"toggleDeveloperMode": "Slå udvikler muligheder til/fra.",
+	"toggleDeveloperModeDescription": "Aktivér på udvikler muligheder.",
+	"configModel": "Konfigurationsmodel",
+	"configModelDescription": "Vær forsigt med at redigere teksten for neden, den kontrollerer skemaet for denne archetype.",
+	"helpText": "Hjælpe tekst",
+	"defaultValue": "Standard værdi",
+	"dataType": "Datatype",
+	"required": "Påkrævet",
+	"regEx": "RegEx validering",
+	"properties": "Egenskaber",
+	"labelTemplate": "Label skabelon",
+	"select": "Vælg",
+	"icon": "Ikon",
+	"enableDisabling": "Aktivér fieldset-deaktivering?",
+	"enableDisablingDescription": "Tillad brugere at aktivere/deaktivere individuelle fieldsets.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset-grupper",
+  "fieldsetGroupsDescription":"Hvis du har mange fieldsets, skal du måske overveje at gruppere dem i fieldset-vælgeren. Når du først har defineret dine grupper her, vil en gruppe-vælger dukke op i fieldset-editoren, og du kan derefter vælge grupper for alle dine fieldsets.",
+  "fieldsetGroupName":"Navn",
+  "addFieldsetGroup":"Tilføj gruppe",
+  "enablePublishing": "Aktivér fieldset-publicering?",
+  "enablePublishingDescription": "Tillad automatisk udgivelse og udløb for fieldsets",
+  "publish": "Publicering",
+  "publishHelpText": "Konfigurér udgivelses- og udløbsdato for dette element",
+  "publishReleaseDate": "Udgivelsesdato",
+  "publishExpireDate": "Udløbsdato",
+  "settings": "Indstillinger",
+  "enableMemberGroups": "Aktivér medlems-grupper",
+  "enableMemerGroupsDescription": "Tillad at fieldsets kun vises for specifikke medlems-grupper",
+  "allowedMemberGroups": "Tilladte medlems-grupper",
+  "allowedMemberGroupsHelpText": "Vælg de medlems-grupper, der skal kunne se dette element. Hvis der ikke er valgt nogen, kan alle se elementet.",
+  "previewFieldsetOpen": "(se eksempel)",
+  "previewFieldsetHeader": "Eksempel: ",
+  "previewFieldsetClose": "(luk eksempel)"
+}
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -27,8 +28,21 @@
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -0,0 +1,48 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"addFieldset": "Add an item",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
+}
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias", 
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -10,7 +11,7 @@
 	"maxFieldsets": "Max Fieldsets",
 	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
 	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this Archetype.",
 	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
 	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
 	"customWrapperClass": "Custom Wrapper Class",
@@ -22,13 +23,28 @@
 	"toggleDeveloperMode": "Toggle Developer Mode",
 	"toggleDeveloperModeDescription": "Turn on for developer options.",
 	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this Archetype.",
 	"helpText": "Help Text",
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+	"enableCrossDragging":"Enable Cross-Archetype Dragging?",
+	"enableCrossDraggingDescription":"Allows fieldsets to be dragged into other Archetypes.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -10,7 +11,7 @@
 	"maxFieldsets": "Max Fieldsets",
 	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
 	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this Archetype.",
 	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
 	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
 	"customWrapperClass": "Custom Wrapper Class",
@@ -22,13 +23,28 @@
 	"toggleDeveloperMode": "Toggle Developer Mode",
 	"toggleDeveloperModeDescription": "Turn on for developer options.",
 	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this Archetype.",
 	"helpText": "Help Text",
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+	"enableCrossDragging":"Enable Cross-Archetype Dragging?",
+	"enableCrossDraggingDescription":"Allows fieldsets to be dragged into other Archetypes.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -0,0 +1,50 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"addFieldset": "Add an item",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this Archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this Archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+	"enableCrossDragging":"Enable Cross-Archetype Dragging?",
+	"enableCrossDraggingDescription":"Allows fieldsets to be dragged into other Archetypes.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
+}
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -27,8 +28,21 @@
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -0,0 +1,48 @@
+{
+	"label": "Label",
+	"alias": "Alias",
+	"addFieldset": "Add an item",
+	"hideFieldsetControls": "Hide Fieldset Controls?",
+	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
+	"toggleAdvanced": "Toggle Advanced Options",
+	"toggleAdvancedDescription": "Show advanced options.",
+	"hidePropertyLabels": "Hide Property Labels?",
+	"hidePropertyLabelsDescription": "Hides the property labels.",
+	"maxFieldsets": "Max Fieldsets",
+	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
+	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
+	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
+	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
+	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
+	"customWrapperClass": "Custom Wrapper Class",
+	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
+	"cssFile": "CSS File",
+	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
+	"jsFile": "JS File",
+	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
+	"toggleDeveloperMode": "Toggle Developer Mode",
+	"toggleDeveloperModeDescription": "Turn on for developer options.",
+	"configModel": "Config Model",
+	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
+	"helpText": "Help Text",
+	"defaultValue": "Default Value",
+	"dataType": "DataType",
+	"required": "Required",
+	"regEx": "RegEx Validation",
+	"properties": "Properties",
+	"labelTemplate": "Label Template",
+	"select": "Select",
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
+}
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -27,8 +28,21 @@
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -27,8 +28,21 @@
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -27,8 +28,21 @@
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -27,8 +28,21 @@
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -27,8 +28,21 @@
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -27,8 +28,21 @@
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -27,8 +28,21 @@
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -27,8 +28,21 @@
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -27,8 +28,21 @@
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -27,8 +28,21 @@
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -27,8 +28,21 @@
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -1,6 +1,7 @@
 {
 	"label": "Label",
 	"alias": "Alias",
+	"addFieldset": "Add an item",
 	"hideFieldsetControls": "Hide Fieldset Controls?",
 	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
 	"toggleAdvanced": "Toggle Advanced Options",
@@ -27,8 +28,21 @@
 	"defaultValue": "Default Value",
 	"dataType": "DataType",
 	"required": "Required",
+	"regEx": "RegEx Validation",
 	"properties": "Properties",
 	"labelTemplate": "Label Template",
 	"select": "Select",
-	"icon": "Icon"
+	"icon": "Icon",
+	"enableDisabling": "Enable Fieldset Disabling?",
+	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled.",
+	"deepDatatypeRequest":"Enable Deep Datatype Requests?",
+	"deepDatatypeRequestDescription":"Allows for easier datatype interception at the cost of caching performance.",
+    "overrideDefaultConverterDescription":"Check this if you wish to use your own custom property value converter.",
+    "overrideDefaultConverter":"Override Default Property Value Converter?",
+    "enableCloning":"Enable Cloning?",
+ 	"enableCloningDescription":"Enable Fieldset Cloning.",
+  "fieldsetGroups":"Fieldset groups",
+  "fieldsetGroupsDescription":"If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.",
+  "fieldsetGroupName":"Name",
+  "addFieldsetGroup":"Add group"
 }
@@ -1,266 +1,714 @@
-.archetypeEditor {
-    width: 98%;
-}
+{{VERSION}}

-.archetypeEditor fieldset{
-    border: 1px solid #dddddd;
-    padding: 0;
-    margin-bottom: 5px;
-    background-color: #f1f1f1;
-    clear: both;
-    display: inline-block;
-    width: 100%;
-}
-
-.archetypeEditor .archetypeFieldsetLabel {
-    padding: 8px 25px 8px 3px;
-    float: left;
+.archetypeEditor {
    width: 98%;

-    span {
-        font-weight: bold;
-    }
-
-    &:hover {
-        cursor: pointer;
-
-        label span {
-            text-decoration: underline;
+    .usky-grid {
+        .cell-tools-menu {
+            height: 385px;
+        }
+        &.withGroups {
+            .cell-tools-menu {
+                height: 415px;
+            }
        }
    }

+    .open {
+        position: relative;
+    }
+
+    .dropdown-menu {
+        top: auto;
+        > li > a {
+            border-radius: 6px;
+        }
+    }
+
+    .controls-no-label {
+        padding: 10px;
+    }
+
+    a+ul.dropdown-menu {
+        margin-left: 0;
+    }
+
+    .fieldsetIcon {
+        float: left;
+        padding: 0 10px 0 0;
+        vertical-align: text-bottom;
+    }
+
    .caret {
-        float:left;
-        margin: 8px 1px 0 7px;
+        margin: 8px 1px 0 2px;
        &.caret-right {
            border-bottom: 4px solid transparent;
            border-top: 4px solid transparent;
-            border-left: 4px solid #000000;
+            border-left: 4px solid #ddd;
            content: "";
            margin-top: 6px;
        }
    }

-    label{
-        float: left;
-        width: 80%;
-        margin-bottom: 0;
-        margin-left: 5px;
+    fieldset {
+        border-bottom: 1px dashed #dddddd;
        padding: 0;
-        span {
-            display: inline-block;
+        clear: both;
+        display: inline-block;
+        width: 100%;
+
+        .archetypeProperty {
+            clear: both;
+            overflow: visible;
+            margin-top: 3px;
+
+            label {
+                padding-left: 5px !important;
+
+                span {
+                    color: #343434;
+                }
+                &.dimmed span {
+                    color: #d9d9d9;
+                }
+
+            }
+            
+            .publishOptions {
+                .publishDate {
+                    display: inline-block;
+                    vertical-align: top;
+                    margin-right: 20px;
+                    
+                    label {
+                        padding: 0 !important;
+                        margin: 0 !important;
+                    }
+                }
+            }
+        }
+
+        .archetypeFieldsetLabel {
+            position: relative;
+            width: 100%;
+            background: white;
+
+            .label-sub {
+                padding: 18px 0;
+                display: inline-block;
+                min-height: 20px; /* this makes the header clickable when there's no icon and no text */
+                &.module-label {
+                    width: 100%;
+                }
+                &:hover {
+                    cursor: pointer;
+    
+                    label  {
+                        // span {
+                        //     text-decoration: underline;
+                        // }
+                        &:hover {
+                            cursor: pointer;
+                        }
+                    }
+                    
+                    .caret-right {
+                        border-left-color: #333;
+                    }
+                }
+            }
+
+            .dropdown-menu {
+                position: relative;
+                padding: 0;
+                border-radius: 0;
+                box-shadow: none;
+                margin-top: -10px;
+            }
+
+            span {
+                // font-weight: bold;
+
+                &.menu-label { font-weight: normal; }
+            }
+
+            label:hover {
+                cursor: default;
+            }
+
+            .caret {
+                position: absolute;
+            }
+
+            label {
+                margin-bottom: 0;
+                margin-left: 18px;
+                padding: 0;
+                display: block;
+                span {
+                    display: block;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    max-height: 40px;
+                    -webkit-line-clamp: 2;
+                    -webkit-box-orient: vertical;
+                    display: -webkit-box;
+                }
+            }
+
+            &.dimmed {
+                label {
+                    color: #d9d9d9 !important;
+                }
+            }
+
+            .archetypeEditorControls {
+                float: none;
+                position: absolute;
+                right: 0;
+                top: 0;
+                height: 100%; 
+                padding: 0;
+                display: flex;
+                align-items: center;
+                opacity: 0;
+                transition: opacity .15s ease-in-out;
+                -moz-transition: opacity .15s ease-in-out;
+                -webkit-transition: opacity .15s ease-in-out;
+                background: white;
+
+                &:before {
+                    content: ' ';
+                    position: absolute;
+                    display: block; 
+                    left: -40px;
+                    width: 40px;
+                    top: 0;
+                    bottom: 0;
+                    background: -webkit-linear-gradient(90deg, rgba(255,255,255,0), white);
+                    background: -moz-linear-gradient(90deg, rgba(255,255,255,0), white);
+                    background: linear-gradient(90deg, rgba(255,255,255,0), white);
+                }
+
+                .icon {
+                    display: inline-block;
+                    height: 28px;
+                    width: 28px;
+                    line-height: 28px;
+                    border-radius: 14px;
+                    border: 1px solid #d6d6d6;
+                    color: #5f5f5f;
+                    background: white;
+                    font-size: 16px;
+                    text-align: center;
+                    margin-left: 8px;
+
+                    &:hover {
+                        background: #f3f3f5;
+                    }
+                    &.icon-trash:hover {
+                        background: #fe5b57;
+                        border-color: #fe5b57;
+                        color: white;
+                    }
+                    &.icon-disabled {
+                        cursor: default;
+                        &:hover {
+                            color: #ddd;
+                            background: white;
+                        }
+                    }
+                    &.icon-active {
+                        color: #bbb;
+                        &:hover {
+                            color: white;
+                        }
+                    }
+                }
+            }
+
+            &:hover .archetypeEditorControls {
+                opacity: 1;
+            }
+        }
+
+        &.is-open > .archetypeFieldsetLabel .archetypeEditorControls {
+            opacity: 1;
+        }
+
+        .archetypePropertyError {
+            margin-bottom: 5px;
+            padding-top: 3px;
+            padding-bottom: 3px;
+
+            label {
+
+                span {
+                    color: #b94a48;
+                    font-weight: bold;
+                }
+            }
+        }
+
+        .archetypeCollapser {
+            clear: both;
+            height: 100%;
+            padding: 24px 20px 0 20px;
+            background-color: #fafafa;
+            border-top: 1px dashed #e0e0e0;
+            line-height: 20px;
+
+            .archetypeFieldsetLabel {
+                background: #fafafa;
+            }
+
+            .archetypeEditorControls {
+                background: #fafafa;
+
+                &:before {
+                    background: -webkit-linear-gradient(90deg, rgba(250,250,250,0), #fafafa);
+                    background: -moz-linear-gradient(90deg, rgba(250,250,250,0), #fafafa);
+                    background: linear-gradient(90deg, rgba(250,250,250,0), #fafafa);
+                }
+            }
+
+            form {
+                margin-left:20px;
+
+                .control-label {
+                    padding-top: 0 !important;
+                }
+            }
+
+            .archetypeFieldsetHelpText {
+                clear:both;
+                margin-bottom: 3px;
+                font-size: 12px;
+            }
        }
    }
-}

-.archetypeEditor .archetypeCollapser{
-    clear: both;
-    height: 100%;
-    margin-top: 10px;
-    padding-top: 12px;
-    background-color: #fff;
-    border-top: 1px solid silver;
-    border-radius: 0 0 0 5px;
-}
+    .archetypeDeveloperModel
+    {
+        font-family: monospace;
+        width: 98%;
+        min-height: 100px;
+        margin-bottom: 10px;
+        border: 1px solid red;
+    }

-.archetypeEditor .multiPropertyTextbox{
-    margin-bottom: 3px;
-}
+    .archetypeFieldsetError {
+        border: 1px solid #b94a48;
+    }

-.archetypeEditor ul{
-    list-style: none;
-    margin-left: 0;
-}
+    .archetypeFooter {
+        text-align: center;
+        margin-top: 20px;
+    }

-.archetypeEditor, .archetypeConfig{
-    .archetypeEditorControls{
-        float: right;
-        i {
-            cursor: pointer;
-            &.handle {
-                cursor: move;
+    .archetypeAddButton {
+        display: inline-block;
+        height: 28px;
+        width: 28px;
+        line-height: 28px;
+        border-radius: 14px;
+        border: 1px solid #b6b6b6;
+        color: #5f5f5f;
+        background: white;
+        font-size: 16px;
+        text-align: center;
+        text-decoration: none;
+        cursor: pointer;
+
+        &:hover {
+            background: #00aea2;
+            border-color: #00aea2;
+            color: white;
+        }
+    }
+
+    .archetypeEmptyContent {
+        text-align: center;
+        margin-bottom: 20px;
+
+        span {
+            display: inline-block;
+            padding: 10px 20px;
+            clear: both;
+            font-size: 14px;
+            color: #555;
+            background: #f8f8f8;
+            border-radius: 15px;
+        }
+    }
+
+    .archetypeCrossDraggable + .archetypeEmptyContent {
+        margin-top: -42px;
+    }
+
+    &.archetypeDragging .archetypeCrossDraggable + .archetypeEmptyContent {
+        display: none;
+    }
+
+    // Necessary to ensure empty lists can be dropped onto when sorting nested fieldsets.
+    .archetypeSortable.archetypeEmpty.archetypeCrossDraggable {
+        min-height: 40px;
+        border: 1px dashed transparent;
+    }
+
+    &.archetypeDragging .archetypeSortable.archetypeEmpty.archetypeCrossDraggable {
+        min-height: 56px;
+        border-color: #dddddd;
+    }
+
+
+    .archetypeCollapser .archetypeEmptyContent span {
+        background: #f2f2f2;
+    }
+
+    .multiPropertyTextbox {
+        margin-bottom: 3px;
+    }
+
+    ul {
+        list-style: none;
+        margin-left: 0;
+    }
+    li {
+        line-height: 20px;
+    }
+
+    .show-validation.ng-invalid .control-group.error .control-label {
+        span {
+            color: #343434;
+        }
+    }
+
+    .fieldsetPicker {
+        .icon {
+            color: #333;
+        }
+        ul.elements li {
+            overflow: visible;
+            vertical-align: top;  
+            height: 90px;        
+            .fieldsetPreviewOpen {
+                font-style: italic;
+                a:hover {
+                    text-decoration: underline;
+                }
+            }
+        }
+        ul.groups {
+            display: block;
+            margin: 0;
+            padding: 4px;
+            li {
+                width: auto;
+                margin: 0;
+                padding: 0 20px;
+                font-weight: bold;
+                a {
+                    color: #d9d9d9;
+                    cursor: pointer;
+                }
+                &.active a, a:hover {
+                    color: #999;
+                    text-decoration: none;
+                }
+            }
+        }
+
+        .fieldsetPreview {
+            .fieldsetPreviewClose {
+                font-style: italic;
+                font-size: 12px;
+                text-align: center;
+            }
+            .fieldsetPreviewImage {
+                padding: 6px 0px;
+                img {
+                    height: auto;
+                    max-width: 100%;
+                    vertical-align: middle;
+                    border: 0;
+                    cursor: zoom-in;
+                }
+            }
+        }
+    }
+
+    .settingsWrapper {
+        &:hover {
+            caret {
+                background-color: #333;
+            }
+        }
+        .settingsHeader {
+            label {
+                display: inline-block;
+            }
+            &:hover {
+                cursor: pointer;
+                label {
+                    text-decoration: underline;
+                }
+
+                .caret-right {
+                    border-left-color: #333;
+                }
+            }
+        }
+        
+        .settings {
+            padding: 14px;
+            background-color: #f8f8f8;
+            overflow: hidden;
+
+            .allowedGroups {
+                .umb-membergrouppicker a {
+                    i {
+                        padding-right: 0;
+                        font-size: inherit;
+                    }
+
+                    &:hover i {
+                        color: #333;
+                    }
+                }
            }
        }
    }
 }

-.archetypeEditor form {
-    margin-left:20px;
-
-    .control-label {
-        padding-top: 0 !important;
+.archetypeEditor, .archetypeConfig {
+    .archetypeEditorControls {
+        float: right;
    }
-}
-
-.archetypeEditor .archetypeProperty{
-    clear: both;
-    overflow: hidden;
-    margin-top: 3px;
-}
-
-.archetypeEditor .archetypeDeveloperModel
-{
-    font-family: monospace;
-    width: 98%;
-    min-height: 100px;
-    margin-bottom: 10px;
-    border: 1px solid red;
-}
-
-.archetypeEditor .archetypeFieldsetToolbar {
-    margin-bottom: 10px;
-    overflow: hidden;
-
-    li {
-        float: left;
-        padding: 2px 4px;
-        margin-right: 10px;
-        border: 1px solid #ddd;
-        cursor: pointer;
+    
+    .archetypeEditorControls, .archetypeFieldsetGroups {
+        i {
+            cursor: pointer;
+            &.handle {
+                cursor: move;
+            }
+            &.dimmed {
+                color: #d9d9d9;
+            }
+        }
    }
 }

-.archetypeEditor .archetypeFieldsetHeaderText{
-    clear:both;
-    margin-bottom: 3px;
-    font-size: 12px;
-}
-
-.archetypeEditor .archetypeFieldsetFooterText{
-    clear:both;
-    margin-bottom: 3px;
-    font-size: 12px;
-}
-
-.archetypeEditor .archetypeFieldsetHelpText{
-    clear:both;
-    margin-bottom: 3px;
-    font-size: 12px;
-}
-
 .archetypeConfig {
    margin-bottom: 20px;
-}

-.archetypeConfig ul{
-    list-style: none;
-}
+    .archetype-headline {

-.archetypeConfig li{
-    background-color: #fff;
-}
+        img {
+            margin-right: 5px;
+        }

-.archetypeConfig label{
-    width: 120px;
-}
+        small {
+            margin-left: 5px;
+        }

-.archetypeConfig .archetypeFieldsetWrapper{
-    border: 1px solid #ccc;
-    padding: 10px;
-    margin-bottom: 10px;
-}
+        a {
+            float: right;

-.archetypeConfig .archetypeFieldsetOption{
-    margin-bottom: 15px;
-    input[type=text]{
-        max-width: 300px;
+            img {
+                width: 35px;
+            }
+        }
    }
-}

-.archetypeConfig .archetypeDeveloperModel {
-    font-family: monospace;
-    width: 88%;
-    margin: 5px 10px 10px;
-    height: 130px;
-}
-
-.archetypeConfig .archetypePropertiesWrapper {
-    border: 1px solid #ddd;
-    padding: 8px;
-    margin: -40px 10px 10px 140px;
-    max-width: 475px;
+    .manual-link {
+        color: blue;
+    }
+    
+    .donate-link {
+        font-weight: 700;
+    }
+    
+    .sponsors {
+        padding-bottom: 10px;
+        margin-bottom: 5px;
+        margin-left: 5px;
+        display: inline-table;
+        float: right;
+        
+        a {
+            float: none;
+        }
+        
+        h4 {
+            border-bottom: 1px solid #ccc;
+        }
+    }

    ul {
-        padding: 0;
-        margin: 0;
+        list-style: none;
    }

    li {
+        background-color: #fff;
+    }
+
+    label {
+        width: 120px;
+        padding-left: 0;
+    }
+
+    .archetypeEditorControls {
+        float: right;
+    }
+
+    .archetypeFieldsets {
+        margin-left: 0;
+        border-top: 5px solid;
+        padding-top: 5px;
+    }
+
+    .archetypeFieldsetWrapper {
+        border: 1px solid #ccc;
        padding: 10px;
        margin-bottom: 10px;
-        background-color: #eee;
+    }
+
+    .archetypeFieldsetTitle {
+        cursor: pointer;
+        overflow: hidden;
+    }
+
+    .archetypeFieldsetOption {
+        margin-bottom: 15px;
+        margin-right: 15px;

        input[type=text] {
-            max-width: 190px;
-            width: auto;
-        }
-
-        select {
-            max-width: 160px;
+            max-width: 100%;
+            width: 100%;
        }
    }

-    li:last-child {
-        margin-bottom: 0;
+    .archetypeDeveloperModel {
+        font-family: monospace;
+        width: 88%;
+        margin: 5px 10px 10px;
+        height: 130px;
    }
-}

-.archetypeConfig .archetypeFieldsets {
-    margin-left: 0;
-}
-
-.archetypeConfig .archetypeFieldsetTitle {
-    cursor: pointer;
-    overflow: hidden;
-}
-
-.archetypeConfig .archetypeOptions label{
-    width: 400px;
-}
-
-.archetypeConfig .archetypeAdvancedOptions {
-    margin-top: 15px;
-    div {
-        margin-bottom: 10px;
-    }
-    label {
-        width: 400px;
-    }
-}
-
-.archetypeConfig .archetypeMaxFieldsets{
-    border: 1px solid #ddd;
-    width: 40px;
-    text-align: right;
-}
-
-.archetypeConfig .archetypePropertyTitle {
-    cursor: pointer;
-    overflow: hidden;
-}
-
-.archetypeConfig .archetypePropertyCollapser{
-    margin-top: 10px;
-    div {
-        margin-bottom: 10px;
-    }
-}
-
-.archetypeEditor .archetypeFieldsetError{
-    border: 1px solid #b94a48;
-}
-
-.archetypeEditor .archetypePropertyError{
-    margin-bottom: 5px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-
-    label {
-
-        span {
-            color: #b94a48;
-            font-weight: bold;
+    .archetypeOptions {
+        .btn {
+            margin-bottom: 5px;
        }
+
+        label {
+            width: 400px;
+        }
+    }
+
+    .archetypePropertiesWrapper {
+        border: 1px solid #ddd;
+        padding: 8px;
+        margin: -40px 10px 10px 140px;
+
+        ul {
+            padding: 0;
+            margin: 0;
+        }
+
+        li {
+            padding: 10px;
+            margin-bottom: 10px;
+            background-color: #eee;
+
+            input[type=text] {
+                max-width: 100%;
+                width: 100%;
+            }
+
+            select {
+                max-width: 100%;
+                width: 100%;
+            }
+        }
+
+        li:last-child {
+            margin-bottom: 0;
+        }
+    }
+
+    .archetypeAdvancedOptions {
+        label {
+            width: 100%;
+        }
+
+        input[type=text] {
+            width: 100%;
+        }
+
+        input[type=checkbox] {
+            margin-top: 0;
+            margin-right: 2px;
+        }
+
+        small {
+            color: #b3b3b3;
+        }
+
+        .archetypeFieldsetGroups {
+            padding: 0 10px;
+            margin-bottom: 20px;
+
+            ul {
+                padding: 0;
+                margin: 0;
+                margin-top: 15px;
+
+                li {
+
+                    label {
+                        width: 120px;
+                    }
+
+                    input {
+                        vertical-align: middle;
+                        width: 240px;
+                    }
+                }
+            }
+        }
+    }
+
+    .archetypeMaxFieldsets {
+        border: 1px solid #ddd;
+        width: 40px;
+        text-align: right;
+    }
+
+    .archetypePropertyTitle {
+        cursor: pointer;
+        overflow: hidden;
+    }
+
+    .archetypePropertyCollapser {
+        margin-top: 10px;
+
+        div {
+            margin-bottom: 10px;
+            margin-right: 15px;
+        }
+    }
+
+    .archetypeFieldsetCollapser {
+        margin-top: 15px;
+    }
+
+    .fieldsetIcon {
+        margin-right: 10px;
+    }
+
+    small {
+        color: #817f85;
    }
 }

@@ -269,16 +717,6 @@
    background-color:   #d0e7f1 !important;
 }

-.archetypeConfig .archetypeFieldsetCollapser {
-    margin-top: 15px;
-}
-
-.archetypeConfig .fieldsetIcon {
-    margin-right: 10px;
-}
-
-.archetypeEditor .show-validation.ng-invalid .control-group.error .control-label {
-    span {
-        color: #343434;
-    }
+.archetype-dialog {
+    margin: 10px;
 }
@@ -1,30 +0,0 @@
-{
-    propertyEditors: [    
-		{ 
-			alias: "Imulus.Archetype",
-			name:  "Archetype",
-			editor: {
-				view: "~/App_Plugins/Archetype/views/archetype.html",
-				valueType: "JSON"
-			}, 
-			prevalues: {
-				fields: [	
-                    {					
-						label: "Config",
-						description: "(Required) Describe your Archetype.",
-						key: "archetypeConfig",
-						view: "/App_Plugins/Archetype/views/archetype.config.html",
-						validation: [
-			 				{
-								type: "Required"         
-							}   
-						]
-					}
-				]
-			}
-        }
-    ],
-    javascript: [
-		'~/App_Plugins/Archetype/js/archetype.js'
-    ]
-} 
@@ -0,0 +1,46 @@
+angular.module('umbraco.resources').factory('archetypePropertyEditorResource', function($q, $http, umbRequestHelper){
+    return { 
+        getAllDataTypes: function() {
+            // Hack - grab DataTypes from Tree API, as `dataTypeService.getAll()` isn't implemented yet
+            return umbRequestHelper.resourcePromise(
+                $http.get("backoffice/ArchetypeApi/ArchetypeDataType/GetAll"), 'Failed to retrieve datatypes from tree service'
+            );
+        },
+        getAllDataTypesForCache: function() {
+            return umbRequestHelper.resourcePromise(
+                $http.get("backoffice/ArchetypeApi/ArchetypeDataType/GetAllDetails"), 'Failed to retrieve datatypes from tree service'
+            );
+        },
+        getDataType: function (guid, useDeepDatatypeLookup, contentTypeAlias, propertyTypeAlias, archetypeAlias, nodeId) {
+            if(useDeepDatatypeLookup) {
+            	return umbRequestHelper.resourcePromise(
+            		$http.get("backoffice/ArchetypeApi/ArchetypeDataType/GetByGuid?guid=" + guid + "&contentTypeAlias=" + contentTypeAlias + "&propertyTypeAlias=" + propertyTypeAlias + "&archetypeAlias=" + archetypeAlias + "&nodeId=" + nodeId), 'Failed to retrieve datatype'
+        		);
+            }
+            else {
+                return umbRequestHelper.resourcePromise(
+                    $http.get("backoffice/ArchetypeApi/ArchetypeDataType/GetByGuid?guid=" + guid , { cache: true }), 'Failed to retrieve datatype'
+                );
+            }
+        },
+        getPropertyEditorMapping: function(alias) {
+            return umbRequestHelper.resourcePromise(
+                $http.get("backoffice/ArchetypeApi/ArchetypeDataType/GetAllPropertyEditors", { cache: true }), 'Failed to retrieve datatype mappings'
+            ).then(function (data) {
+                var result = _.find(data, function(d) {
+                    return d.alias === alias;
+                });
+
+                if (result != null) 
+                    return result;
+
+                return "";
+            });
+        },
+        getDllVersion: function() {
+            return umbRequestHelper.resourcePromise(
+                $http.get("backoffice/ArchetypeApi/ArchetypeDataType/GetDllVersion", { cache: true }), 'Failed to retrieve dll version'
+            );
+        }
+    }
+}); 
@@ -1,33 +0,0 @@
-angular.module('umbraco.resources').factory('archetypePropertyEditorResource', function($q, $http, umbRequestHelper){
-    return { 
-        getAllDataTypes: function() {
-            // Hack - grab DataTypes from Tree API, as `dataTypeService.getAll()` isn't implemented yet
-            return umbRequestHelper.resourcePromise(
-                $http.get("/umbraco/backoffice/UmbracoTrees/DataTypeTree/GetNodes?id=-1&application=developer&tree=&isDialog=false"), 'Failed to retrieve datatypes from tree service'
-            ).then(function (data) {
-                return data.map(function(d) {
-                    return { "id": d.id, "name": d.name }
-                }); 
-            });
-        },
-        getDataType: function(id) {
-        	return umbRequestHelper.resourcePromise(
-        		$http.get("/umbraco/backoffice/UmbracoApi/DataType/GetById?id=" + id), 'Failed to retrieve datatype'
-    		);
-        },
-        getPropertyEditorMapping: function(alias) {
-            return umbRequestHelper.resourcePromise(
-                $http.get("/App_plugins/Archetype/js/propertyEditors.views.js"), 'Failed to retrieve datatype mappings'
-            ).then(function (data) {
-                var result = _.find(data, function(d) {
-                    return d.propertyEditorAlias === alias;
-                });
-
-                if (result != null) 
-                    return result;
-
-                return "";
-            });
-        }
-    }
-}); 
@@ -0,0 +1,87 @@
+angular.module('umbraco.services').factory('archetypeCacheService', function (archetypePropertyEditorResource, $q, entityResource) {
+    //private
+    var entityCache = [];
+    var datatypeCache = [];
+    
+    return {
+        initialize: function() {
+            return archetypePropertyEditorResource.getAllDataTypesForCache().then(function(data) {
+                _.each(data, function(datatype) {
+                    datatypeCache[datatype.dataTypeGuid] = datatype;
+                });
+            });
+        },
+        
+        getDataTypeFromCache: function(guid) {
+            return datatypeCache[guid];
+        },
+ 
+        getDatatypeByGuid: function(guid) {
+            var cachedDatatype = this.getDataTypeFromCache(guid);
+            
+            if(cachedDatatype) {
+                return cachedDatatype;
+            }
+
+            return null;
+        },
+
+        getEntityById: function(id, type) {
+            var deferred = $q.defer();
+            
+            //console.log(entityCache);
+                
+            var cachedEntity = entityCache[id];
+
+            if(cachedEntity) {
+                //console.log("Found ID " + id);
+                
+                deferred.resolve(cachedEntity);
+                
+                return deferred.promise;
+            }
+
+            //go get it from server
+            entityResource.getById(id, type).then(function(entity) {
+                entityCache[id] = entity;
+                
+                //console.log("entity ID is now resolved into cache...");
+                //console.log(entityCache);
+                
+                deferred.resolve(entity);
+            });
+
+            return deferred.promise;
+        },
+
+        //perhaps this should return a promise?
+        getEntityByUmbracoId: function(udi, type) {
+            var deferred = $q.defer();
+            
+            var cachedEntity = entityCache[udi];
+
+            if(cachedEntity) {
+                //console.log("Found UDI " + udi);
+                
+                deferred.resolve(cachedEntity);
+                
+                return deferred.promise;
+            }
+
+            //go get it from server
+            entityResource.getByIds([udi], type).then(function (entities) {
+                // prevent infinite lookups with a default entity
+                var entity = entities.length > 0 ? entities[0] : { udi: udi, name: "" };
+
+                entityCache[udi] = entity;
+                
+                //console.log("entity UDI is now resolved into cache...");
+                //console.log(entityCache);
+
+                deferred.resolve(entity);
+            });
+
+            return deferred.promise;
+        }
+    }
+});
@@ -0,0 +1,19 @@
+angular.module('umbraco.services').factory('archetypeGlobalConfigService', function ($q, $http, umbRequestHelper) {
+    return {
+        globalSettings: function () {
+            return umbRequestHelper.resourcePromise(
+                $http.get("backoffice/ArchetypeApi/ArchetypeDataType/globalSettings"), 'Failed to get whether or not we are checking for updates!'
+            );
+        },
+        setCheckForUpdates: function (isChecking) {
+            return umbRequestHelper.resourcePromise(
+                $http.post("backoffice/ArchetypeApi/ArchetypeDataType/SetCheckForUpdates", isChecking), 'Failed to update check status!'
+            );
+        },
+        checkForUpdates: function () {
+            return umbRequestHelper.resourcePromise(
+                $http.post("backoffice/ArchetypeApi/ArchetypeDataType/checkForUpdates", { }), 'Failed to check for updates!'
+            );
+        }
+    }
+});
@@ -0,0 +1,582 @@
+angular.module('umbraco.services').factory('archetypeLabelService', function (archetypeCacheService, $q, $injector, $timeout) {
+    //private
+
+    /**
+     * This will repeatedly wait for all promises in an array of promises to resolve, and it allows
+     * for promises to be added to the array (i.e., if you add more promises, those added promises
+     * will also be resolved too).
+     * @param promises The array of promises.
+     * @returns {*} The promise that will resolve once all promises in the array resolve.
+     */
+    function repeatedlyWaitForPromises(promises) {
+
+        // Remember the original number of promises being resolved.
+        var originalLength = promises.length;
+        
+        return $q.all(promises).then(function () {
+
+            // If there are new promises, resolve those too.
+            if (promises.length > originalLength) {
+                promises = promises.slice(originalLength);
+                return repeatedlyWaitForPromises(promises);
+            }
+        });
+    }
+
+    /**
+     * Processes a value to be used in a fieldset label. Since it might be a promise or a function, the
+     * value is repeatedly processed until it becomes a string.
+     * @param labelValue The value to be used in the fieldset label.
+     * @param promises The collection of promises to add any promises to.
+     * @param match The current matched substring object in a label template.
+     */
+    function processLabelValue(labelValue, promises, match) {
+
+        // Normalize null/undefined values to an empty string.
+        if(!labelValue) {
+            labelValue = "";
+        }
+
+        // Check the type of value (may be a string, promise, function, or other).
+        if (isString(labelValue)) {
+
+            // handle collapsing dollar signs in labels (#387)
+            if (labelValue.indexOf("$$") >= 0) {
+                labelValue = labelValue.replace(/\$\$/g, "$$$$$$$$");
+            }
+
+            // Set a new value now that it has been processed.
+            //console.log("Processing string..." + labelValue);
+            match.value = labelValue;
+        } else if (isPromise(labelValue)) {
+            // Remember the promise so we can wait for it to be completed before constructing the
+            // fieldset label.
+            promises.push(labelValue);
+            labelValue.then(function (value) {
+                //console.log("Processing final value..." + value);
+                // The value will probably be a string, but recursively process it in case it's
+                // something else.
+                processLabelValue(value, promises, match);
+            });
+        } else if (_.isFunction(labelValue)) {
+
+            // Allow for the function to accept injected parameters, and invoke it.
+            labelValue = $injector.invoke(labelValue);
+
+            // Recursively check result (may be a string, promise, or another function (another
+            // function would be pretty strange, though I see no reason to disallow it).
+            processLabelValue(labelValue, promises, match);
+        } else {
+            // Some other data type (e.g., number, date, object).
+            match.value = labelValue;
+        }
+    }
+
+    /**
+     * Checks if the specified value is of type string.
+     * @param value The value to check the type of.
+     * @returns {boolean} True, if the value is a string; otherwise, false.
+     */
+    function isString(value) {
+        if (value === null) {
+            return false;
+        } else if (typeof value === 'string') {
+            return true;
+        } else if (value instanceof String) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Checks if the specified value is a JavaScript promise.
+     * @param value The value that may be a promise.
+     * @returns {*} True, if the value appears to be a promise; otherwise, false.
+     */
+    function isPromise(value) {
+        return value && _.isFunction(value.then);
+    }
+
+    /**
+     * Splits a string value into a collection based on a regular expression.
+     * @param rgx The regular expression to use to find matches in the string value.
+     * @param value The string value to split.
+     * @returns {Array} A collection of objects, each representing a portion of the supplied
+     *      string. Each object will contain the substring value, as well as a property
+     *      indicating whether or not that substring was matched the regular expression.
+     */
+    function splitByRegex(rgx, value) {
+        // Validate input.
+        if (!rgx || !value) {
+            return [];
+        }
+
+        // Variables.
+        var substring,
+            splitParts = [],
+            nextIndex = 0,
+            index;
+
+        // Reset regex so we get all the matches.
+        rgx.lastIndex = 0;
+
+        // Loop through each match until there are no more matches.
+        var match = rgx.exec(value);
+        while (match) {
+
+            // Extract match index.
+            index = match.index;
+
+            // Is there text between the prior match and this one?
+            if (nextIndex < index) {
+                substring = value.substring(nextIndex, index);
+                splitParts.push({
+                    isMatch: false,
+                    value: substring
+                });
+            }
+
+            // Remember the end of this match for the next loop iteration.
+            nextIndex = rgx.lastIndex;
+
+            // Store info about this match.
+            substring = value.substring(index, nextIndex);
+            splitParts.push({
+                isMatch: true,
+                value: substring
+            });
+
+            // Get next match.
+            match = rgx.exec(value);
+        }
+
+        // The text after the last match.
+        if (nextIndex < value.length) {
+            substring = value.substring(nextIndex);
+            splitParts.push({
+                isMatch: false,
+                value: substring
+            });
+        }
+
+        // Reset regex in case somebody else wants to use it.
+        rgx.lastIndex = 0;
+
+        // Return information about the matches.
+        return splitParts;
+    }
+
+    function executeFunctionByName(functionName, context) {
+        var args = Array.prototype.slice.call(arguments).splice(2);
+
+        var namespaces = functionName.split(".");
+        var func = namespaces.pop();
+
+        for(var i = 0; i < namespaces.length; i++) {
+            context = context[namespaces[i]];
+        }
+
+        if(context && context[func]) {
+            return context[func].apply(this, args);
+        }
+
+        return "";
+    }
+
+    function getNativeLabel(datatype, value, scope) {
+        switch (datatype.selectedEditor) {
+                case "Imulus.UrlPicker":
+                    return imulusUrlPicker(value, scope, {});
+                case "Umbraco.TinyMCEv3":
+                    return coreTinyMce(value, scope, {});
+                case "Umbraco.MultiNodeTreePicker":
+                    return coreMntp(value, scope, datatype);
+                case "Umbraco.MultiNodeTreePicker2":
+                    return coreMntpV2(value, scope, datatype);
+                case "Umbraco.MultipleMediaPicker":
+                case "Umbraco.MediaPicker":
+                    return coreMediaPicker(value, scope, datatype);
+                case "Umbraco.MediaPicker2":
+                    return coreMediaPickerV2(value, scope, datatype);
+                case "Umbraco.DropDown":
+                    return coreDropdown(value, scope, datatype);
+                case "RJP.MultiUrlPicker":
+                    return rjpMultiUrlPicker(value, scope, {});
+                case "Umbraco.ContentPickerAlias":
+                    return coreContentPicker(value, scope, datatype);
+                case "Umbraco.ContentPicker2":
+                    return coreContentPickerV2(value, scope, datatype);
+                default:
+                    return null;
+        }
+    }
+
+    function coreDropdown(value, scope, args) {
+
+        if(!value)
+            return "";
+
+        var prevalue = args.preValues[0].value[value];
+
+        if(prevalue) {
+            return prevalue.value;
+        }
+
+        return "";
+    }
+
+    function coreMntp(value, scope, args) {
+        var ids = value.split(',');
+        var type = "Document";
+        var deferred = $q.defer();
+
+        switch(args.preValues[0].value.type) {
+            case 'content':
+                type = 'Document';
+                break;
+            case 'media':
+                type = 'media';
+                break;
+            case 'member':
+                type = 'member';
+                break;
+            default:
+                break;
+        }
+
+        var entityArray = [];
+        var promises = [];
+
+        _.each(ids, function(id){
+            if(id) {
+               promises.push(archetypeCacheService.getEntityById(id, type).then(function(entity){                
+                    if(entity) {
+                        entityArray.push(entity.name);
+                    }
+               }).promise);
+            }
+        });
+
+        $q.all(promises).then(function() {
+            deferred.resolve(entityArray.join(', '));
+        });
+                
+        return deferred.promise;
+    }
+
+    function coreMntpV2(value, scope, args) {
+        var deferred = $q.defer();
+        
+        var ids = value.split(',');
+        
+        if (ids.length == 0) {
+          return "";
+        }
+        
+        var type = "document";
+
+        switch(args.preValues[0].value.type) {
+            case 'content':
+                type = 'document';
+                break;
+            case 'media':
+                type = 'media';
+                break;
+            case 'member':
+                type = 'member';
+                break;
+
+            default:
+                break;
+        }
+        
+        var entityArray = [];
+        var promises = [];
+
+        _.each(ids, function (id) {            
+            if(id) {
+                promises.push(archetypeCacheService.getEntityByUmbracoId(id, type).then(function(entity) {
+                    if(entity) {
+                        entityArray.push(entity.name);
+                    }
+                }).promise);
+            }
+        });
+        
+        $q.all(promises).then(function() {           
+            if(entityArray.length == 0) {
+                deferred.resolve("");
+            }
+            
+            var firstEntityName = entityArray[0];
+            
+            var value = firstEntityName + (ids.length > 1 ? ", ..." : "");
+            
+            deferred.resolve(value);
+        });
+                
+        return deferred.promise;
+    }
+
+    function coreMediaPicker(value, scope, args) {
+        var deferred = $q.defer();
+        
+        if(value) {
+            archetypeCacheService.getEntityById(value, "media").then(function(entity) {
+                deferred.resolve(entity.name);
+            });
+        }
+        else
+        {
+            deferred.resolve("");
+        }
+
+        return deferred.promise;
+    }
+
+    function coreMediaPickerV2(value, scope, args) {
+        var deferred = $q.defer();
+       
+        //console.log("value=");
+        //console.log(value);       
+       
+        if(value) {
+            archetypeCacheService.getEntityByUmbracoId(value, "media").then(function(entity) {
+                deferred.resolve(entity.name);
+            });
+        }
+        else
+        {
+            deferred.resolve("");
+        }
+
+        return deferred.promise;
+    }
+
+    function coreContentPicker(value, scope, args) {
+        var deferred = $q.defer();
+        
+        if(value) {
+            archetypeCacheService.getEntityById(value, "document").then(function(entity) {
+                deferred.resolve(entity.name);
+            });
+        }
+        else 
+        {
+            deferred.resolve("");
+        }
+        
+        return deferred.promise;
+    }
+
+    function coreContentPickerV2(value, scope, args) {
+        var deferred = $q.defer();
+      
+        if (value) {
+            archetypeCacheService.getEntityByUmbracoId(value, "document").then(function(entity) {
+                deferred.resolve(entity.name);
+            });
+        }
+        else 
+        {
+            deferred.resolve("");
+        }
+
+        return deferred.promise;
+    }
+
+    function imulusUrlPicker(value, scope, args) {
+        var deferred = $q.defer();        
+        
+        if(!value) {
+            deferred.resolve("");
+            
+            return deferred.promise;
+        }
+        
+        if(!args.propertyName) {
+            args = {propertyName: "name"}
+        }
+        
+        if(typeof(value) != "object") {
+            value = JSON.parse(value);
+        }
+
+        //console.log("urlpicker value...");
+        //console.log(value);
+        
+        if(value.length) {
+            value = value[0];
+        }       
+               
+        switch (value.type) {
+            case "content":
+                if(value.typeData.contentId) {
+                    archetypeCacheService.getEntityById(value.typeData.contentId, "Document").then(function(entity) {
+                        //console.log("Retrived entity from cache!");
+                        //console.log("Resolving the entity name with " + entity[args.propertyName]);
+                        deferred.resolve(entity[args.propertyName]);
+                    });
+                }
+                break;
+
+            case "media":
+                if(value.typeData.mediaId) {
+                    archetypeCacheService.getEntityById(value.typeData.mediaId, "Media").then(function(entity) {
+                        deferred.resolve(entity[args.propertyName]);
+                    });
+                }
+                break;
+
+            case "url":
+                deferred.resolve(value.typeData.url);
+                
+                return deferred.promise;
+                
+            default:
+                break;
+        }
+        
+        return deferred.promise;
+    }
+
+    function coreTinyMce(value, scope, args) {
+        if(!args.contentLength) {
+            args = {contentLength: 160}
+        }
+
+        var suffix = "";
+        var strippedText = $("<div/>").html(value).text();
+
+        if(strippedText.length > args.contentLength) {
+            suffix = "…";
+        }
+
+        return strippedText.substring(0, args.contentLength) + suffix;
+    }
+
+    function rjpMultiUrlPicker(values, scope, args) {
+        var names = [];
+
+        _.each(values, function (value) {
+            if (value.name) {
+                names.push(value.name);
+            }
+        });
+
+        return names.join(", ");
+    }
+    
+    return {
+        getFieldsetTitle: function(scope, fieldsetConfigModel, fieldsetIndex) {
+
+            if(!fieldsetConfigModel)
+                return $q.when("");
+
+            var fieldset = scope.model.value.fieldsets[fieldsetIndex];
+            var fieldsetConfig = scope.getConfigFieldsetByAlias(fieldset.alias);
+            var template = fieldsetConfigModel.labelTemplate;
+            var promises = [];
+
+            if (template.length < 1)
+                return $q.when(fieldsetConfig.label);
+
+            var rgx = /{{.*?}}/g;
+            var matches = splitByRegex(rgx, template);
+
+            _.each(matches, function (match) {
+
+                // Skip over substrings that didn't match the regex (they do not require a transformation).
+                if (!match.isMatch) {
+                    return;
+                }
+
+                // split the template in case it consists of multiple property aliases and/or functions
+                var templates = match.value.replace("{{", '').replace("}}", '').split("|");
+                var templateLabelValue = "";
+
+                for(var i = 0; i < templates.length; i++) {
+                    // stop looking for a template label value if a previous template part already yielded a value
+                    if(templateLabelValue !== "") {
+                        break;
+                    }
+                    
+                    var template = templates[i];
+                    
+                    //test for function
+                    var beginParamsIndexOf = template.indexOf("(");
+                    var endParamsIndexOf = template.indexOf(")");
+
+                    //if passed a function
+                    if(beginParamsIndexOf !== -1 && endParamsIndexOf !== -1)
+                    {
+                        var functionName = template.substring(0, beginParamsIndexOf);
+                        var propertyAlias = template.substring(beginParamsIndexOf + 1, endParamsIndexOf).split(',')[0];
+
+                        var args = {};
+
+                        var beginArgsIndexOf = template.indexOf(',');
+
+                        if(beginArgsIndexOf !== -1) {
+
+                            var argsString = template.substring(beginArgsIndexOf + 1, endParamsIndexOf).trim();
+
+                            var normalizedJsonString = argsString.replace(/(\w+)\s*:/g, '"$1":');
+
+                            args = JSON.parse(normalizedJsonString);
+                        }
+                       
+                        templateLabelValue = executeFunctionByName(functionName, window, scope.getPropertyValueByAlias(fieldset, propertyAlias), scope, args);
+                    }
+                    //normal {{foo}} syntax
+                    else {
+                        propertyAlias = template;
+                        
+                        var rawValue = scope.getPropertyValueByAlias(fieldset, propertyAlias);
+
+                        templateLabelValue = rawValue;
+
+                        //determine the type of editor
+                        var propertyConfig = _.find(fieldsetConfigModel.properties, function(property){
+                            return property.alias === propertyAlias;
+                        });
+
+                        if(propertyConfig) {
+                            var datatype = archetypeCacheService.getDatatypeByGuid(propertyConfig.dataTypeGuid);
+
+                            if(datatype) {
+                                //try to get built-in label
+                                var label = getNativeLabel(datatype, rawValue, scope);
+                                
+                                if (label) {
+                                    templateLabelValue = label;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // Process the value (i.e., reduce any functions or promises down to strings).
+                processLabelValue(templateLabelValue, promises, match);
+            });
+
+            // Wait for all of the promises to resolve before constructing the full fieldset label.
+            return repeatedlyWaitForPromises(promises).then(function () {
+
+                //console.log("done waiting...")
+                // Extract string values and combine them into a single string.
+                var substrings = _.map(matches, function (value) {
+                    return value.value;
+                });
+                
+                var combinedSubstrings = substrings.join('');
+
+                //console.log(combinedSubstrings);
+                
+                // Return the title.
+                return combinedSubstrings;
+            });
+        }
+    }
+});
@@ -24,7 +24,7 @@ angular.module('umbraco.services').factory('archetypeLocalizationService', funct
        initLocalizedResources:function () {
            var deferred = $q.defer();
            userService.getCurrentUser().then(function(user){
-                $http.get("/App_plugins/Archetype/langs/" + user.locale + ".js") 
+                $http.get("../App_plugins/Archetype/langs/" + user.locale + ".js", { cache: true }) 
                    .then(function(response){
                        service.resourceFileLoaded = true;
                        service.dictionary = response.data;
@@ -0,0 +1,228 @@
+angular.module('umbraco.services').factory('archetypeService', function () {
+
+    // Variables.
+    var draggedRteArchetype;
+    var archetypeEditors;
+    var rteClass = ".archetypeEditor .umb-rte textarea";
+    var editorSettings = {};
+    var disabledSortables = [];
+
+    //public
+    return {
+        //helper that returns a JS ojbect from 'value' string or the original string
+        jsonOrString: function (value, developerMode, debugLabel){
+            if(value && typeof value == 'string'){
+                try{
+                    if(developerMode == '1'){
+                        console.log("Trying to parse " + debugLabel + ": " + value); 
+                    }
+                    value = JSON.parse(value);
+                }
+                catch(exception)
+                {
+                    if(developerMode == '1'){
+                        console.log("Failed to parse " + debugLabel + "."); 
+                    }
+                }
+            }
+
+            if(value && developerMode == '1'){
+                console.log(debugLabel + " post-parsing: ");
+                console.log(value); 
+            }
+
+            return value;
+        },
+        getFieldsetByAlias: function (fieldsets, alias)
+        {
+            return _.find(fieldsets, function(fieldset){
+                return fieldset.alias == alias;
+            });
+        },
+        getPropertyIndexByAlias: function(properties, alias){
+            for (var i in properties)
+            {
+                if (properties[i].alias == alias) {
+                    return i;
+                }
+            }
+        },
+        getPropertyByAlias: function (fieldset, alias){
+            return _.find(fieldset.properties, function(property){
+                return property.alias == alias; 
+            });
+        },
+        getUniquePropertyAlias: function (currentScope, propertyAliasParts, excludeUniqueId) {
+            if (currentScope.hasOwnProperty('fieldsetIndex') && currentScope.hasOwnProperty('property') && currentScope.hasOwnProperty('propertyConfigIndex'))
+            {
+                var currentPropertyAlias = "f" + currentScope.fieldsetIndex + "-" + currentScope.property.alias + "-p" + currentScope.propertyConfigIndex;
+                propertyAliasParts.push(currentPropertyAlias);
+            }
+            else if (currentScope.hasOwnProperty('isPreValue')) // Crappy way to identify this is the umbraco property scope
+            {
+                var umbracoPropertyAlias = currentScope.$parent.$parent.property.alias; // Crappy way to get the umbraco host alias once we identify its scope
+                propertyAliasParts.push(umbracoPropertyAlias);
+            }
+
+            if (currentScope.$parent)
+                this.getUniquePropertyAlias(currentScope.$parent, propertyAliasParts, true);
+
+            var reversed = _.unique(propertyAliasParts).reverse();
+
+            if (!excludeUniqueId) {
+                reversed.push(_.uniqueId("u-"));
+            }
+
+            return reversed.join("-");
+        },
+        getFieldset: function(scope) {
+            var renderModel = scope.archetypeRenderModel;
+            return renderModel ? renderModel.fieldsets[scope.fieldsetIndex] : null;
+        },
+        getFieldsetProperty: function (scope) {
+            var fieldset = this.getFieldset(scope);
+            return fieldset ? fieldset.properties[scope.renderModelPropertyIndex] : null;
+        },
+        setFieldsetValidity: function (fieldset) {
+            // mark the entire fieldset as invalid if there are any invalid properties in the fieldset, otherwise mark it as valid
+            fieldset.isValid =
+                _.find(fieldset.properties, function (property) {
+                    return property.isValid == false
+                }) == null;
+        },
+        validateProperty: function (fieldset, property, configFieldsetModel) {
+            var propertyConfig = this.getPropertyByAlias(configFieldsetModel, property.alias);
+
+            if (propertyConfig) {
+                // use property.value !== property.value to check for NaN values on numeric inputs
+                if (propertyConfig.required && (property.value == null || property.value === "" || property.value !== property.value)) {
+                    property.isValid = false;
+                }
+                // issue 116: RegEx validate property value
+                // Only validate the property value if anything has been entered - RegEx is considered a supplement to "required".
+                if (property.isValid == true && propertyConfig.regEx && property.value) {
+                    var regEx = new RegExp(propertyConfig.regEx);
+                    if (regEx.test(property.value) == false) {
+                        property.isValid = false;
+                    }
+                }
+            }
+
+            this.setFieldsetValidity(fieldset);
+        },
+        // called when the value of any property in a fieldset changes
+        propertyValueChanged: function (fieldset, property) {
+            // it's the Umbraco way to hide the invalid state when altering an invalid property, even if the new value isn't valid either
+            property.isValid = true;
+            this.setFieldsetValidity(fieldset);
+        },
+        // This stores the rich text editors in all Archetypes (e.g., during a drag operation).
+        // Typically, the editors will be restored after the drag completes.
+        storeEditors: function (element) {
+
+            // If there are not tinyMCE editors, this may be undefined.
+            if (typeof tinyMCE === "undefined") {
+                return;
+            }
+
+            // Variables.
+            var self = this;
+            draggedRteArchetype = element;
+
+            // Empty the stored settings.
+            editorSettings = {};
+
+            // For fast lookups, store each editor by the element ID.
+            var editorsById = {};
+            for (var i = 0; i < tinyMCE.editors.length; i++) {
+                var tempEditor = tinyMCE.editors[i];
+                editorsById[tempEditor.id] = tempEditor;
+            }
+
+            // Process each rich text editor.
+            $(rteClass).each(function() {
+
+                // Variables.
+                var id = $(this).attr("id");
+                var editor = editorsById[id];
+
+                // Get the property's temporary ID.
+                var scope = angular.element(this).scope().$parent;
+                var property = self.getFieldsetProperty(scope);
+                var tempId = property ? property.editorState.temporaryId : null;
+
+                // Store the editor settings by the temporary ID?
+                if (editor && editor.settings && tempId) {
+                    editorSettings[tempId] = editor.settings;
+                }
+
+            });
+
+        },
+        // This restores the rich text editors in the specified Archetype
+        // (e.g., after a drop drop operation).
+        restoreEditors: function(element) {
+
+            // If there are not tinyMCE editors, this may be undefined.
+            if (typeof tinyMCE === "undefined") {
+                return;
+            }
+
+            // Variables.
+            var bothElements = element
+                ? element.add(draggedRteArchetype)
+                : draggedRteArchetype;
+            var self = this;
+
+            // Process each RTE in both Archetypes.
+            $(rteClass, bothElements).each(function () {
+
+                // Variables.
+                var id = $(this).attr("id");
+
+                // Get the stored editor settings.
+                var scope = angular.element(this).scope().$parent;
+                var property = self.getFieldsetProperty(scope);
+                var tempId = property ? property.editorState.temporaryId : null;
+                var settings = editorSettings[tempId];
+
+                // Remove and reinitialize the editor.
+                if (settings) {
+                    tinyMCE.execCommand("mceRemoveEditor", false, id);
+                    tinyMCE.init(settings);
+                }
+
+            });
+
+        },
+        // Ensures the specified property has a temporary ID in its editor state,
+        // optionally forcing one to be regenerated (if specified).
+        ensureTemporaryId: function(property, regenerateId) {
+            if (!property.editorState) {
+                property.editorState = {};
+            }
+            var editorState = property.editorState;
+            if (!editorState.temporaryId || regenerateId) {
+                editorState.temporaryId = _.uniqueId("property-temp-id-");
+            }
+        },
+        // Remembers a sortable that has been disabled (so it can be enabled later).
+        rememberDisabledSortable: function(sortable) {
+            disabledSortables.push(sortable);
+        },
+        // Enables all of the sortables that were disabled.
+        enableSortables: function() {
+            _.each(disabledSortables, function(sortable) {
+                sortable.enable();
+            });
+            disabledSortables = [];
+        },
+        // Get all active archetype editors on the current page
+        getEditors: function() {
+            if (archetypeEditors == null) {
+                archetypeEditors = $('.archetypeEditor');
+            }
+            return archetypeEditors;
+        }
+    }
+});
@@ -0,0 +1,31 @@
+{{VERSION_HTML}}
+<div class="umb-panel archetype-dialog archetypeConfig" ng-controller="ArchetypeConfigOptionsController">
+    <div class="umb-panel-body no-header with-footer umb-scrollable archetypeAdvancedOptions">
+        <h3><archetype-localize key="developer_options">Developer Options</archetype-localize></h3>
+        <div>
+            <label for="archetypeAdvancedOptionsDeepDatatypeRequest"><input type="checkbox" id="archetypeAdvancedOptionsDeepDatatypeRequest" ng-model="dialogData.model.enableDeepDatatypeRequests" /><archetype-localize key="deepDatatypeRequest">Enable Deep Datatype Requests?</archetype-localize><small><archetype-localize key="deepDatatypeRequestDescription">Allows for easier datatype interception at the cost of caching performance.</archetype-localize></small></label>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsDeveloperMode"><input type="checkbox" id="archetypeAdvancedOptionsDeveloperMode" ng-model="dialogData.model.developerMode" /><archetype-localize key="toggleDeveloperMode">Enable Developer Mode?</archetype-localize><small><archetype-localize key="toggleDeveloperModeDescription">Toggle Developer Mode</archetype-localize></small></label>
+        </div>
+        <div>
+            <label for="archetypeOverrideDefaultConverter"><input type="checkbox" id="archetypeOverrideDefaultConverter" ng-model="dialogData.model.overrideDefaultPropertyValueConverter" /><archetype-localize key="overrideDefaultConverter">Override Default Property Value Converter?</archetype-localize><small><archetype-localize key="overrideDefaultConverterDescription">Check this if you wish to use your own custom property value converter.</archetype-localize></small></label>
+        </div>
+        <div ng-controller="ArchetypeConfigGlobalOptionsController">
+            <label for="archetypeCheckForNewVersion"><input type="checkbox" id="archetypeCheckForNewVersion" ng-model="globalSettings.checkForNewVersion" ng-click="confirmCheckNewVersionChange();" /><archetype-localize key="checkForNewVersion">Automatically check for newer versions?</archetype-localize><small><archetype-localize key="checkForNewVersionDescription">Check this if you wish to be notified when a newer version of Archetype is available. This is a application level setting.</archetype-localize> <a class="manual-link" href="https://github.com/kgiszewski/Archetype/blob/master/Information%20Collection%20Disclosure.md" target="_blank">Information Collection Disclosure</a></small></label>
+        </div>
+        <div>
+            <label for="archetypeAdvancedOptionsConfigModel"><archetype-localize key="configModel">Config Model</archetype-localize><small><archetype-localize key="configModelDescription">Be careful editing the text below, it controls the schema for this Archetype.</archetype-localize></small></label>
+            <textarea class="archetypeDeveloperModel" id="archetypeAdvancedOptionsConfigModel" ng-model="dialogData.model" ng-change="dialogData.modelChanged = true"></textarea>
+        </div>
+    </div>
+    <div class="umb-panel-footer">
+        <div class="umb-el-wrap umb-panel-buttons">
+            <div class="btn-toolbar umb-btn-toolbar pull-right">
+                <button class="btn" ng-click="apply()">
+                    <archetype-localize key="button_close">Close</archetype-localize>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
--- a/Show More
+++ b/Show More