diff --git a/soh/soh.xcodeproj/project.pbxproj b/soh/soh.xcodeproj/project.pbxproj
index 76be5243b9d..9af0d789876 100644
--- a/soh/soh.xcodeproj/project.pbxproj
+++ b/soh/soh.xcodeproj/project.pbxproj
@@ -7,18 +7,29 @@
 	objects = {
 
 /* Begin PBXAggregateTarget section */
-		9B41FED22880D70C00F03590 /* env */ = {
+		9B41FED22880D70C00F03590 /* setup */ = {
 			isa = PBXAggregateTarget;
-			buildConfigurationList = 9B41FED52880D70D00F03590 /* Build configuration list for PBXAggregateTarget "env" */;
+			buildConfigurationList = 9B41FED52880D70D00F03590 /* Build configuration list for PBXAggregateTarget "setup" */;
 			buildPhases = (
 				9B41FED62880D71F00F03590 /* Set Package Paths */,
 				9B41FEE3288181EF00F03590 /* Generate Icon File */,
 			);
 			dependencies = (
 			);
-			name = env;
+			name = setup;
 			productName = env;
 		};
+		9B41FEE62881870600F03590 /* otr */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 9B41FEE72881870600F03590 /* Build configuration list for PBXAggregateTarget "otr" */;
+			buildPhases = (
+				9B41FEEA2881870D00F03590 /* Generate OTR & Assets */,
+			);
+			dependencies = (
+			);
+			name = otr;
+			productName = otr;
+		};
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
@@ -1124,6 +1135,13 @@
 			remoteGlobalIDString = 9B41FED22880D70C00F03590;
 			remoteInfo = env;
 		};
+		9B41FEED288187AA00F03590 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 560C50669DDE4EE1AFF4DAE2 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 9B41FEE62881870600F03590;
+			remoteInfo = otr;
+		};
 		9C59282340824B2A9BE131E7 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 560C50669DDE4EE1AFF4DAE2 /* Project object */;
@@ -5285,7 +5303,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3CE2F27628074545A5D94205 /* Build configuration list for PBXNativeTarget "soh" */;
 			buildPhases = (
-				9B41FEDF2880F26D00F03590 /* Generate OTR & Assets */,
 				71DA44C8DFA14884A042A532 /* Sources */,
 				24325F36B2B1478A95417087 /* Frameworks */,
 				9B41FEBD287FDED300F03590 /* Resources */,
@@ -5294,6 +5311,7 @@
 			);
 			dependencies = (
 				9B41FED82880DC1100F03590 /* PBXTargetDependency */,
+				9B41FEEE288187AA00F03590 /* PBXTargetDependency */,
 				4DDC39EB66BC4E9AA971D7F0 /* PBXTargetDependency */,
 				002C6D4CA9104FDA95C48994 /* PBXTargetDependency */,
 				546747592EBF489FB5F21071 /* PBXTargetDependency */,
@@ -5346,6 +5364,9 @@
 					9B41FED22880D70C00F03590 = {
 						CreatedOnToolsVersion = 14.0;
 					};
+					9B41FEE62881870600F03590 = {
+						CreatedOnToolsVersion = 14.0;
+					};
 				};
 			};
 			buildConfigurationList = C137275036AF40DFB4152797 /* Build configuration list for PBXProject "soh" */;
@@ -5364,7 +5385,8 @@
 				2E42659F01D4457B9D56769C /* libultraship */,
 				6D85CFA44008444FB26F04BA /* soh */,
 				B0E62A5AC8594D409C9077E3 /* storm */,
-				9B41FED22880D70C00F03590 /* env */,
+				9B41FED22880D70C00F03590 /* setup */,
+				9B41FEE62881870600F03590 /* otr */,
 			);
 		};
 /* End PBXProject section */
@@ -5400,44 +5422,44 @@
 			shellPath = /bin/zsh;
 			shellScript = "#!/bin/zsh\n\nif [ -f ~/.zprofile ]; then \n    . ~/.zprofile;\nfi\n\nLD_SDL_PATH=\"$(pkg-config --libs-only-L sdl2 | sed 's/-L//g')\"\nLD_GLEW_PATH=\"$(pkg-config --libs-only-L glew | sed 's/-L//g')\"\necho -e \"LD_RUNPATH_SEARCH_PATHS = ${LD_SDL_PATH} ${LD_GLEW_PATH} \\$(inherited)\" > soh.xcconfig\n\nDYLIB_SDL_PATH=\"$(find $(pkg-config --libs-only-L sdl2 | sed 's/-L//g') -name 'libSDL2.dylib' -print -quit | head -n 1)\" >> soh.xcconfig\nDYLIB_GLEW_PATH=\"$(find $(pkg-config --libs-only-L glew | sed 's/-L//g') -name 'libGLEW.dylib' -print -quit | head -n 1)\" >> soh.xcconfig\necho -e \"OTHER_LDFLAGS = ${DYLIB_SDL_PATH} ${DYLIB_GLEW_PATH} \\$(inherited)\" >> soh.xcconfig\n\n\nINCLUDE_SDL_PATH=\"$(pkg-config --cflags-only-I sdl2 | sed 's/-I//g')\"\nINCLUDE_GLEW_PATH=\"$(pkg-config --cflags-only-I glew | sed 's/-I//g')\"\necho -e \"SYSTEM_HEADER_SEARCH_PATHS = ${INCLUDE_SDL_PATH} ${INCLUDE_GLEW_PATH} \\$(inherited)\" >> soh.xcconfig\n";
 		};
-		9B41FEDF2880F26D00F03590 /* Generate OTR & Assets */ = {
+		9B41FEE3288181EF00F03590 /* Generate Icon File */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
+			buildActionMask = 12;
 			files = (
 			);
 			inputFileListPaths = (
 			);
 			inputPaths = (
+				"$(SRCROOT)/macosx/sohIcon.png",
 			);
-			name = "Generate OTR & Assets";
+			name = "Generate Icon File";
 			outputFileListPaths = (
-				"$(SRCROOT)/macosx/otr-outputs.xcfilelist",
 			);
 			outputPaths = (
+				"$(SRCROOT)/macosx/soh.icns",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/zsh;
-			shellScript = "#!/bin/zsh\n\nif [ -f ~/.zprofile ]; then \n    . ~/.zprofile;\nfi\n\nexport CC=clang\nexport CXX=clang++\n\ncd ../OTRExporter && python3 extract_baserom.py\nmake -C ../OTRExporter/OTRExporter -j$(sysctl -n hw.physicalcpu) DEBUG=0 OPTFLAGS=-O2\nmake -C ../ZAPDTR -j$(sysctl -n hw.physicalcpu)\nrm -rf ../OTRExporter/oot.otr\ncd ../OTRExporter && python3 extract_assets.py\n";
+			shellScript = "#!/bin/zsh\n\nrm -rf \"${SRCROOT}/macosx/soh.iconset\"\nmkdir \"${SRCROOT}/macosx/soh.iconset\"\nsips -z 16 16     \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_16x16.png\"\nsips -z 32 32     \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_16x16@2x.png\"\nsips -z 32 32     \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_32x32.png\"\nsips -z 64 64     \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_32x32@2x.png\"\nsips -z 128 128   \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_128x128.png\"\nsips -z 256 256   \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_128x128@2x.png\"\nsips -z 256 256   \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_256x256.png\"\nsips -z 512 512   \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_256x256@2x.png\"\nsips -z 512 512   \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_512x512.png\"\ncp \"${SRCROOT}/macosx/sohIcon.png\" \"${SRCROOT}/macosx/soh.iconset/icon_512x512@2x.png\"\niconutil -c icns -o \"${SRCROOT}/macosx/soh.icns\" \"${SRCROOT}/macosx/soh.iconset\"\nrm -r \"${SRCROOT}/macosx/soh.iconset\"\n\nRESOURCE_PATH=$SRCROOT/ResourcesCopiedByRunScript\nBUILD_APP_DIR=${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}\n\ncp \"${SRCROOT}/macosx/soh.icns\" \"$BUILD_APP_DIR/soh.icns\"\n";
 		};
-		9B41FEE3288181EF00F03590 /* Generate Icon File */ = {
+		9B41FEEA2881870D00F03590 /* Generate OTR & Assets */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 12;
+			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"$(SRCROOT)/macosx/sohIcon.png",
 			);
-			name = "Generate Icon File";
+			name = "Generate OTR & Assets";
 			outputFileListPaths = (
+				"$(SRCROOT)/macosx/otr-outputs.xcfilelist",
 			);
 			outputPaths = (
-				"$(SRCROOT)/macosx/soh.icns",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/zsh;
-			shellScript = "#!/bin/zsh\n\nrm -rf \"${SRCROOT}/macosx/soh.iconset\"\nmkdir \"${SRCROOT}/macosx/soh.iconset\"\nsips -z 16 16     \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_16x16.png\"\nsips -z 32 32     \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_16x16@2x.png\"\nsips -z 32 32     \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_32x32.png\"\nsips -z 64 64     \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_32x32@2x.png\"\nsips -z 128 128   \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_128x128.png\"\nsips -z 256 256   \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_128x128@2x.png\"\nsips -z 256 256   \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_256x256.png\"\nsips -z 512 512   \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_256x256@2x.png\"\nsips -z 512 512   \"${SRCROOT}/macosx/sohIcon.png\" --out \"${SRCROOT}/macosx/soh.iconset/icon_512x512.png\"\ncp \"${SRCROOT}/macosx/sohIcon.png\" \"${SRCROOT}/macosx/soh.iconset/icon_512x512@2x.png\"\niconutil -c icns -o \"${SRCROOT}/macosx/soh.icns\" \"${SRCROOT}/macosx/soh.iconset\"\nrm -r \"${SRCROOT}/macosx/soh.iconset\"\n\nRESOURCE_PATH=$SRCROOT/ResourcesCopiedByRunScript\nBUILD_APP_DIR=${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}\n\ncp \"${SRCROOT}/macosx/soh.icns\" \"$BUILD_APP_DIR/soh.icns\"\n";
+			shellScript = "#!/bin/zsh\n\nif [ -f ~/.zprofile ]; then \n    . ~/.zprofile;\nfi\n\nexport CC=clang\nexport CXX=clang++\n\ncd ../OTRExporter && python3 extract_baserom.py\nmake -C ../OTRExporter/OTRExporter -j$(sysctl -n hw.physicalcpu) DEBUG=0 OPTFLAGS=-O2\nmake -C ../ZAPDTR -j$(sysctl -n hw.physicalcpu)\nrm -rf ../OTRExporter/oot.otr\ncd ../OTRExporter && python3 extract_assets.py\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -6563,9 +6585,14 @@
 		};
 		9B41FED82880DC1100F03590 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 9B41FED22880D70C00F03590 /* env */;
+			target = 9B41FED22880D70C00F03590 /* setup */;
 			targetProxy = 9B41FED72880DC1100F03590 /* PBXContainerItemProxy */;
 		};
+		9B41FEEE288187AA00F03590 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 9B41FEE62881870600F03590 /* otr */;
+			targetProxy = 9B41FEED288187AA00F03590 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
@@ -6908,6 +6935,22 @@
 			};
 			name = Release;
 		};
+		9B41FEE82881870600F03590 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		9B41FEE92881870600F03590 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
 		B3F66EEB9E154F53A540FD34 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -7065,7 +7108,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
-		9B41FED52880D70D00F03590 /* Build configuration list for PBXAggregateTarget "env" */ = {
+		9B41FED52880D70D00F03590 /* Build configuration list for PBXAggregateTarget "setup" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				9B41FED32880D70D00F03590 /* Debug */,
@@ -7074,6 +7117,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
+		9B41FEE72881870600F03590 /* Build configuration list for PBXAggregateTarget "otr" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				9B41FEE82881870600F03590 /* Debug */,
+				9B41FEE92881870600F03590 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
 		C137275036AF40DFB4152797 /* Build configuration list for PBXProject "soh" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (