diff --git a/.gitignore b/.gitignore
index ebdb29b67..7faa26d70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,3 +112,4 @@ java/build/
 /core/examples/build
 
 .build/
+/app/windows/obj
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c72079f00..13d2a66fd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -143,16 +143,29 @@ tasks.register<Exec>("packageCustomDmg"){
     )
 }
 
+tasks.register<Exec>("packageCustomMsi"){
+    workingDir = file("windows")
+    commandLine(
+        "dotnet",
+        "build",
+        "/p:Platform=x64"
+    )
+}
+
 afterEvaluate{
     tasks.named("packageDmg").configure{
         dependsOn("packageCustomDmg")
         group = "compose desktop"
         actions = emptyList()
     }
+    tasks.named("packageMsi").configure{
+        dependsOn("packageCustomMsi")
+        group = "compose desktop"
+        actions = emptyList()
+    }
 }
 
 
-
 // LEGACY TASKS
 // Most of these are shims to be compatible with the old build system
 // They should be removed in the future, as we work towards making things more Gradle-native
diff --git a/app/windows/Processing.wixproj b/app/windows/Processing.wixproj
new file mode 100644
index 000000000..20751a6a9
--- /dev/null
+++ b/app/windows/Processing.wixproj
@@ -0,0 +1,5 @@
+<Project Sdk="WixToolset.Sdk/5.0.1">
+    <ItemGroup>
+        <PackageReference Include="WixToolset.UI.wixext" Version="5.0.1" />
+    </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/app/windows/Processing.wxs b/app/windows/Processing.wxs
new file mode 100644
index 000000000..e3d6bc5e1
--- /dev/null
+++ b/app/windows/Processing.wxs
@@ -0,0 +1,31 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+  <Package Name="Processing" Manufacturer="Processing Foundation" Version="0.0.1" UpgradeCode="34577f3b-7cbe-4c5e-827d-5fe5ce9d371c">
+    <Icon Id="icon.ico" SourceFile="..\..\build\windows\processing.ico" />
+    <Property Id="ARPPRODUCTICON" Value="icon.ico" />
+
+    <MediaTemplate EmbedCab="yes" />
+
+    <ui:WixUI Id="WixUI_Mondo" InstallDirectory="INSTALLFOLDER" />
+
+    <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
+    <WixVariable Id="WixUIDialogBmp" Value="background.png" />
+    <WixVariable Id="WixUIBannerBmp" Value="banner.png" />
+    <Feature Id="MainApplication" Title="Main Application" Level="1">
+        <Files Include="..\build\compose\binaries\main\app\Processing\**" />
+        <ComponentRef Id="ApplicationShortcut" />
+    </Feature>
+    <Directory Id="ProgramMenuFolder">
+        <Directory Id="ApplicationProgramsFolder" Name="Processing"/>
+    </Directory>
+    <Component Id="ApplicationShortcut" Guid="b15e6d69-f054-4ec2-aade-8e3756b537d6">
+        <Shortcut Id="ApplicationStartMenuShortcut"
+                  Name="Processing"
+                  Description="My Application Description"
+                  Directory="ApplicationProgramsFolder"
+                  Target="[INSTALLFOLDER]\Processing.exe"
+                  WorkingDirectory="INSTALLFOLDER"/>
+        <RemoveFolder Id="CleanUpShortCut" Directory="ApplicationProgramsFolder" On="uninstall"/>
+        <RegistryValue Root="HKCU" Key="Software\Processing Foundation\Processing" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+    </Component>
+  </Package>
+</Wix>
\ No newline at end of file
diff --git a/app/windows/background.png b/app/windows/background.png
new file mode 100644
index 000000000..7345e853d
Binary files /dev/null and b/app/windows/background.png differ
diff --git a/app/windows/banner.png b/app/windows/banner.png
new file mode 100644
index 000000000..d14a95199
Binary files /dev/null and b/app/windows/banner.png differ
diff --git a/app/windows/license.rtf b/app/windows/license.rtf
new file mode 100644
index 000000000..262ff17b1
--- /dev/null
+++ b/app/windows/license.rtf
@@ -0,0 +1 @@
+Hi Here's Processing's license
\ No newline at end of file
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index d4a1dcacb..e9298bbeb 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -70,4 +70,7 @@ tasks.test {
 }
 tasks.withType<Jar> {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+tasks.compileJava{
+    options.encoding = "UTF-8"
 }
\ No newline at end of file