diff --git a/appveyor.yml b/appveyor.yml
index dd5c281..7e3c389 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 image: Visual Studio 2017
 
 # version format
-version: 1.2.0.{build}
+version: 2.0.0.{build}
 
 # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
 # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta
diff --git a/build/package.proj b/build/package.proj
index be0f922..2286013 100644
--- a/build/package.proj
+++ b/build/package.proj
@@ -18,7 +18,7 @@
 	<PropertyGroup>
 		<ProjectName>Our.Umbraco.StackedContent</ProjectName>
 		<PackageName>Stacked Content</PackageName>
-		<MinUmbracoVersion>7.4.0</MinUmbracoVersion>
+		<MinUmbracoVersion>7.7.0</MinUmbracoVersion>
 		<Readme>Stacked Content is an Umbraco property-editor for creating stacked content blocks.</Readme>
 		<AuthorName>Matt Brailsford, Lee Kelleher</AuthorName>
 		<AuthorUrl>https://github.com/umco/umbraco-stacked-content/graphs/contributors</AuthorUrl>
diff --git a/src/NuGet.config b/src/NuGet.config
new file mode 100644
index 0000000..65327b3
--- /dev/null
+++ b/src/NuGet.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="AppVeyor CI - Inner Content builds" value="https://ci.appveyor.com/nuget/umbraco-inner-content-w59jhwr5br60" />
+    <add key="MyGet: Umbraco Community Packages" value="https://www.myget.org/F/umbraco-packages/api/v3/index.json" />
+  </packageSources>
+</configuration>
\ No newline at end of file
diff --git a/src/Our.Umbraco.StackedContent.sln b/src/Our.Umbraco.StackedContent.sln
index dd0d978..b67daab 100644
--- a/src/Our.Umbraco.StackedContent.sln
+++ b/src/Our.Umbraco.StackedContent.sln
@@ -23,6 +23,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Scripts", "Build Scri
 		..\build\package.xml = ..\build\package.xml
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{5F00E80B-E36C-4E38-AA70-674B10FCEDBF}"
+	ProjectSection(SolutionItems) = preProject
+		NuGet.config = NuGet.config
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,5 +44,9 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{95F00400-1FCA-4D98-9643-ACBC2203C1D0} = {52A49C4D-441F-4D54-A23F-444AF47DB250}
+		{5F00E80B-E36C-4E38-AA70-674B10FCEDBF} = {52A49C4D-441F-4D54-A23F-444AF47DB250}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8EB27366-AEDB-4CCA-BA9F-287BD20233E9}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Our.Umbraco.StackedContent/Our.Umbraco.StackedContent.csproj b/src/Our.Umbraco.StackedContent/Our.Umbraco.StackedContent.csproj
index 46c8110..4ce5603 100644
--- a/src/Our.Umbraco.StackedContent/Our.Umbraco.StackedContent.csproj
+++ b/src/Our.Umbraco.StackedContent/Our.Umbraco.StackedContent.csproj
@@ -30,234 +30,41 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+    <Reference Include="interfaces, Version=1.0.6470.38233, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\interfaces.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="AutoMapper.Net4, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="businesslogic, Version=1.0.5885.31228, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\businesslogic.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.8.4\lib\net45\ClientDependency.Core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="cms, Version=1.0.5885.31228, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\cms.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="controls, Version=1.0.5885.31230, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\controls.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
-      <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Examine, Version=0.1.68.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.68.0\lib\Examine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="HtmlAgilityPack, Version=1.4.9.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
-      <HintPath>..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ImageProcessor, Version=2.3.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.3.3.0\lib\net45\ImageProcessor.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ImageProcessor.Web, Version=4.5.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.Web.4.5.3.0\lib\net45\ImageProcessor.Web.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="interfaces, Version=1.0.5885.31225, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\interfaces.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\log4net.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MarkdownSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Markdown.1.14.4\lib\net45\MarkdownSharp.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.3.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Security, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Security.Cookies, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.Cookies.3.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Security.OAuth, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MiniProfiler, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
-      <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Our.Umbraco.InnerContent, Version=1.1.6638.5280, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Our.Umbraco.InnerContent.Core.1.1.0\lib\net45\Our.Umbraco.InnerContent.dll</HintPath>
-    </Reference>
-    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
-      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="SQLCE4Umbraco, Version=1.0.5885.31229, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\SQLCE4Umbraco.dll</HintPath>
+    <Reference Include="Our.Umbraco.InnerContent, Version=2.0.6775.8222, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Our.Umbraco.InnerContent.Core.2.0.0\lib\net45\Our.Umbraco.InnerContent.dll</HintPath>
       <Private>False</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">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\System.Data.SqlServerCe.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Web.Http.WebHost, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\TidyNet.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="umbraco, Version=1.0.5885.31230, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\umbraco.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Umbraco.Core, Version=1.0.5885.31226, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\Umbraco.Core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="umbraco.DataLayer, Version=1.0.5885.31228, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\umbraco.DataLayer.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="umbraco.editorControls, Version=1.0.5885.31232, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\umbraco.editorControls.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="umbraco.MacroEngines, Version=1.0.5885.31232, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\umbraco.MacroEngines.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="umbraco.providers, Version=1.0.5885.31230, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\umbraco.providers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Umbraco.Web.UI, Version=1.0.5885.31233, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\Umbraco.Web.UI.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UmbracoExamine, Version=0.7.0.31229, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.7.4.0\lib\UmbracoExamine.dll</HintPath>
+    <Reference Include="umbraco, Version=1.0.6470.38242, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\umbraco.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UrlRewritingNet.2.0.7\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
+    <Reference Include="Umbraco.Core, Version=1.0.6470.38234, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.7.7.0\lib\net45\Umbraco.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Converters\StackedContentValueConverter.cs" />
+    <Compile Include="PropertyEditors\StackedContentPreValueEditor.cs" />
+    <Compile Include="ValueConverters\StackedContentValueConverter.cs" />
     <Compile Include="Models\UnpublishedContent.cs" />
     <Compile Include="Models\UnpublishedProperty.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -269,8 +76,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Web\UI\App_Plugins\StackedContent\css\stackedcontent.css" />
-    <Content Include="Web\UI\App_Plugins\StackedContent\js\stackedcontent.controllers.js" />
-    <Content Include="Web\UI\App_Plugins\StackedContent\js\stackedcontent.resources.js" />
+    <Content Include="Web\UI\App_Plugins\StackedContent\js\stackedcontent.js" />
     <Content Include="Web\UI\App_Plugins\StackedContent\views\stackedcontent.html" />
   </ItemGroup>
   <ItemGroup>
@@ -288,6 +94,7 @@
   )
 )</PostBuildEvent>
   </PropertyGroup>
+  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
   <!-- 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">
diff --git a/src/Our.Umbraco.StackedContent/PropertyEditors/StackedContentPreValueEditor.cs b/src/Our.Umbraco.StackedContent/PropertyEditors/StackedContentPreValueEditor.cs
new file mode 100644
index 0000000..c612ca8
--- /dev/null
+++ b/src/Our.Umbraco.StackedContent/PropertyEditors/StackedContentPreValueEditor.cs
@@ -0,0 +1,73 @@
+using System.Collections.Generic;
+using Our.Umbraco.InnerContent.PropertyEditors;
+using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
+
+namespace Our.Umbraco.StackedContent.PropertyEditors
+{
+    internal class StackedContentPreValueEditor : SimpleInnerContentPreValueEditor
+    {
+        public StackedContentPreValueEditor()
+            : base()
+        {
+            Fields.AddRange(new[]
+            {
+                new PreValueField
+                {
+                    Key = "maxItems",
+                    Name = "Max Items",
+                    View = "number",
+                    Description = "Set the maximum number of items allowed in this stack."
+                },
+                new PreValueField
+                {
+                    Key = "singleItemMode",
+                    Name = "Single Item Mode",
+                    View = "boolean",
+                    Description = "Set whether to work in single item mode (only the first defined Content Type will be used)."
+                },
+                new PreValueField
+                {
+                    Key = "hideLabel",
+                    Name = "Hide Label",
+                    View = "boolean",
+                    Description = "Set whether to hide the editor label and have the list take up the full width of the editor window."
+                },
+                new PreValueField
+                {
+                    Key = "enablePreview",
+                    Name = "Enable Preview",
+                    View = "boolean",
+                    Description = "Select to enable a preview of the items in the stack."
+                },
+                new PreValueField
+                {
+                    Key = "enableCopy",
+                    Name = "Enable Copy",
+                    View = "boolean",
+                    Description = "Select to enable copying (and pasting) of items in the stack."
+                }
+            });
+        }
+
+        public override IDictionary<string, object> ConvertDbToEditor(IDictionary<string, object> defaultPreVals, PreValueCollection persistedPreVals)
+        {
+            // NOTE: For v1.0, we switched around the default option for the preview feature.
+            // For backwards-compatibility, we check if the legacy "disablePreview" value is available and handle accordingly.
+            if (persistedPreVals.IsDictionaryBased && persistedPreVals.PreValuesAsDictionary.ContainsKey("disablePreview"))
+            {
+                var enablePreview = persistedPreVals.PreValuesAsDictionary["disablePreview"].Value == "1" ? "0" : "1";
+                if (persistedPreVals.PreValuesAsDictionary.ContainsKey("enablePreview"))
+                {
+                    persistedPreVals.PreValuesAsDictionary["enablePreview"].Value = enablePreview;
+                }
+                else
+                {
+                    persistedPreVals.PreValuesAsDictionary.Add("enablePreview", new PreValue(enablePreview));
+                }
+            }
+
+            return base.ConvertDbToEditor(defaultPreVals, persistedPreVals);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Our.Umbraco.StackedContent/PropertyEditors/StackedContentPropertyEditor.cs b/src/Our.Umbraco.StackedContent/PropertyEditors/StackedContentPropertyEditor.cs
index 4f633a3..ee5d881 100644
--- a/src/Our.Umbraco.StackedContent/PropertyEditors/StackedContentPropertyEditor.cs
+++ b/src/Our.Umbraco.StackedContent/PropertyEditors/StackedContentPropertyEditor.cs
@@ -3,22 +3,21 @@
 
 namespace Our.Umbraco.StackedContent.PropertyEditors
 {
-    [PropertyEditor(PropertyEditorAlias, "Stacked Content", "/App_Plugins/StackedContent/views/stackedcontent.html", Group = "rich content", Icon = "icon-umb-contour", ValueType = "JSON")]
+    [PropertyEditor(PropertyEditorAlias, PropertyEditorName, PropertyEditorValueTypes.Json, PropertyEditorViewPath, Group = "rich content", Icon = "icon-umb-contour")]
     public class StackedContentPropertyEditor : SimpleInnerContentPropertyEditor
     {
         public const string PropertyEditorAlias = "Our.Umbraco.StackedContent";
+        public const string PropertyEditorName = "Stacked Content";
+        public const string PropertyEditorViewPath = "~/App_Plugins/StackedContent/views/stackedcontent.html";
 
         public StackedContentPropertyEditor()
             : base()
         {
             DefaultPreValues.Add("maxItems", 0);
             DefaultPreValues.Add("singleItemMode", "0");
-            DefaultPreValues.Add("disablePreview", "0");
-        }
-
-        protected override PropertyValueEditor CreateValueEditor()
-        {
-            return new SimpleInnerContentPropertyValueEditor(base.CreateValueEditor());
+            DefaultPreValues.Add("hideLabel", "0");
+            DefaultPreValues.Add("enablePreview", "0");
+            DefaultPreValues.Add("enableCopy", "0");
         }
 
         protected override PreValueEditor CreatePreValueEditor()
@@ -26,19 +25,9 @@ protected override PreValueEditor CreatePreValueEditor()
             return new StackedContentPreValueEditor();
         }
 
-        internal class StackedContentPreValueEditor : SimpleInnerContentPreValueEditor
+        protected override PropertyValueEditor CreateValueEditor()
         {
-            [PreValueField("maxItems", "Max Items", "number", Description = "Set the maximum number of items allowed in this stack.")]
-            public string MaxItems { get; set; }
-
-            [PreValueField("singleItemMode", "Single Item Mode", "boolean", Description = "Set whether to work in single item mode (only the first defined Content Type will be used).")]
-            public string SingleItemMode { get; set; }
-
-            [PreValueField("hideLabel", "Hide Label", "boolean", Description = "Set whether to hide the editor label and have the list take up the full width of the editor window.")]
-            public string HideLabel { get; set; }
-
-            [PreValueField("disablePreview", "Disable Preview", "boolean", Description = "Set whether to disable the preview of the items in the stack.")]
-            public string DisablePreview { get; set; }
+            return new SimpleInnerContentPropertyValueEditor(base.CreateValueEditor());
         }
     }
 }
\ No newline at end of file
diff --git a/src/Our.Umbraco.StackedContent/Converters/StackedContentValueConverter.cs b/src/Our.Umbraco.StackedContent/ValueConverters/StackedContentValueConverter.cs
similarity index 94%
rename from src/Our.Umbraco.StackedContent/Converters/StackedContentValueConverter.cs
rename to src/Our.Umbraco.StackedContent/ValueConverters/StackedContentValueConverter.cs
index 786d21e..4a279e1 100644
--- a/src/Our.Umbraco.StackedContent/Converters/StackedContentValueConverter.cs
+++ b/src/Our.Umbraco.StackedContent/ValueConverters/StackedContentValueConverter.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Our.Umbraco.InnerContent.Converters;
+using Our.Umbraco.InnerContent.ValueConverters;
 using Our.Umbraco.StackedContent.PropertyEditors;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
@@ -10,7 +10,7 @@
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
 
-namespace Our.Umbraco.StackedContent.Converters
+namespace Our.Umbraco.StackedContent.ValueConverters
 {
     public class StackedContentValueConverter : InnerContentValueConverter, IPropertyValueConverterMeta
     {
diff --git a/src/Our.Umbraco.StackedContent/Web/Helpers/ViewHelper.cs b/src/Our.Umbraco.StackedContent/Web/Helpers/ViewHelper.cs
index 73ab70f..ee2d32b 100644
--- a/src/Our.Umbraco.StackedContent/Web/Helpers/ViewHelper.cs
+++ b/src/Our.Umbraco.StackedContent/Web/Helpers/ViewHelper.cs
@@ -40,7 +40,7 @@ internal static string RenderPartial(string partialName, object model)
                 routeData.Values.Add("controller", "DummyController");
 
                 var controllerContext = new ControllerContext(new RequestContext(httpContext, routeData), new DummyController());
-                
+
                 var viewResult = ViewEngine.FindPartialView(controllerContext, partialName, false);
                 if (viewResult.View == null)
                 {
@@ -54,4 +54,4 @@ internal static string RenderPartial(string partialName, object model)
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/css/stackedcontent.css b/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/css/stackedcontent.css
index fcc2fda..93d19b9 100644
--- a/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/css/stackedcontent.css
+++ b/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/css/stackedcontent.css
@@ -83,6 +83,10 @@
     color: #00aea2;
 }
 
+.stacked-content .placeholder a:hover {
+    text-decoration: none;
+}
+
 .stack__buttons {
     position: absolute;
     right: -12px;
@@ -144,6 +148,7 @@
 
 .stack__button,
 .stack__add-button,
+.stack__paste-button,
 .stack__buttons .umb_confirm-action__overlay-action {
     display: inline-block;
     background-color: #625a74;
@@ -163,6 +168,7 @@
 
 .stack__button:hover,
 .stack__add-button:hover,
+.stack__paste-button:hover,
 .stack__buttons .umb_confirm-action__overlay-action.-cancel:hover,
 .stack__buttons .umb_confirm-action__overlay-action.-confirm:hover {
     color: white !important;
@@ -186,22 +192,25 @@
     border-radius: 0;
 }
 
-.stack__add-button {
+.stack__add-button,
+.stack__paste-button {
     background-color: #00aea2;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
     z-index: 20;
 }
 
 .stack__add-bar {
     position: relative;
-    height: 10px;
+    height: 30px;
     z-index: 15;
+    text-align: center;
+    margin: -10px 0;
 }
 
-.stack__add-bar .stack__add-button {
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    margin: -15px 0 0 -15px;
+.stack__add-bar .stack__add-button,
+.stack__add-bar .stack__paste-button {
     opacity: 0;
     transition: opacity .0s ease-in-out;
     -moz-transition: opacity .0s ease-in-out;
@@ -211,17 +220,13 @@
     box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.25);
 }
 
-.stack__add-bar:hover {
-    margin: -10px 0;
-    height: 30px;
-}
-
-.stack__item:first-child .stack__add-bar--top:hover {
+.stack__item:first-child .stack__add-bar--top {
     margin: 0 0 -10px;
     height: 20px;
 }
 
-.stack__add-bar:hover .stack__add-button {
+.stack__add-bar:hover .stack__add-button,
+.stack__add-bar:hover .stack__paste-button {
     opacity: 1;
     transition-duration: .25s;
     -moz-transition-duration: .25s;
diff --git a/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/js/stackedcontent.controllers.js b/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/js/stackedcontent.js
similarity index 58%
rename from src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/js/stackedcontent.controllers.js
rename to src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/js/stackedcontent.js
index 812042b..0ca8220 100644
--- a/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/js/stackedcontent.controllers.js
+++ b/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/js/stackedcontent.js
@@ -1,17 +1,27 @@
-angular.module("umbraco").controller("Our.Umbraco.StackedContent.Controllers.StackedContentPropertyEditorController", [
+// Property Editors
+angular.module("umbraco").controller("Our.Umbraco.StackedContent.Controllers.StackedContentPropertyEditorController", [
 
     "$scope",
     "editorState",
+    "notificationsService",
     "innerContentService",
     "Our.Umbraco.StackedContent.Resources.StackedContentResources",
 
-    function ($scope, editorState, innerContentService, scResources) {
+    function ($scope, editorState, notificationsService, innerContentService, scResources) {
+
+        // Config
+        var previewEnabled = $scope.model.config.enablePreview === "1";
+        var copyEnabled = $scope.model.config.enableCopy === "1";
 
         $scope.inited = false;
         $scope.markup = {};
         $scope.prompts = {};
         $scope.model.value = $scope.model.value || [];
 
+        $scope.contentTypeGuids = _.uniq($scope.model.config.contentTypes.map(function (itm) {
+            return itm.icContentTypeGuid;
+        }));
+
         $scope.canAdd = function () {
             return (!$scope.model.config.maxItems || $scope.model.config.maxItems === "0" || $scope.model.value.length < $scope.model.config.maxItems) && $scope.model.config.singleItemMode !== "1";
         };
@@ -20,6 +30,17 @@
             return $scope.model.config.singleItemMode !== "1";
         };
 
+        $scope.canCopy = function () {
+            return copyEnabled && innerContentService.canCopyContent();
+        };
+
+        $scope.canPaste = function () {
+            if (copyEnabled && innerContentService.canPasteContent() && $scope.canAdd()) {
+                return allowPaste;
+            }
+            return false;
+        };
+
         $scope.addContent = function (evt, idx) {
             $scope.overlayConfig.event = evt;
             $scope.overlayConfig.data = { model: null, idx: idx, action: "add" };
@@ -37,12 +58,33 @@
             setDirty();
         };
 
+        $scope.copyContent = function (evt, idx) {
+            var item = JSON.parse(JSON.stringify($scope.model.value[idx]));
+            var success = innerContentService.setCopiedContent(item);
+            if (success) {
+                allowPaste = true;
+                notificationsService.success("Content", "The content block has been copied.");
+            } else {
+                notificationsService.error("Content", "Unfortunately, the content block was not able to be copied.");
+            }
+        };
+
+        $scope.pasteContent = function (evt, idx) {
+            var item = innerContentService.getCopiedContent();
+            if (item && contentTypeGuidIsAllowed(item.icContentTypeGuid)) {
+                $scope.overlayConfig.callback({ model: item, idx: idx, action: "add" });
+                setDirty();
+            } else {
+                notificationsService.error("Content", "Unfortunately, the content block is not allowed to be pasted here.");
+            }
+        };
+
         $scope.sortableOptions = {
-            axis: 'y',
+            axis: "y",
             cursor: "move",
             handle: ".stack__preview-wrapper",
             helper: function () {
-                return $('<div class=\"stack__sortable-helper\"><div><i class=\"icon icon-navigation\"></i></div></div>');
+                return $("<div class=\"stack__sortable-helper\"><div><i class=\"icon icon-navigation\"></i></div></div>");
             },
             cursorAt: {
                 top: 0
@@ -66,16 +108,24 @@
             });
         };
 
-        var previewEnabled = function () {
-            return $scope.model.config.disablePreview !== "1";
-        };
-
         var setDirty = function () {
             if ($scope.propertyForm) {
                 $scope.propertyForm.$setDirty();
             }
         };
 
+        var contentTypeGuidIsAllowed = function (guid) {
+            return !!guid && _.contains($scope.contentTypeGuids, guid);
+        };
+
+        var pasteAllowed = function () {
+            var guid = innerContentService.getCopiedContentTypeGuid();
+            return guid && contentTypeGuidIsAllowed(guid);
+        };
+
+        // Storing the 'pasteAllowed' check in a local variable, so that it doesn't need to be re-eval'd every time
+        var allowPaste = pasteAllowed();
+
         // Set overlay config
         $scope.overlayConfig = {
             propertyAlias: $scope.model.alias,
@@ -88,7 +138,7 @@
             callback: function (data) {
                 innerContentService.populateName(data.model, data.idx, $scope.model.config.contentTypes);
 
-                if (previewEnabled()) {
+                if (previewEnabled) {
                     scResources.getPreviewMarkup(data.model, editorState.current.id).then(function (markup) {
                         if (markup) {
                             $scope.markup[data.model.key] = markup;
@@ -127,7 +177,7 @@
                 });
 
                 // Try loading previews
-                if (previewEnabled()) {
+                if (previewEnabled) {
                     loadPreviews();
                 }
             });
@@ -143,7 +193,7 @@
                 $scope.inited = true;
 
                 // Try loading previews
-                if (previewEnabled()) {
+                if (previewEnabled) {
                     loadPreviews();
                 }
 
@@ -156,5 +206,27 @@
 
         }
     }
-
 ]);
+
+// Resources
+angular.module("umbraco.resources").factory("Our.Umbraco.StackedContent.Resources.StackedContentResources", [
+
+    "$http",
+    "umbRequestHelper",
+
+    function ($http, umbRequestHelper) {
+        return {
+            getPreviewMarkup: function (data, pageId) {
+                return umbRequestHelper.resourcePromise(
+                    $http({
+                        url: umbRequestHelper.convertVirtualToAbsolutePath("~/umbraco/backoffice/StackedContent/StackedContentApi/GetPreviewMarkup"),
+                        method: "POST",
+                        params: { pageId: pageId },
+                        data: data
+                    }),
+                    "Failed to retrieve preview markup"
+                );
+            }
+        };
+    }
+]);
\ No newline at end of file
diff --git a/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/js/stackedcontent.resources.js b/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/js/stackedcontent.resources.js
deleted file mode 100644
index 5cd1085..0000000
--- a/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/js/stackedcontent.resources.js
+++ /dev/null
@@ -1,16 +0,0 @@
-angular.module('umbraco.resources').factory('Our.Umbraco.StackedContent.Resources.StackedContentResources',
-    function ($q, $http, umbRequestHelper) {
-        return {
-            getPreviewMarkup: function (data, pageId) {
-                return umbRequestHelper.resourcePromise(
-                    $http({
-                        url: "/umbraco/backoffice/StackedContent/StackedContentApi/GetPreviewMarkup",
-                        method: "POST",
-                        params: { pageId: pageId },
-                        data: data
-                    }),
-                    'Failed to retrieve preview markup'
-                );
-            }
-        };
-    });
\ No newline at end of file
diff --git a/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/package.manifest b/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/package.manifest
index 68c919f..4ff2bda 100644
--- a/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/package.manifest
+++ b/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/package.manifest
@@ -1,9 +1,8 @@
 {
-    "javascript" : [
-        "~/App_Plugins/StackedContent/js/stackedcontent.resources.js",
-        "~/App_Plugins/StackedContent/js/stackedcontent.controllers.js"
-    ],
-    "css" : [
-        "~/App_Plugins/StackedContent/css/stackedcontent.css"
-    ]
+  "javascript": [
+    "~/App_Plugins/StackedContent/js/stackedcontent.js"
+  ],
+  "css": [
+    "~/App_Plugins/StackedContent/css/stackedcontent.css"
+  ]
 }
\ No newline at end of file
diff --git a/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/views/stackedcontent.html b/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/views/stackedcontent.html
index 517e56b..ab1b74d 100644
--- a/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/views/stackedcontent.html
+++ b/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/views/stackedcontent.html
@@ -4,9 +4,10 @@
 
     <div ng-show="inited">
 
-        <a ng-if="!model.value || model.value.length == 0" ng-click="addContent($event, 0)" class="placeholder" title="Add content">
+        <div ng-if="!model.value || model.value.length == 0" ng-click="addContent($event, 0)" class="placeholder"  title="Add content">
             <i class="icon icon-umb-contour"></i>
-        </a>
+            <a ng-click="pasteContent($event, 0)" ng-if="canPaste()" title="Paste content"><i class="icon icon-paste-in"></i></a>
+        </div>
 
         <div ng-if="model.value && model.value.length > 0" class="stack__wrapper">
 
@@ -14,24 +15,26 @@
 
                 <div class="stack__item" ng-repeat="itm in model.value">
                     <div class="stack__add-bar stack__add-bar--top" ng-if="model.config.singleItemMode !== '1'">
-                        <a ng-click="addContent($event, $index)" class="stack__add-button" ng-if="canAdd()"><i class="icon icon-add"></i></a>
+                        <a ng-click="addContent($event, $index)" class="stack__add-button" ng-if="canAdd()" title="Add"><i class="icon icon-add"></i></a>
+                        <a ng-click="pasteContent($event, $index)" class="stack__paste-button" ng-if="canPaste()" title="Paste"><i class="icon icon-paste-in"></i></a>
                     </div>
                     <div class="stack__preview-wrapper">
-                        <a ng-click="editContent($event, $index, itm)" class="stack__preview stack__preview--default" ng-if="!markup[itm.key]">
+                        <div ng-click="editContent($event, $index, itm)" class="stack__preview stack__preview--default" ng-if="!markup[itm.key]">
                             <i class="icon {{itm.icon}}"></i>
                             <h3>{{itm.name}}</h3>
-                        </a>
-                        <a ng-click="editContent($event, $index, itm)" class="stack__preview" ng-if="markup[itm.key]">
+                        </div>
+                        <div ng-click="editContent($event, $index, itm)" class="stack__preview" ng-if="markup[itm.key]">
                             <div ng-bind-html-unsafe="markup[itm.key]"></div>
-                        </a>
+                        </div>
                         <div class="stack__buttons" ng-if="canDelete()" ng-mousedown="$event.stopPropagation();">
                             <div class="no-overflow">
+                                <a ng-click="copyContent($event, $index)" ng-if="canCopy() && !prompts[itm.key]" class="stack__button" title="Copy"><i class="icon icon-documents"></i></a>
                                 <umb-confirm-action ng-if="prompts[itm.key]"
                                                     direction="left"
                                                     on-confirm="deleteContent($event, $index)"
                                                     on-cancel="prompts[itm.key] = false">
                                 </umb-confirm-action>
-                                <a ng-click="prompts[itm.key] = true" class="stack__button"><i class="icon icon-trash"></i></a>
+                                <a ng-click="prompts[itm.key] = true" class="stack__button" title="Delete"><i class="icon icon-trash"></i></a>
                             </div>
                         </div>
                     </div>
@@ -40,7 +43,8 @@ <h3>{{itm.name}}</h3>
             </div>
 
             <div class="stack__add-bar stack__add-bar--bottom" ng-if="model.config.singleItemMode !== '1'">
-                <a ng-click="addContent($event, model.value.length)" class="stack__add-button" ng-if="canAdd()"><i class="icon icon-add"></i></a>
+                <a ng-click="addContent($event, model.value.length)" class="stack__add-button" ng-if="canAdd()" title="Add"><i class="icon icon-add"></i></a>
+                <a ng-click="pasteContent($event, model.value.length)" class="stack__paste-button" ng-if="canPaste()" title="Paste"><i class="icon icon-paste-in"></i></a>
             </div>
 
         </div>
diff --git a/src/Our.Umbraco.StackedContent/app.config b/src/Our.Umbraco.StackedContent/app.config
index 1b7e920..e317590 100644
--- a/src/Our.Umbraco.StackedContent/app.config
+++ b/src/Our.Umbraco.StackedContent/app.config
@@ -18,7 +18,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -26,7 +26,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -36,6 +36,14 @@
         <assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.9.9.0" newVersion="6.9.9.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/src/Our.Umbraco.StackedContent/packages.config b/src/Our.Umbraco.StackedContent/packages.config
index 9f76af9..1a3236f 100644
--- a/src/Our.Umbraco.StackedContent/packages.config
+++ b/src/Our.Umbraco.StackedContent/packages.config
@@ -1,37 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="3.0.0" targetFramework="net452" />
-  <package id="ClientDependency" version="1.8.4" targetFramework="net452" />
+  <package id="AutoMapper" version="3.3.1" targetFramework="net452" />
+  <package id="ClientDependency" version="1.9.2" targetFramework="net452" />
   <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net452" />
-  <package id="Examine" version="0.1.68.0" targetFramework="net452" />
-  <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net452" />
-  <package id="ImageProcessor" version="2.3.3.0" targetFramework="net452" />
-  <package id="ImageProcessor.Web" version="4.5.3.0" targetFramework="net452" />
+  <package id="Examine" version="0.1.85" targetFramework="net452" />
+  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net452" />
+  <package id="ImageProcessor" version="2.5.3" targetFramework="net452" />
+  <package id="ImageProcessor.Web" version="4.8.3" targetFramework="net452" />
+  <package id="log4net" version="2.0.8" targetFramework="net452" />
+  <package id="Log4Net.Async" version="2.0.4" targetFramework="net452" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net452" />
-  <package id="Markdown" version="1.14.4" targetFramework="net452" />
+  <package id="Markdown" version="1.14.7" targetFramework="net452" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
   <package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net452" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
+  <package id="Microsoft.AspNet.SignalR.Core" version="2.2.1" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
-  <package id="Microsoft.Owin" version="3.0.1" targetFramework="net452" />
-  <package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net452" />
-  <package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net452" />
-  <package id="Microsoft.Owin.Security.Cookies" version="3.0.1" targetFramework="net452" />
-  <package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net452" />
+  <package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.1" targetFramework="net452" />
+  <package id="Microsoft.Owin" version="3.1.0" targetFramework="net452" />
+  <package id="Microsoft.Owin.Host.SystemWeb" version="3.1.0" targetFramework="net452" />
+  <package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net452" />
+  <package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net452" />
+  <package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net452" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
   <package id="MiniProfiler" version="2.1.0" targetFramework="net452" />
   <package id="MySql.Data" version="6.9.9" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
-  <package id="Our.Umbraco.InnerContent.Core" version="1.1.0" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
+  <package id="Our.Umbraco.InnerContent.Core" version="2.0.0" targetFramework="net452" />
   <package id="Owin" version="1.0" targetFramework="net452" />
   <package id="semver" version="1.1.2" targetFramework="net452" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net452" />
-  <package id="UmbracoCms.Core" version="7.4.0" targetFramework="net452" />
+  <package id="System.Threading.Tasks.Dataflow" version="4.7.0" targetFramework="net452" />
+  <package id="UmbracoCms.Core" version="7.7.0" targetFramework="net452" />
   <package id="UrlRewritingNet" version="2.0.7" targetFramework="net452" />
   <package id="xmlrpcnet" version="2.5.0" targetFramework="net452" />
 </packages>
\ No newline at end of file