diff --git a/firmware/67percent/.settings/language.settings.xml b/firmware/67percent/.settings/language.settings.xml
index 500b64f7..d44b3ac7 100644
--- a/firmware/67percent/.settings/language.settings.xml
+++ b/firmware/67percent/.settings/language.settings.xml
@@ -5,7 +5,11 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+<<<<<<< Updated upstream
 			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1283202245434077339" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+=======
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1051084377392111957" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+>>>>>>> Stashed changes
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +20,11 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+<<<<<<< Updated upstream
 			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1283202245434077339" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+=======
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1051084377392111957" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+>>>>>>> Stashed changes
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/hardware/3d models/67 percent/67FullCaseAssembly.SLDASM b/hardware/3d models/67 percent/67FullCaseAssembly.SLDASM
index fe4a47c2..87a29a6d 100644
Binary files a/hardware/3d models/67 percent/67FullCaseAssembly.SLDASM and b/hardware/3d models/67 percent/67FullCaseAssembly.SLDASM differ
diff --git a/hardware/3d models/67 percent/67PhoCaseBottomLeft.SLDPRT b/hardware/3d models/67 percent/67PhoCaseBottomLeft.SLDPRT
index 3c26ae96..b9a5a83a 100644
Binary files a/hardware/3d models/67 percent/67PhoCaseBottomLeft.SLDPRT and b/hardware/3d models/67 percent/67PhoCaseBottomLeft.SLDPRT differ
diff --git a/hardware/3d models/67 percent/67PhoCaseBottomRIght.SLDPRT b/hardware/3d models/67 percent/67PhoCaseBottomRIght.SLDPRT
index 677051dd..1c1f59a8 100644
Binary files a/hardware/3d models/67 percent/67PhoCaseBottomRIght.SLDPRT and b/hardware/3d models/67 percent/67PhoCaseBottomRIght.SLDPRT differ
diff --git a/hardware/3d models/67 percent/67PhoCaseTOP.SLDPRT b/hardware/3d models/67 percent/67PhoCaseTOP.SLDPRT
index 207f19a0..19780385 100644
Binary files a/hardware/3d models/67 percent/67PhoCaseTOP.SLDPRT and b/hardware/3d models/67 percent/67PhoCaseTOP.SLDPRT differ
diff --git a/hardware/3d models/67 percent/67PhoMXPlate.SLDPRT b/hardware/3d models/67 percent/67PhoMXPlate.SLDPRT
index a6edc253..0b50dab2 100644
Binary files a/hardware/3d models/67 percent/67PhoMXPlate.SLDPRT and b/hardware/3d models/67 percent/67PhoMXPlate.SLDPRT differ
diff --git a/hardware/3d models/67 percent/AssemblyPho_plateNLeftNRight.SLDASM b/hardware/3d models/67 percent/AssemblyPho_plateNLeftNRight.SLDASM
index 558252bd..69abf432 100644
Binary files a/hardware/3d models/67 percent/AssemblyPho_plateNLeftNRight.SLDASM and b/hardware/3d models/67 percent/AssemblyPho_plateNLeftNRight.SLDASM differ
diff --git a/hardware/3d models/67 percent/FINALPRINT/3.TOPRIGHT.stl b/hardware/3d models/67 percent/FINALPRINT/3.TOPRIGHT.stl
new file mode 100644
index 00000000..d66276de
Binary files /dev/null and b/hardware/3d models/67 percent/FINALPRINT/3.TOPRIGHT.stl differ
diff --git a/hardware/3d models/67 percent/FINALPRINT/4.TOPLEFT.stl b/hardware/3d models/67 percent/FINALPRINT/4.TOPLEFT.stl
new file mode 100644
index 00000000..d670a238
Binary files /dev/null and b/hardware/3d models/67 percent/FINALPRINT/4.TOPLEFT.stl differ
diff --git a/hardware/3d models/67 percent/FINALPRINT/5.PLATELEFT.stl b/hardware/3d models/67 percent/FINALPRINT/5.PLATELEFT.stl
new file mode 100644
index 00000000..73b6e603
Binary files /dev/null and b/hardware/3d models/67 percent/FINALPRINT/5.PLATELEFT.stl differ
diff --git a/hardware/3d models/67 percent/FINALPRINT/6.PLATERIGHT.stl b/hardware/3d models/67 percent/FINALPRINT/6.PLATERIGHT.stl
new file mode 100644
index 00000000..32929b08
Binary files /dev/null and b/hardware/3d models/67 percent/FINALPRINT/6.PLATERIGHT.stl differ
diff --git a/hardware/3d models/67 percent/FINALPRINT/67PhoCaseBottomLeft.STL b/hardware/3d models/67 percent/FINALPRINT/67PhoCaseBottomLeft.STL
new file mode 100644
index 00000000..8ded6fa5
Binary files /dev/null and b/hardware/3d models/67 percent/FINALPRINT/67PhoCaseBottomLeft.STL differ
diff --git a/hardware/3d models/67 percent/FINALPRINT/67PhoCaseBottomRight.STL b/hardware/3d models/67 percent/FINALPRINT/67PhoCaseBottomRight.STL
new file mode 100644
index 00000000..5000349c
Binary files /dev/null and b/hardware/3d models/67 percent/FINALPRINT/67PhoCaseBottomRight.STL differ
diff --git a/hardware/3d models/67 percent/FINALPRINT/67PhoCaseTopLEFT.STL b/hardware/3d models/67 percent/FINALPRINT/67PhoCaseTopLEFT.STL
new file mode 100644
index 00000000..24a18772
Binary files /dev/null and b/hardware/3d models/67 percent/FINALPRINT/67PhoCaseTopLEFT.STL differ
diff --git a/hardware/3d models/67 percent/FINALPRINT/67PhoCaseTopRIGHT.STL b/hardware/3d models/67 percent/FINALPRINT/67PhoCaseTopRIGHT.STL
new file mode 100644
index 00000000..c799a077
Binary files /dev/null and b/hardware/3d models/67 percent/FINALPRINT/67PhoCaseTopRIGHT.STL differ
diff --git a/hardware/3d models/67 percent/FINALPRINT/67PhoMXPlateLEFT.STL b/hardware/3d models/67 percent/FINALPRINT/67PhoMXPlateLEFT.STL
new file mode 100644
index 00000000..8e45250b
Binary files /dev/null and b/hardware/3d models/67 percent/FINALPRINT/67PhoMXPlateLEFT.STL differ
diff --git a/hardware/3d models/67 percent/FINALPRINT/67PhoMXPlateRIGHT.STL b/hardware/3d models/67 percent/FINALPRINT/67PhoMXPlateRIGHT.STL
new file mode 100644
index 00000000..1dfc98b5
Binary files /dev/null and b/hardware/3d models/67 percent/FINALPRINT/67PhoMXPlateRIGHT.STL differ