diff --git a/Samples/Islands/DrawingIsland/App.config b/Samples/Islands/DrawingIsland/App.config
new file mode 100644
index 000000000..51fffc74b
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/App.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+  </startup>
+</configuration>
\ No newline at end of file
diff --git a/Samples/Islands/DrawingIsland/App.cs b/Samples/Islands/DrawingIsland/App.cs
new file mode 100644
index 000000000..88b464d27
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/App.cs
@@ -0,0 +1,29 @@
+// // Copyright (c) Microsoft. All rights reserved.
+// // Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Windows;
+using Microsoft.UI.Dispatching;
+
+namespace CalculatorDemo
+{
+    /// <summary>
+    ///     Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            _dispacherQueueController = DispatcherQueueController.CreateOnCurrentThread();
+            base.OnStartup(e);
+        }
+
+        protected override void OnExit(ExitEventArgs e)
+        {
+            base.OnExit(e);
+            _dispacherQueueController?.ShutdownQueue();
+            _dispacherQueueController = null;
+        }
+
+        DispatcherQueueController? _dispacherQueueController;
+    }
+}
\ No newline at end of file
diff --git a/Samples/Islands/DrawingIsland/App.xaml b/Samples/Islands/DrawingIsland/App.xaml
new file mode 100644
index 000000000..7f1cb151f
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/App.xaml
@@ -0,0 +1,21 @@
+<Application x:Class="CalculatorDemo.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+    <!-- 
+        calc_update_fluent: We add the below ResourceDictionary to our
+        Application's Merged ResourceDictionaries so that our app will pick up
+        the new styles.  The pack URI
+        (https://learn.microsoft.com/en-us/dotnet/desktop/wpf/app-development/pack-uris-in-wpf)
+        below tells WPF to open the referenced assembly named
+        "PresentationFramework.Fluent.dll" and read a Xaml resource from it.
+    -->
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary 
+                    Source="pack://application:,,,/PresentationFramework.Fluent;component/Resources/Fluent.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/Samples/Islands/DrawingIsland/CalculatorDemo.csproj b/Samples/Islands/DrawingIsland/CalculatorDemo.csproj
new file mode 100644
index 000000000..5de1a2517
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/CalculatorDemo.csproj
@@ -0,0 +1,107 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <!-- calc_update_use_dotnet9: Update TargetFramework to net9.0.  This makes our app use .net9. -->
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
+    <UseWpf>true</UseWpf>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
+    <Platforms>x64;x86;ARM64</Platforms>
+    <UseWinUITools>false</UseWinUITools>
+    <EnableCoreMrtTooling>false</EnableCoreMrtTooling>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{5731865D-6685-47A7-8877-5DBAF39B54CD}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CalculatorDemo</RootNamespace>
+    <AssemblyName>CalculatorDemo</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>portable</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' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MainWindow.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MyTextBox.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="WpfIslandHost.cs" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Added CsWinRT reference to avoid WinMD error as a result of WinMD leaking via project reference. -->
+
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.7" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240428000" />
+
+    <ProjectReference Include="DrawingIslandCsProjection\DrawingIslandCsProjection.csproj" />
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <Resource Include="appicon.ico" />
+  </ItemGroup>
+  <!-- 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>
diff --git a/Samples/Islands/DrawingIsland/CalculatorDemo.sln b/Samples/Islands/DrawingIsland/CalculatorDemo.sln
new file mode 100644
index 000000000..83f8f2b7a
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/CalculatorDemo.sln
@@ -0,0 +1,71 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.34825.169
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CalculatorDemo", "CalculatorDemo.csproj", "{5731865D-6685-47A7-8877-5DBAF39B54CD}"
+EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "CalculatorDemoPackage", "CalculatorDemoPackage\CalculatorDemoPackage.wapproj", "{B100DA96-7F60-4053-9E91-554AFB2B3DB2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrawingIslandCsProjection", "..\..\..\..\WindowsAppSDK-Samples\Samples\Islands\DrawingIsland\DrawingIslandCsProjection\DrawingIslandCsProjection.csproj", "{91B33F67-B850-4407-A85D-51A4A229DF10}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM64 = Debug|ARM64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|ARM64 = Release|ARM64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|ARM64.Build.0 = Debug|ARM64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|x64.ActiveCfg = Debug|x64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|x64.Build.0 = Debug|x64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|x86.ActiveCfg = Debug|x86
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|x86.Build.0 = Debug|x86
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Release|ARM64.ActiveCfg = Release|ARM64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Release|ARM64.Build.0 = Release|ARM64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Release|x64.ActiveCfg = Release|x64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Release|x64.Build.0 = Release|x64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Release|x86.ActiveCfg = Release|x86
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Release|x86.Build.0 = Release|x86
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|ARM64.Build.0 = Debug|ARM64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|x64.ActiveCfg = Debug|x64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|x64.Build.0 = Debug|x64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|x64.Deploy.0 = Debug|x64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|x86.ActiveCfg = Debug|x86
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|x86.Build.0 = Debug|x86
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|x86.Deploy.0 = Debug|x86
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|ARM64.Build.0 = Release|ARM64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|ARM64.Deploy.0 = Release|ARM64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|x64.ActiveCfg = Release|x64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|x64.Build.0 = Release|x64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|x64.Deploy.0 = Release|x64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|x86.ActiveCfg = Release|x86
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|x86.Build.0 = Release|x86
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|x86.Deploy.0 = Release|x86
+		{91B33F67-B850-4407-A85D-51A4A229DF10}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{91B33F67-B850-4407-A85D-51A4A229DF10}.Debug|ARM64.Build.0 = Debug|ARM64
+		{91B33F67-B850-4407-A85D-51A4A229DF10}.Debug|x64.ActiveCfg = Debug|x64
+		{91B33F67-B850-4407-A85D-51A4A229DF10}.Debug|x64.Build.0 = Debug|x64
+		{91B33F67-B850-4407-A85D-51A4A229DF10}.Debug|x86.ActiveCfg = Debug|x86
+		{91B33F67-B850-4407-A85D-51A4A229DF10}.Debug|x86.Build.0 = Debug|x86
+		{91B33F67-B850-4407-A85D-51A4A229DF10}.Release|ARM64.ActiveCfg = Release|ARM64
+		{91B33F67-B850-4407-A85D-51A4A229DF10}.Release|ARM64.Build.0 = Release|ARM64
+		{91B33F67-B850-4407-A85D-51A4A229DF10}.Release|x64.ActiveCfg = Release|x64
+		{91B33F67-B850-4407-A85D-51A4A229DF10}.Release|x64.Build.0 = Release|x64
+		{91B33F67-B850-4407-A85D-51A4A229DF10}.Release|x86.ActiveCfg = Release|x86
+		{91B33F67-B850-4407-A85D-51A4A229DF10}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {BD33D0CF-3B40-4BE8-8A0E-FC7948B82266}
+	EndGlobalSection
+EndGlobal
diff --git a/Samples/Islands/DrawingIsland/CalculatorDemoPackage/CalculatorDemoPackage.wapproj b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/CalculatorDemoPackage.wapproj
new file mode 100644
index 000000000..de96ab37e
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/CalculatorDemoPackage.wapproj
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <PropertyGroup>
+    <ProjectGuid>b100da96-7f60-4053-9e91-554afb2b3db2</ProjectGuid>
+    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <NoWarn>$(NoWarn);NU1702</NoWarn>
+    <EntryPointProjectUniqueName>..\CalculatorDemo.csproj</EntryPointProjectUniqueName>
+    <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
+    <TargetFrameworkMoniker>.NETCoreApp,Version=v9.0</TargetFrameworkMoniker>
+    <TargetFramework>net9.0-windows10.0.17763.0</TargetFramework>
+    <RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
+    <Platforms>x64;x86;ARM64</Platforms>
+    <UseWinUITools>false</UseWinUITools>
+    <EnableCoreMrtTooling>false</EnableCoreMrtTooling>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Images\SplashScreen.scale-200.png" />
+    <Content Include="Images\LockScreenLogo.scale-200.png" />
+    <Content Include="Images\Square150x150Logo.scale-200.png" />
+    <Content Include="Images\Square44x44Logo.scale-200.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Images\StoreLogo.png" />
+    <Content Include="Images\Wide310x150Logo.scale-200.png" />
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240428000" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\CalculatorDemo.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/LockScreenLogo.scale-200.png b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/LockScreenLogo.scale-200.png
new file mode 100644
index 000000000..735f57adb
Binary files /dev/null and b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/LockScreenLogo.scale-200.png differ
diff --git a/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/SplashScreen.scale-200.png b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/SplashScreen.scale-200.png
new file mode 100644
index 000000000..023e7f1fe
Binary files /dev/null and b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/SplashScreen.scale-200.png differ
diff --git a/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/Square150x150Logo.scale-200.png b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/Square150x150Logo.scale-200.png
new file mode 100644
index 000000000..af49fec1a
Binary files /dev/null and b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/Square150x150Logo.scale-200.png differ
diff --git a/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/Square44x44Logo.scale-200.png b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/Square44x44Logo.scale-200.png
new file mode 100644
index 000000000..ce342a2ec
Binary files /dev/null and b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/Square44x44Logo.scale-200.png differ
diff --git a/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 000000000..f6c02ce97
Binary files /dev/null and b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/StoreLogo.png b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/StoreLogo.png
new file mode 100644
index 000000000..7385b56c0
Binary files /dev/null and b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/StoreLogo.png differ
diff --git a/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/Wide310x150Logo.scale-200.png b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/Wide310x150Logo.scale-200.png
new file mode 100644
index 000000000..288995b39
Binary files /dev/null and b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Images/Wide310x150Logo.scale-200.png differ
diff --git a/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Package.appxmanifest b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Package.appxmanifest
new file mode 100644
index 000000000..a8fc2737e
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/CalculatorDemoPackage/Package.appxmanifest
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap rescap">
+
+  <Identity
+    Name="139ad2c3-2d4d-4fc8-a361-cf82888c5555"
+    Publisher="CN=jecollin"
+    Version="1.0.0.0" />
+
+  <Properties>
+    <DisplayName>CalculatorDemoPackage</DisplayName>
+    <PublisherDisplayName>jecollin</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="CalculatorDemoPackage"
+        Description="CalculatorDemoPackage"
+        BackgroundColor="transparent"
+        Square150x150Logo="Images\Square150x150Logo.png"
+        Square44x44Logo="Images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" />
+        <uap:SplashScreen Image="Images\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <Capability Name="internetClient" />
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>
diff --git a/Samples/Islands/DrawingIsland/DrawingCsTestApp/DrawingCsTestApp.csproj b/Samples/Islands/DrawingIsland/DrawingCsTestApp/DrawingCsTestApp.csproj
index 6128a7e47..7a231196f 100644
--- a/Samples/Islands/DrawingIsland/DrawingCsTestApp/DrawingCsTestApp.csproj
+++ b/Samples/Islands/DrawingIsland/DrawingCsTestApp/DrawingCsTestApp.csproj
@@ -4,7 +4,7 @@
     <OutputType>WinExe</OutputType>
 
     <!-- TODO: Why do we need to specify a specific Windows version? -->
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>x64;ARM64;x86</Platforms>
diff --git a/Samples/Islands/DrawingIsland/DrawingCsTestPackage/DrawingCsTestPackage.wapproj b/Samples/Islands/DrawingIsland/DrawingCsTestPackage/DrawingCsTestPackage.wapproj
index 5d130fa8d..9ea5b74a9 100644
--- a/Samples/Islands/DrawingIsland/DrawingCsTestPackage/DrawingCsTestPackage.wapproj
+++ b/Samples/Islands/DrawingIsland/DrawingCsTestPackage/DrawingCsTestPackage.wapproj
@@ -41,6 +41,14 @@
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
     <NoWarn>$(NoWarn);NU1702</NoWarn>
     <EntryPointProjectUniqueName>..\DrawingCsTestApp\DrawingCsTestApp.csproj</EntryPointProjectUniqueName>
+	    <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
+	    <TargetFrameworkMoniker>.NETCoreApp,Version=v9.0</TargetFrameworkMoniker>
+	    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
+	    <RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
+	    <Platforms>x64;x86;ARM64</Platforms>
+	    <UseWPF>true</UseWPF>
+	    <UseWinUITools>false</UseWinUITools>
+    <EnableCoreMrtTooling>false</EnableCoreMrtTooling>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
diff --git a/Samples/Islands/DrawingIsland/DrawingIsland.sln b/Samples/Islands/DrawingIsland/DrawingIsland.sln
index 74fb743d9..ed6805296 100644
--- a/Samples/Islands/DrawingIsland/DrawingIsland.sln
+++ b/Samples/Islands/DrawingIsland/DrawingIsland.sln
@@ -13,7 +13,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrawingCsTestApp", "Drawing
 EndProject
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "DrawingCsTestPackage", "DrawingCsTestPackage\DrawingCsTestPackage.wapproj", "{3ED80AF8-0D53-4568-8A9A-BCB852B85DC7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrawingIslandCsProjection", "DrawingIslandCsProjection\DrawingIslandCsProjection.csproj", "{48847923-880A-4A61-99CF-64B8EABD412B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrawingIslandCsProjection", "DrawingIslandCsProjection\DrawingIslandCsProjection.csproj", "{48847923-880A-4A61-99CF-64B8EABD412B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CalculatorDemo", "CalculatorDemo.csproj", "{5731865D-6685-47A7-8877-5DBAF39B54CD}"
+EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "CalculatorDemoPackage", "CalculatorDemoPackage\CalculatorDemoPackage.wapproj", "{B100DA96-7F60-4053-9E91-554AFB2B3DB2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -109,6 +113,36 @@ Global
 		{48847923-880A-4A61-99CF-64B8EABD412B}.Release|x64.Build.0 = Release|x64
 		{48847923-880A-4A61-99CF-64B8EABD412B}.Release|x86.ActiveCfg = Release|x86
 		{48847923-880A-4A61-99CF-64B8EABD412B}.Release|x86.Build.0 = Release|x86
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|ARM64.Build.0 = Debug|ARM64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|x64.ActiveCfg = Debug|x64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|x64.Build.0 = Debug|x64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|x86.ActiveCfg = Debug|x86
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Debug|x86.Build.0 = Debug|x86
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Release|ARM64.ActiveCfg = Release|ARM64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Release|ARM64.Build.0 = Release|ARM64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Release|x64.ActiveCfg = Release|x64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Release|x64.Build.0 = Release|x64
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Release|x86.ActiveCfg = Release|x86
+		{5731865D-6685-47A7-8877-5DBAF39B54CD}.Release|x86.Build.0 = Release|x86
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|ARM64.Build.0 = Debug|ARM64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|x64.ActiveCfg = Debug|x64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|x64.Build.0 = Debug|x64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|x64.Deploy.0 = Debug|x64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|x86.ActiveCfg = Debug|x86
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|x86.Build.0 = Debug|x86
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Debug|x86.Deploy.0 = Debug|x86
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|ARM64.Build.0 = Release|ARM64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|ARM64.Deploy.0 = Release|ARM64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|x64.ActiveCfg = Release|x64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|x64.Build.0 = Release|x64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|x64.Deploy.0 = Release|x64
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|x86.ActiveCfg = Release|x86
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|x86.Build.0 = Release|x86
+		{B100DA96-7F60-4053-9E91-554AFB2B3DB2}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Samples/Islands/DrawingIsland/DrawingIslandCsProjection/DrawingIslandCsProjection.csproj b/Samples/Islands/DrawingIsland/DrawingIslandCsProjection/DrawingIslandCsProjection.csproj
index 149d98603..47f2763a6 100644
--- a/Samples/Islands/DrawingIsland/DrawingIslandCsProjection/DrawingIslandCsProjection.csproj
+++ b/Samples/Islands/DrawingIsland/DrawingIslandCsProjection/DrawingIslandCsProjection.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- TODO: Why do we need to specify the latest Win11 SDK instead of RS5 SDK? -->
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>x64;x86;ARM64</Platforms>
diff --git a/Samples/Islands/DrawingIsland/MainWindow.cs b/Samples/Islands/DrawingIsland/MainWindow.cs
new file mode 100644
index 000000000..4ebb4cf52
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/MainWindow.cs
@@ -0,0 +1,455 @@
+// // Copyright (c) Microsoft. All rights reserved.
+// // Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace CalculatorDemo
+{
+    /// <summary>
+    ///     Interaction logic for MainWindow.xaml
+    /// </summary>
+    public sealed partial class MainWindow : Window
+    {
+        private static PaperTrail _paper;
+        private Operation _lastOper;
+        private string _lastVal;
+        private string _memVal;
+
+        public MainWindow()
+        {
+            InitializeComponent();
+            _paper = new PaperTrail(this);
+            ProcessKey('0');
+            EraseDisplay = true;
+        }
+
+        /// <summary>
+        ///     Flag to erase or just add to current display flag
+        /// </summary>
+        private bool EraseDisplay { get; set; }
+
+        /// <summary>
+        ///     Get/Set Memory cell value
+        /// </summary>
+        private double Memory
+        {
+            get
+            {
+                if (_memVal == string.Empty)
+                    return 0.0;
+                return Convert.ToDouble(_memVal);
+            }
+            set { _memVal = value.ToString(CultureInfo.InvariantCulture); }
+        }
+
+        //Lats value entered
+        private string LastValue
+        {
+            get
+            {
+                if (_lastVal == string.Empty)
+                    return "0";
+                return _lastVal;
+            }
+            set { _lastVal = value; }
+        }
+
+        //The current Calculator display
+        private string Display { get; set; }
+        // Sample event handler:  
+        private void OnWindowKeyDown(object sender, TextCompositionEventArgs /*System.Windows.Input.KeyEventArgs*/ e)
+        {
+            var s = e.Text;
+            var c = (s.ToCharArray())[0];
+            e.Handled = true;
+
+            if ((c >= '0' && c <= '9') || c == '.' || c == '\b') // '\b' is backspace
+            {
+                ProcessKey(c);
+                return;
+            }
+            switch (c)
+            {
+                case '+':
+                    ProcessOperation("BPlus");
+                    break;
+                case '-':
+                    ProcessOperation("BMinus");
+                    break;
+                case '*':
+                    ProcessOperation("BMultiply");
+                    break;
+                case '/':
+                    ProcessOperation("BDevide");
+                    break;
+                case '%':
+                    ProcessOperation("BPercent");
+                    break;
+                case '=':
+                    ProcessOperation("BEqual");
+                    break;
+            }
+        }
+
+        private void DigitBtn_Click(object sender, RoutedEventArgs e)
+        {
+            var s = ((Button) sender).Content.ToString();
+
+            //char[] ids = ((Button)sender).ID.ToCharArray();
+            var ids = s.ToCharArray();
+            ProcessKey(ids[0]);
+        }
+
+        private void ProcessKey(char c)
+        {
+            if (EraseDisplay)
+            {
+                Display = string.Empty;
+                EraseDisplay = false;
+            }
+            AddToDisplay(c);
+        }
+
+        private void ProcessOperation(string s)
+        {
+            var d = 0.0;
+            switch (s)
+            {
+                case "BPM":
+                    _lastOper = Operation.Negate;
+                    LastValue = Display;
+                    CalcResults();
+                    LastValue = Display;
+                    EraseDisplay = true;
+                    _lastOper = Operation.None;
+                    break;
+                case "BDevide":
+
+                    if (EraseDisplay) //stil wait for a digit...
+                    {
+                        //stil wait for a digit...
+                        _lastOper = Operation.Devide;
+                        break;
+                    }
+                    CalcResults();
+                    _lastOper = Operation.Devide;
+                    LastValue = Display;
+                    EraseDisplay = true;
+                    break;
+                case "BMultiply":
+                    if (EraseDisplay) //stil wait for a digit...
+                    {
+                        //stil wait for a digit...
+                        _lastOper = Operation.Multiply;
+                        break;
+                    }
+                    CalcResults();
+                    _lastOper = Operation.Multiply;
+                    LastValue = Display;
+                    EraseDisplay = true;
+                    break;
+                case "BMinus":
+                    if (EraseDisplay) //stil wait for a digit...
+                    {
+                        //stil wait for a digit...
+                        _lastOper = Operation.Subtract;
+                        break;
+                    }
+                    CalcResults();
+                    _lastOper = Operation.Subtract;
+                    LastValue = Display;
+                    EraseDisplay = true;
+                    break;
+                case "BPlus":
+                    if (EraseDisplay)
+                    {
+                        //stil wait for a digit...
+                        _lastOper = Operation.Add;
+                        break;
+                    }
+                    CalcResults();
+                    _lastOper = Operation.Add;
+                    LastValue = Display;
+                    EraseDisplay = true;
+                    break;
+                case "BEqual":
+                    if (EraseDisplay) //stil wait for a digit...
+                        break;
+                    CalcResults();
+                    EraseDisplay = true;
+                    _lastOper = Operation.None;
+                    LastValue = Display;
+                    //val = Display;
+                    break;
+                case "BSqrt":
+                    _lastOper = Operation.Sqrt;
+                    LastValue = Display;
+                    CalcResults();
+                    LastValue = Display;
+                    EraseDisplay = true;
+                    _lastOper = Operation.None;
+                    break;
+                case "BPercent":
+                    if (EraseDisplay) //stil wait for a digit...
+                    {
+                        //stil wait for a digit...
+                        _lastOper = Operation.Percent;
+                        break;
+                    }
+                    CalcResults();
+                    _lastOper = Operation.Percent;
+                    LastValue = Display;
+                    EraseDisplay = true;
+                    //LastOper = Operation.None;
+                    break;
+                case "BOneOver":
+                    _lastOper = Operation.OneX;
+                    LastValue = Display;
+                    CalcResults();
+                    LastValue = Display;
+                    EraseDisplay = true;
+                    _lastOper = Operation.None;
+                    break;
+                case "BC": //clear All
+                    _lastOper = Operation.None;
+                    Display = LastValue = string.Empty;
+                    _paper.Clear();
+                    UpdateDisplay();
+                    break;
+                case "BCE": //clear entry
+                    _lastOper = Operation.None;
+                    Display = LastValue;
+                    UpdateDisplay();
+                    break;
+                case "BMemClear":
+                    Memory = 0.0F;
+                    DisplayMemory();
+                    break;
+                case "BMemSave":
+                    Memory = Convert.ToDouble(Display);
+                    DisplayMemory();
+                    EraseDisplay = true;
+                    break;
+                case "BMemRecall":
+                    Display = /*val =*/ Memory.ToString(CultureInfo.InvariantCulture);
+                    UpdateDisplay();
+                    //if (LastOper != Operation.None)   //using MR is like entring a digit
+                    EraseDisplay = false;
+                    break;
+                case "BMemPlus":
+                    d = Memory + Convert.ToDouble(Display);
+                    Memory = d;
+                    DisplayMemory();
+                    EraseDisplay = true;
+                    break;
+            }
+        }
+
+        private void OperBtn_Click(object sender, RoutedEventArgs e)
+        {
+            ProcessOperation(((Button) sender).Name);
+        }
+
+        private double Calc(Operation lastOper)
+        {
+            var d = 0.0;
+
+
+            try
+            {
+                switch (lastOper)
+                {
+                    case Operation.Devide:
+                        _paper.AddArguments(LastValue + " / " + Display);
+                        d = (Convert.ToDouble(LastValue)/Convert.ToDouble(Display));
+                        CheckResult(d);
+                        _paper.AddResult(d.ToString(CultureInfo.InvariantCulture));
+                        break;
+                    case Operation.Add:
+                        _paper.AddArguments(LastValue + " + " + Display);
+                        d = Convert.ToDouble(LastValue) + Convert.ToDouble(Display);
+                        CheckResult(d);
+                        _paper.AddResult(d.ToString(CultureInfo.InvariantCulture));
+                        break;
+                    case Operation.Multiply:
+                        _paper.AddArguments(LastValue + " * " + Display);
+                        d = Convert.ToDouble(LastValue)*Convert.ToDouble(Display);
+                        CheckResult(d);
+                        _paper.AddResult(d.ToString(CultureInfo.InvariantCulture));
+                        break;
+                    case Operation.Percent:
+                        //Note: this is different (but make more sense) then Windows calculator
+                        _paper.AddArguments(LastValue + " % " + Display);
+                        d = (Convert.ToDouble(LastValue)*Convert.ToDouble(Display))/100.0F;
+                        CheckResult(d);
+                        _paper.AddResult(d.ToString(CultureInfo.InvariantCulture));
+                        break;
+                    case Operation.Subtract:
+                        _paper.AddArguments(LastValue + " - " + Display);
+                        d = Convert.ToDouble(LastValue) - Convert.ToDouble(Display);
+                        CheckResult(d);
+                        _paper.AddResult(d.ToString(CultureInfo.InvariantCulture));
+                        break;
+                    case Operation.Sqrt:
+                        _paper.AddArguments("Sqrt( " + LastValue + " )");
+                        d = Math.Sqrt(Convert.ToDouble(LastValue));
+                        CheckResult(d);
+                        _paper.AddResult(d.ToString(CultureInfo.InvariantCulture));
+                        break;
+                    case Operation.OneX:
+                        _paper.AddArguments("1 / " + LastValue);
+                        d = 1.0F/Convert.ToDouble(LastValue);
+                        CheckResult(d);
+                        _paper.AddResult(d.ToString(CultureInfo.InvariantCulture));
+                        break;
+                    case Operation.Negate:
+                        d = Convert.ToDouble(LastValue)*(-1.0F);
+                        break;
+                }
+            }
+            catch
+            {
+                d = 0;
+                var parent = (Window) MyPanel.Parent;
+                _paper.AddResult("Error");
+                MessageBox.Show(parent, "Operation cannot be perfomed", parent.Title);
+            }
+
+            return d;
+        }
+
+        private void CheckResult(double d)
+        {
+            if (double.IsNegativeInfinity(d) || double.IsPositiveInfinity(d) || double.IsNaN(d))
+                throw new Exception("Illegal value");
+        }
+
+        private void DisplayMemory()
+        {
+            if (_memVal != string.Empty)
+                BMemBox.Text = "Memory: " + _memVal;
+            else
+                BMemBox.Text = "Memory: [empty]";
+        }
+
+        private void CalcResults()
+        {
+            double d;
+            if (_lastOper == Operation.None)
+                return;
+
+            d = Calc(_lastOper);
+            Display = d.ToString(CultureInfo.InvariantCulture);
+
+            UpdateDisplay();
+        }
+
+        private void UpdateDisplay()
+        {
+            DisplayBox.Text = Display == string.Empty ? "0" : Display;
+        }
+
+        private void AddToDisplay(char c)
+        {
+            if (c == '.')
+            {
+                if (Display.IndexOf('.', 0) >= 0) //already exists
+                    return;
+                Display = Display + c;
+            }
+            else
+            {
+                if (c >= '0' && c <= '9')
+                {
+                    Display = Display + c;
+                }
+                else if (c == '\b') //backspace ?
+                {
+                    if (Display.Length <= 1)
+                        Display = string.Empty;
+                    else
+                    {
+                        var i = Display.Length;
+                        Display = Display.Remove(i - 1, 1); //remove last char 
+                    }
+                }
+            }
+
+            UpdateDisplay();
+        }
+
+        private void OnMenuAbout(object sender, RoutedEventArgs e)
+        {
+            var parent = (Window) MyPanel.Parent;
+            MessageBox.Show(parent, parent.Title + " - By Jossef Goldberg ", parent.Title, MessageBoxButton.OK,
+                MessageBoxImage.Information);
+        }
+
+        private void OnMenuExit(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private void OnMenuStandard(object sender, RoutedEventArgs e)
+        {
+            //((MenuItem)ScientificMenu).IsChecked = false;
+            StandardMenu.IsChecked = true; //for now always Standard
+        }
+
+        private void OnMenuScientific(object sender, RoutedEventArgs e)
+        {
+            //((MenuItem)StandardMenu).IsChecked = false; 
+        }
+
+        private enum Operation
+        {
+            None,
+            Devide,
+            Multiply,
+            Subtract,
+            Add,
+            Percent,
+            Sqrt,
+            OneX,
+            Negate
+        }
+
+        private class PaperTrail
+        {
+            private readonly MainWindow _window;
+            private string _args;
+
+            public PaperTrail(MainWindow window)
+            {
+                _window = window;
+            }
+
+            public void AddArguments(string a)
+            {
+                _args = a;
+            }
+
+            public void AddResult(string r)
+            {
+                _window.PaperBox.Text += _args + " = " + r + "\n";
+            }
+
+            public void Clear()
+            {
+                _window.PaperBox.Text = string.Empty;
+                _args = string.Empty;
+            }
+        }
+
+        private void MenuItem_Click(object sender, RoutedEventArgs e)
+        {
+            ContentBorder.Child = new WpfIslandHost();
+
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/Samples/Islands/DrawingIsland/MainWindow.xaml b/Samples/Islands/DrawingIsland/MainWindow.xaml
new file mode 100644
index 000000000..e70ae3f67
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/MainWindow.xaml
@@ -0,0 +1,145 @@
+<Window x:Class="CalculatorDemo.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:CalculatorDemo"
+        mc:Ignorable="d"
+        Title="MainWindow"
+        Height="450"
+        Width="650"
+        Icon="appicon.ico">
+    
+    <Window.Resources>
+        <!-- 
+        calc_update_tweaks: This below style will apply to all Buttons by default.
+        We set HorizontalAlignment and VeriticalAlignment to "Stretch" so that each button will fill its Grid cell.
+        The Margin is here so that there's a bit of space between each button.
+        -->
+        <Style TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Stretch"/>
+            <Setter Property="Margin" Value="2"/>
+        </Style>
+
+        <!--
+        calc_update_tweaks: We also make a new Style called "GrayButton".  The buttons that have the gray appearance will use
+        this style.
+        -->
+        <Style x:Key="GrayButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+            <Setter Property="Background" Value="#33aaaabb"/>
+        </Style>
+    </Window.Resources>
+
+    <DockPanel Name="MyPanel">
+        <!--
+        calc_update_tweaks: Remove the hardcoded hight to make the Menu taller so that the menu items can be fully visible.
+        -->
+        <Menu DockPanel.Dock="Top">
+            <MenuItem Header="File">
+                <MenuItem Click="MenuItem_Click" Header="Load Island" />
+                <MenuItem Click="OnMenuExit" Header="Exit" />
+            </MenuItem>
+            <MenuItem Header="View">
+                <MenuItem Name="StandardMenu" Click="OnMenuStandard" IsCheckable="true" IsChecked="True"
+                          Header="Standard" />
+            </MenuItem>
+            <MenuItem Header="Help">
+                <MenuItem Click="OnMenuAbout" Header="About" />
+            </MenuItem>
+        </Menu>
+        <Grid Name="MyGrid" ShowGridLines="False">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Button Name="B7" Click="DigitBtn_Click" Grid.Column="4" Grid.Row="2">7</Button>
+            <Button Name="B8" Click="DigitBtn_Click" Grid.Column="5" Grid.Row="2">8</Button>
+            <Button Name="B9" Click="DigitBtn_Click" Grid.Column="6" Grid.Row="2">9</Button>
+            <Button Name="B4" Click="DigitBtn_Click" Grid.Column="4" Grid.Row="3">4</Button>
+            <Button Name="B5" Click="DigitBtn_Click" Grid.Column="5" Grid.Row="3">5</Button>
+            <Button Name="B6" Click="DigitBtn_Click" Grid.Column="6" Grid.Row="3">6</Button>
+            <Button Name="B1" Click="DigitBtn_Click" Grid.Column="4" Grid.Row="4">1</Button>
+            <Button Name="B2" Click="DigitBtn_Click" Grid.Column="5" Grid.Row="4">2</Button>
+            <Button Name="B3" Click="DigitBtn_Click" Grid.Column="6" Grid.Row="4">3</Button>
+            <Button Name="B0" Click="DigitBtn_Click" Grid.Column="4" Grid.Row="5">0</Button>
+            <Button Name="BPeriod" Click="DigitBtn_Click" Grid.Column="5" Grid.Row="5">.</Button>
+            <!--
+            calc_update_tweaks: We add Style="{StaticResource GrayButton}" here to the Buttons we want to be gray to 
+            use the new Style we defined above. 
+            -->
+            <Button Name="BPM" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="6" Grid.Row="5">+/-</Button>
+            <Button Name="BDevide" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="2">/</Button>
+            <Button Name="BMultiply" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="3">*</Button>
+            <Button Name="BMinus" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="4">-</Button>
+            <Button Name="BPlus" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="5">+</Button>
+            <Button Name="BSqrt" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="8" Grid.Row="2"
+                    ToolTip="Usage: 'A Sqrt'">
+                Sqrt
+            </Button>
+            <Button Name="BPercent" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="8" Grid.Row="3"
+                    ToolTip="Usage: 'A % B ='">
+                %
+            </Button>
+            <Button Name="BOneOver" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="8" Grid.Row="4"
+                    ToolTip="Usage: 'A 1/X'">
+                1/X
+            </Button>
+            <!--
+            calc_update_tweaks: Let's make the "=" Button an Accent button, so it's easy to find.
+            -->
+            <Button Name="BEqual" Click="OperBtn_Click" Grid.Column="8" Grid.Row="5"
+                    Foreground="{DynamicResource AccentButtonForeground}" Background="{DynamicResource AccentButtonBackground}">=</Button>
+            <Button Name="BC" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="8" Grid.Row="1"
+                     ToolTip="Clear All">
+                C
+            </Button>
+            <Button Name="BCE" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="7" Grid.Row="1"
+                    ToolTip="Clear Current Entry">
+                CE
+            </Button>
+            <Button Name="BMemClear" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="3" Grid.Row="2"
+                    ToolTip="Clear Memory">
+                MC
+            </Button>
+            <Button Name="BMemRecall" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="3" Grid.Row="3"
+                    ToolTip="Recall Memory">
+                MR
+            </Button>
+            <Button Name="BMemSave" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="3" Grid.Row="4"
+                    ToolTip="Store in Memory">
+                MS
+            </Button>
+            <Button Name="BMemPlus" Click="OperBtn_Click" Style="{StaticResource GrayButton}" Grid.Column="3" Grid.Row="5"
+                    ToolTip="Add To Memory">
+                M+
+            </Button>
+            <TextBlock Name="BMemBox" Grid.Column="3" Grid.Row="1" Margin="10,17,10,17" Grid.ColumnSpan="2">Memory: [empty]</TextBlock>
+
+            <!-- 
+            calc_update_tweaks: Make the calculator text a little larger to be more visible. 
+            Also, make the TextBox borders a little less harsh.
+            -->
+            <local:MyTextBox Grid.ColumnSpan="9" x:Name="DisplayBox" Height="30" Margin="5" FontSize="20" BorderBrush="LightGray"/>
+            
+            <local:MyTextBox Grid.Row="1" Grid.ColumnSpan="3" Grid.RowSpan="5" Margin="5" x:Name="PaperBox" BorderBrush="LightGray" Visibility="Hidden"/>
+
+            <Border  Grid.Row="1" Grid.ColumnSpan="3" Grid.RowSpan="5" Margin="5" x:Name="ContentBorder" />
+        </Grid>
+    </DockPanel>
+</Window>
diff --git a/Samples/Islands/DrawingIsland/MyTextBox.cs b/Samples/Islands/DrawingIsland/MyTextBox.cs
new file mode 100644
index 000000000..f42222459
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/MyTextBox.cs
@@ -0,0 +1,17 @@
+// // Copyright (c) Microsoft. All rights reserved.
+// // Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace CalculatorDemo
+{
+    internal sealed class MyTextBox : TextBox
+    {
+        protected override void OnPreviewGotKeyboardFocus(KeyboardFocusChangedEventArgs e)
+        {
+            e.Handled = true;
+            base.OnPreviewGotKeyboardFocus(e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Samples/Islands/DrawingIsland/Properties/AssemblyInfo.cs b/Samples/Islands/DrawingIsland/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..5dcea412b
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/Properties/AssemblyInfo.cs
@@ -0,0 +1,59 @@
+// // Copyright (c) Microsoft. All rights reserved.
+// // Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// 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("CalculatorDemo")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("CalculatorDemo")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
+[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)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+    //(used if a resource is not found in the page, 
+    // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    //(used if a resource is not found in the page, 
+    // app, or any theme specific resource dictionaries)
+    )]
+
+
+// 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("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/Samples/Islands/DrawingIsland/Properties/Resources.Designer.cs b/Samples/Islands/DrawingIsland/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..66e92c0be
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/Properties/Resources.Designer.cs
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CalculatorDemo.Properties
+{
+
+
+	/// <summary>
+	///   A strongly-typed resource class, for looking up localized strings, etc.
+	/// </summary>
+	// This class was auto-generated by the StronglyTypedResourceBuilder
+	// class via a tool like ResGen or Visual Studio.
+	// To add or remove a member, edit your .ResX file then rerun ResGen
+	// with the /str option, or rebuild your VS project.
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+	[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+	internal class Resources
+	{
+
+		private static global::System.Resources.ResourceManager resourceMan;
+
+		private static global::System.Globalization.CultureInfo resourceCulture;
+
+		[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+		internal Resources()
+		{
+		}
+
+		/// <summary>
+		///   Returns the cached ResourceManager instance used by this class.
+		/// </summary>
+		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+		internal static global::System.Resources.ResourceManager ResourceManager
+		{
+			get
+			{
+				if ((resourceMan == null))
+				{
+					global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CalculatorDemo.Properties.Resources", typeof(Resources).Assembly);
+					resourceMan = temp;
+				}
+				return resourceMan;
+			}
+		}
+
+		/// <summary>
+		///   Overrides the current thread's CurrentUICulture property for all
+		///   resource lookups using this strongly typed resource class.
+		/// </summary>
+		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+		internal static global::System.Globalization.CultureInfo Culture
+		{
+			get
+			{
+				return resourceCulture;
+			}
+			set
+			{
+				resourceCulture = value;
+			}
+		}
+	}
+}
diff --git a/Samples/Islands/DrawingIsland/Properties/Resources.resx b/Samples/Islands/DrawingIsland/Properties/Resources.resx
new file mode 100644
index 000000000..af7dbebba
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/Properties/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Samples/Islands/DrawingIsland/Properties/Settings.Designer.cs b/Samples/Islands/DrawingIsland/Properties/Settings.Designer.cs
new file mode 100644
index 000000000..0610885f1
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CalculatorDemo.Properties
+{
+
+
+	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+	internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+	{
+
+		private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+		public static Settings Default
+		{
+			get
+			{
+				return defaultInstance;
+			}
+		}
+	}
+}
diff --git a/Samples/Islands/DrawingIsland/Properties/Settings.settings b/Samples/Islands/DrawingIsland/Properties/Settings.settings
new file mode 100644
index 000000000..c14891b94
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/Properties/Settings.settings
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/Samples/Islands/DrawingIsland/README.md b/Samples/Islands/DrawingIsland/README.md
new file mode 100644
index 000000000..9d88611d4
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/README.md
@@ -0,0 +1,49 @@
+---
+languages:
+- csharp
+products:
+- windows-wpf
+page_type: sample
+name: "Calculator Demo"        
+description: "This sample application is a simple calculator. It demonstrates layout, controls, and some simple animation."
+---
+# Calculator Demo
+This sample application is a simple calculator. It demonstrates layout, controls, and some simple animation.
+
+## Build the sample
+The easiest way to use these samples without using Git is to download the zip file containing the current version (using the link below or by clicking the "Download ZIP" button on the [repo](https://github.com/microsoft/WPF-Samples?tab=readme-ov-file) page). You can then unzip the entire archive and use the samples in [Visual Studio 2022](https://www.visualstudio.com/wpf-vs).
+
+[Download the samples ZIP](../../archive/main.zip)
+
+### Deploying the sample
+- Select Build > Deploy Solution. 
+
+### Deploying and running the sample
+- To debug the sample and then run it, press F5 or select Debug >  Start Debugging. To run the sample without debugging, press Ctrl+F5 or selectDebug > Start Without Debugging. 
+
+# Calculator Demo update
+
+This section shows how we updated the Calculator Demo to give it a Win11 look and feel.
+
+## Commit 1: Use .net 9 preview 4 (calc_update_use_dotnet9)
+
+DotNet9 hadn't yet shipped when we made this demo, so we had to use the .net9 preview 4 sdk installer from [here](https://github.com/dotnet/installer).
+Also see that we had to add a dotnet9 entry to our nuget.config, we can remove this once preview 4 ships publicly.
+
+To make the app build with .net 9, we change the csproj file to use net9.0 as the TargetFramework.
+
+## Commit 2: Use the new WPF Fluent Resource Dictionary (calc_update_fluent)
+
+For our app to use the new styles, we need to add the Fluent ResourceDictionary to our Application's merged ResourceDictionary.  See App.xaml.
+
+## Commit 3: Now that the new styles are applied, make some tweaks to add polish (calc_update_tweaks)
+
+We need to make a few tweaks, mostly for layout, to make things look nice:
+* We make the default Button style set Horizontal and VerticalAlignment to stretch so that each button fills its grid cell.  We add a margin
+too so that the buttons have a little space between them.
+* We remove the hardcoded height of the Menu bar at the top so that the menu items are fully visible.
+* We increase the default size of the Window, since the new styles tend to use larger text sizes.
+* We define a "GrayButton" Style for all the gray buttons in the calculator UI.  We set a background that is gray and translucent so that
+the mica background is visible through it.
+* We give the "=" button the background and foreground of an accent button.
+* On the TextBoxes, we made the text a little larger and the border more subtle.
\ No newline at end of file
diff --git a/Samples/Islands/DrawingIsland/WpfIslandHost.cs b/Samples/Islands/DrawingIsland/WpfIslandHost.cs
new file mode 100644
index 000000000..388787d2b
--- /dev/null
+++ b/Samples/Islands/DrawingIsland/WpfIslandHost.cs
@@ -0,0 +1,65 @@
+using DrawingIslandComponents;
+using Microsoft.UI.Content;
+using Microsoft.UI.Dispatching;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Interop;
+using Windows.UI;
+
+namespace CalculatorDemo
+{
+    internal class WpfIslandHost : HwndHost
+    {
+        protected override HandleRef BuildWindowCore(HandleRef hwndParent)
+        {
+            _compositor = new Microsoft.UI.Composition.Compositor();
+
+            _desktopChildSiteBridge = Microsoft.UI.Content.DesktopChildSiteBridge.Create(
+                _compositor,
+                new Microsoft.UI.WindowId((ulong)hwndParent.Handle));
+
+            //SetupGreenRectangleIsland();
+            SetupDrawingIsland();
+
+            return new HandleRef(null, (nint)_desktopChildSiteBridge.WindowId.Value);
+        }
+
+        protected override void DestroyWindowCore(HandleRef hwnd)
+        {
+            _desktopChildSiteBridge?.Dispose();
+            _desktopChildSiteBridge = null;
+        }
+
+        private void SetupDrawingIsland()
+        {
+            _desktopChildSiteBridge.Connect(new DrawingIsland(_compositor).Island);
+        }
+
+        private void SetupGreenRectangleIsland()
+        {
+            _root = _compositor.CreateContainerVisual();
+
+            var child = _compositor.CreateSpriteVisual();
+            child.Brush = _compositor.CreateColorBrush(Color.FromArgb(0xFF, 0x00, 0xCC, 0x00));
+            child.Size = new Vector2(400, 400);
+
+            _root.Children.InsertAtTop(child);
+
+            _island = ContentIsland.Create(_root);
+            _island.RequestSize(new Vector2(200, 200));
+
+            _desktopChildSiteBridge.Connect(_island);
+        }
+
+        Microsoft.UI.Composition.Compositor? _compositor;
+        Microsoft.UI.Composition.ContainerVisual? _root;
+        Microsoft.UI.Content.DesktopChildSiteBridge? _desktopChildSiteBridge;
+        Microsoft.UI.Content.ContentIsland? _island;
+    }
+}
diff --git a/Samples/Islands/DrawingIsland/appicon.ico b/Samples/Islands/DrawingIsland/appicon.ico
new file mode 100644
index 000000000..2cec3ddd0
Binary files /dev/null and b/Samples/Islands/DrawingIsland/appicon.ico differ