diff --git a/.gitmodules b/.gitmodules
index 3682f34..f590fe4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "mobile-eggbert-fna/worlds"]
 	path = mobile-eggbert-fna/worlds
 	url = https://code.openeggbert.com/openeggbert/speedy-blupi-dadagames-worlds
+[submodule "mobile-eggbert-fna/WindowsPhoneSpeedyBlupi"]
+	path = mobile-eggbert-fna/WindowsPhoneSpeedyBlupi
+	url = https://code.openeggbert.com/openeggbert/mobile-eggbert-core
diff --git a/mobile-eggbert-fna/WindowsPhoneSpeedyBlupi b/mobile-eggbert-fna/WindowsPhoneSpeedyBlupi
new file mode 160000
index 0000000..c8d567e
--- /dev/null
+++ b/mobile-eggbert-fna/WindowsPhoneSpeedyBlupi
@@ -0,0 +1 @@
+Subproject commit c8d567e85331047be2e62fc0b674cce5c6830cf0
diff --git a/mobile-eggbert-fna/mobile-eggbert-fna.csproj b/mobile-eggbert-fna/mobile-eggbert-fna.csproj
index c96a51d..19ecc61 100644
--- a/mobile-eggbert-fna/mobile-eggbert-fna.csproj
+++ b/mobile-eggbert-fna/mobile-eggbert-fna.csproj
@@ -6,6 +6,14 @@
     <RootNamespace>mobile_eggbert_fna</RootNamespace>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DefineConstants>FNA</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DefineConstants>KFNA</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Include="FNADllMap.config">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>