diff --git a/README.md b/README.md
index 98600ef7..5e3b2567 100644
--- a/README.md
+++ b/README.md
@@ -11,4 +11,14 @@ Please follow instructions at https://github.com/Microsoft/pxt#running-a-target-
 
 ## Universal Windows App
 
-Open the ``win10/app.sln`` solution with Visual Studio 2015 Update 2 or higher to build it.
\ No newline at end of file
+The Windows 10 app is a [Universal Windows Hosted Web App](https://microsoftedge.github.io/WebAppsDocs/en-US/win10/CreateHWA.htm)
+that wraps codemicrobit.com and provides additional features.
+
+### Sideloading
+
+Find the latest build under ``win10/app/AppPackages/latest`` and run the ``Add-AppDevPackage.ps1`` PowerShell script.
+
+### Building
+
+* Install Visual Studio 2015 Update 2 or higher. Make sure the Windows 10 templates are installed.
+* open the ``win10/app.sln`` solution and launch the ``codemicrobit`` project.
\ No newline at end of file
diff --git a/win10/app.sln b/win10/app.sln
index e3e22128..a6d15e1f 100644
--- a/win10/app.sln
+++ b/win10/app.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "app", "app\app.jsproj", "{39122940-AB16-4CD4-A0CE-79A3EB863ECF}"
+Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "codemicrobit", "app\codemicrobit.jsproj", "{39122940-AB16-4CD4-A0CE-79A3EB863ECF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.ps1 b/win10/app/AppPackages/latest/Add-AppDevPackage.ps1
new file mode 100644
index 00000000..9b620977
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.ps1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..e2fe6f3f
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/cs-CZ/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/cs-CZ/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..d973be27
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/cs-CZ/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/de-DE/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/de-DE/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..19238225
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/de-DE/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/en-US/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/en-US/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..e2fe6f3f
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/en-US/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/es-ES/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/es-ES/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..aca49f4e
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/es-ES/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/fr-FR/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/fr-FR/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..41c39b86
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/fr-FR/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/it-IT/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/it-IT/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..6098731f
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/it-IT/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ja-JP/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ja-JP/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..0fd1ae55
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ja-JP/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ko-KR/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ko-KR/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..ddf71404
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ko-KR/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pl-PL/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pl-PL/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..191b915a
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pl-PL/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pt-BR/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pt-BR/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..e8cc86c2
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pt-BR/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ru-RU/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ru-RU/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..2c1dd5b3
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ru-RU/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/tr-TR/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/tr-TR/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..4fb2b071
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/tr-TR/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-CN/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-CN/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..dd32ec36
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-CN/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-TW/Add-AppDevPackage.psd1 b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-TW/Add-AppDevPackage.psd1
new file mode 100644
index 00000000..162d7078
Binary files /dev/null and b/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-TW/Add-AppDevPackage.psd1 differ
diff --git a/win10/app/AppPackages/latest/codemicrobit_0.1.2.0_AnyCPU_Debug.appxbundle b/win10/app/AppPackages/latest/codemicrobit_0.1.2.0_AnyCPU_Debug.appxbundle
new file mode 100644
index 00000000..b9cfc032
Binary files /dev/null and b/win10/app/AppPackages/latest/codemicrobit_0.1.2.0_AnyCPU_Debug.appxbundle differ
diff --git a/win10/app/AppPackages/latest/codemicrobit_0.1.2.0_AnyCPU_Debug.cer b/win10/app/AppPackages/latest/codemicrobit_0.1.2.0_AnyCPU_Debug.cer
new file mode 100644
index 00000000..29bd9676
Binary files /dev/null and b/win10/app/AppPackages/latest/codemicrobit_0.1.2.0_AnyCPU_Debug.cer differ
diff --git a/win10/app/BundleArtifacts/neutral.txt b/win10/app/BundleArtifacts/neutral.txt
new file mode 100644
index 00000000..48f2dd4f
--- /dev/null
+++ b/win10/app/BundleArtifacts/neutral.txt
@@ -0,0 +1 @@
+MainPackage=C:\gh\pxt-microbit\win10\app\bin\Debug\codemicrobit_0.1.2.0_AnyCPU_Debug.appx
diff --git a/win10/app/app.jsproj b/win10/app/codemicrobit.jsproj
similarity index 95%
rename from win10/app/app.jsproj
rename to win10/app/codemicrobit.jsproj
index 215e862e..f93f239d 100644
--- a/win10/app/app.jsproj
+++ b/win10/app/codemicrobit.jsproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|AnyCPU">
@@ -53,9 +53,10 @@
     <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>$(VersionNumberMajor).$(VersionNumberMinor)</MinimumVisualStudioVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
-    
     <PackageCertificateKeyFile>pxtwinapp_TemporaryKey.pfx</PackageCertificateKeyFile>
-    
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxBundle>Always</AppxBundle>
+    <AppxBundlePlatforms>neutral</AppxBundlePlatforms>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="package.appxmanifest">
@@ -71,9 +72,7 @@
     <Content Include="images\Square44x44Logo.targetsize-24_altform-unplated.png" />
     <Content Include="images\StoreLogo.png" />
     <Content Include="images\Wide310x150Logo.scale-200.png" />
-    
     <None Include="pxtwinapp_TemporaryKey.pfx" />
-    
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
   <!-- To modify your build process, add your task inside one of the targets below then uncomment
diff --git a/win10/app/package.appxmanifest b/win10/app/package.appxmanifest
index 7aa5ac6f..ca9bca2e 100644
--- a/win10/app/package.appxmanifest
+++ b/win10/app/package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="39122940-ab16-4cd4-a0ce-79a3eb863ecf" Version="0.1.0.0" Publisher="CN=jhalleux" />
+  <Identity Name="39122940-ab16-4cd4-a0ce-79a3eb863ecf" Version="0.1.2.0" Publisher="CN=jhalleux" />
   <mp:PhoneIdentity PhoneProductId="39122940-ab16-4cd4-a0ce-79a3eb863ecf" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>codemicrobitapp</DisplayName>