diff --git a/MealEngine.xcodeproj/project.pbxproj b/MealEngine.xcodeproj/project.pbxproj
old mode 100755
new mode 100644
index 194ed66..b24a226
--- a/MealEngine.xcodeproj/project.pbxproj
+++ b/MealEngine.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		27358AEC2FA42D7300550B69 /* OnboardingSurveyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27358AEB2FA42D7200550B69 /* OnboardingSurveyView.swift */; };
+		27358AEE2FA43F5200550B69 /* DietaryProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27358AED2FA43F5200550B69 /* DietaryProfile.swift */; };
 		3146CE4A2F9270DE00DF0229 /* MealEngineApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3146CE492F9270DE00DF0229 /* MealEngineApp.swift */; };
 		3146CE4B2F92881800DF0229 /* StorageService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3146CE482F926F5200DF0229 /* StorageService.swift */; };
 		3146CE4D2F92953D00DF0229 /* APIClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3146CE4C2F92953D00DF0229 /* APIClient.swift */; };
@@ -37,7 +39,7 @@
 		319E40892F8C830400F01504 /* OpenFoodFacts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 319E40552F8C830400F01504 /* OpenFoodFacts.swift */; };
 		319E408D2F8C838900F01504 /* MealEngineUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 319E408A2F8C838900F01504 /* MealEngineUITests.swift */; };
 		319E408E2F8C838900F01504 /* MealEngineUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 319E408B2F8C838900F01504 /* MealEngineUITestsLaunchTests.swift */; };
-		319E40902F8C9B5500F01504 /* TDEECalculatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 319E408F2F8C9B5500F01504 /* TDEECalculatorView.swift */; };
+		319E40902F8C9B5500F01504 /* TDEECalculatorView .swift in Sources */ = {isa = PBXBuildFile; fileRef = 319E408F2F8C9B5500F01504 /* TDEECalculatorView .swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -58,6 +60,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		27358AEB2FA42D7200550B69 /* OnboardingSurveyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingSurveyView.swift; sourceTree = "<group>"; };
+		27358AED2FA43F5200550B69 /* DietaryProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DietaryProfile.swift; sourceTree = "<group>"; };
 		3146CE482F926F5200DF0229 /* StorageService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageService.swift; sourceTree = "<group>"; };
 		3146CE492F9270DE00DF0229 /* MealEngineApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MealEngineApp.swift; sourceTree = "<group>"; };
 		3146CE4C2F92953D00DF0229 /* APIClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIClient.swift; sourceTree = "<group>"; };
@@ -88,7 +92,7 @@
 		319E406F2F8C830400F01504 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
 		319E408A2F8C838900F01504 /* MealEngineUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MealEngineUITests.swift; sourceTree = "<group>"; };
 		319E408B2F8C838900F01504 /* MealEngineUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MealEngineUITestsLaunchTests.swift; sourceTree = "<group>"; };
-		319E408F2F8C9B5500F01504 /* TDEECalculatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TDEECalculatorView.swift; sourceTree = "<group>"; };
+		319E408F2F8C9B5500F01504 /* TDEECalculatorView .swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TDEECalculatorView .swift"; sourceTree = "<group>"; };
 		D508F8582E77468B00DE5B95 /* MealEngine.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MealEngine.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D508F8652E77468D00DE5B95 /* MealEngineTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MealEngineTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		D508F86F2E77468D00DE5B95 /* MealEngineUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MealEngineUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -158,6 +162,7 @@
 		319E40572F8C830400F01504 /* Models */ = {
 			isa = PBXGroup;
 			children = (
+				27358AED2FA43F5200550B69 /* DietaryProfile.swift */,
 				319E40512F8C830400F01504 /* Food.swift */,
 				319E40522F8C830400F01504 /* Goals.swift */,
 				319E40532F8C830400F01504 /* Meal.swift */,
@@ -240,7 +245,6 @@
 			isa = PBXGroup;
 			children = (
 				319E40692F8C830400F01504 /* MainView.swift */,
-				319E408F2F8C9B5500F01504 /* TDEECalculatorView.swift */,
 			);
 			path = Navigation;
 			sourceTree = "<group>";
@@ -248,6 +252,8 @@
 		319E40702F8C830400F01504 /* Screens */ = {
 			isa = PBXGroup;
 			children = (
+				319E408F2F8C9B5500F01504 /* TDEECalculatorView .swift */,
+				27358AEB2FA42D7200550B69 /* OnboardingSurveyView.swift */,
 				319E406B2F8C830400F01504 /* DailyGoalsView.swift */,
 				319E406C2F8C830400F01504 /* DayDetailView.swift */,
 				319E406D2F8C830400F01504 /* HistoryView.swift */,
@@ -449,15 +455,17 @@
 				3146CFEA2F9BEB7900DF0229 /* OpenFoodFactsModels.swift in Sources */,
 				3146CE4D2F92953D00DF0229 /* APIClient.swift in Sources */,
 				319E40782F8C830400F01504 /* Goals.swift in Sources */,
-				319E40902F8C9B5500F01504 /* TDEECalculatorView.swift in Sources */,
+				319E40902F8C9B5500F01504 /* TDEECalculatorView .swift in Sources */,
 				319E40792F8C830400F01504 /* CalendarViewModel.swift in Sources */,
 				319E407A2F8C830400F01504 /* Food.swift in Sources */,
+				27358AEE2FA43F5200550B69 /* DietaryProfile.swift in Sources */,
 				319E407B2F8C830400F01504 /* PlannerView.swift in Sources */,
 				319E407C2F8C830400F01504 /* GoalsViewModel.swift in Sources */,
 				3146CE4A2F9270DE00DF0229 /* MealEngineApp.swift in Sources */,
 				3146CFE62F9BE1B200DF0229 /* Secrets.swift in Sources */,
 				319E407D2F8C830400F01504 /* TrackedDay.swift in Sources */,
 				319E407E2F8C830400F01504 /* MealPlannerViewModel.swift in Sources */,
+				27358AEC2FA42D7300550B69 /* OnboardingSurveyView.swift in Sources */,
 				319E407F2F8C830400F01504 /* Meal.swift in Sources */,
 				3146CE4B2F92881800DF0229 /* StorageService.swift in Sources */,
 				319E40802F8C830400F01504 /* AppState.swift in Sources */,
diff --git a/MealEngine.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/MealEngine.xcodeproj/project.xcworkspace/contents.xcworkspacedata
old mode 100755
new mode 100644
diff --git a/MealEngine.xcodeproj/xcuserdata/csuftitan.xcuserdatad/xcschemes/xcschememanagement.plist b/MealEngine.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
similarity index 50%
rename from MealEngine.xcodeproj/xcuserdata/csuftitan.xcuserdatad/xcschemes/xcschememanagement.plist
rename to MealEngine.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
index b2db2ae..0c67376 100644
--- a/MealEngine.xcodeproj/xcuserdata/csuftitan.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/MealEngine.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>OptiMeal.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
+<dict/>
 </plist>
diff --git a/MealEngine.xcodeproj/xcshareddata/xcschemes/MealEngine.xcscheme b/MealEngine.xcodeproj/xcshareddata/xcschemes/MealEngine.xcscheme
new file mode 100644
index 0000000..2623c9b
--- /dev/null
+++ b/MealEngine.xcodeproj/xcshareddata/xcschemes/MealEngine.xcscheme
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2630"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D508F8572E77468B00DE5B95"
+               BuildableName = "MealEngine.app"
+               BlueprintName = "MealEngine"
+               ReferencedContainer = "container:MealEngine.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D508F8642E77468D00DE5B95"
+               BuildableName = "MealEngineTests.xctest"
+               BlueprintName = "MealEngineTests"
+               ReferencedContainer = "container:MealEngine.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D508F86E2E77468D00DE5B95"
+               BuildableName = "MealEngineUITests.xctest"
+               BlueprintName = "MealEngineUITests"
+               ReferencedContainer = "container:MealEngine.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D508F8572E77468B00DE5B95"
+            BuildableName = "MealEngine.app"
+            BlueprintName = "MealEngine"
+            ReferencedContainer = "container:MealEngine.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D508F8572E77468B00DE5B95"
+            BuildableName = "MealEngine.app"
+            BlueprintName = "MealEngine"
+            ReferencedContainer = "container:MealEngine.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/MealEngine.xcodeproj/xcuserdata/guestuser.xcuserdatad/xcschemes/xcschememanagement.plist b/MealEngine.xcodeproj/xcuserdata/guestuser.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index 11617fb..0000000
--- a/MealEngine.xcodeproj/xcuserdata/guestuser.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>MealEngine.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-		<key>OptiMeal.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/MealEngine.xcodeproj/xcuserdata/stephenanaba.xcuserdatad/xcschemes/xcschememanagement.plist b/MealEngine.xcodeproj/xcuserdata/stephenanaba.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100755
index b2db2ae..0000000
--- a/MealEngine.xcodeproj/xcuserdata/stephenanaba.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>OptiMeal.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>