diff --git a/app/newHere1/newHere.xcodeproj/project.pbxproj b/app/newHere1/newHere.xcodeproj/project.pbxproj
index cdbb8dc..98a0be9 100644
--- a/app/newHere1/newHere.xcodeproj/project.pbxproj
+++ b/app/newHere1/newHere.xcodeproj/project.pbxproj
@@ -29,6 +29,8 @@
 		7194CFD42B2153D30094BE56 /* PhotoLibraryManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7194CFD32B2153D30094BE56 /* PhotoLibraryManager.swift */; };
 		7194CFD62B2153DA0094BE56 /* ScreenshotUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7194CFD52B2153DA0094BE56 /* ScreenshotUtility.swift */; };
 		7194CFDC2B2154740094BE56 /* ShareSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7194CFDB2B2154740094BE56 /* ShareSheet.swift */; };
+		7194CFE42B2367AA0094BE56 /* UserProfileViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7194CFE32B2367AA0094BE56 /* UserProfileViewModel.swift */; };
+		7194CFE62B2367BE0094BE56 /* EditProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7194CFE52B2367BE0094BE56 /* EditProfile.swift */; };
 		71D79DA22B1570E4009A054C /* BubbleAnimation.atlas in Resources */ = {isa = PBXBuildFile; fileRef = 71D79DA12B1570E4009A054C /* BubbleAnimation.atlas */; };
 		FE32AC982B159A650056B003 /* PostTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE32AC972B159A650056B003 /* PostTest.swift */; };
 		FE32AC9A2B159A9E0056B003 /* MockMessageState.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE32AC992B159A9E0056B003 /* MockMessageState.swift */; };
@@ -89,6 +91,8 @@
 		7194CFD32B2153D30094BE56 /* PhotoLibraryManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoLibraryManager.swift; sourceTree = "<group>"; };
 		7194CFD52B2153DA0094BE56 /* ScreenshotUtility.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScreenshotUtility.swift; sourceTree = "<group>"; };
 		7194CFDB2B2154740094BE56 /* ShareSheet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareSheet.swift; sourceTree = "<group>"; };
+		7194CFE32B2367AA0094BE56 /* UserProfileViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserProfileViewModel.swift; sourceTree = "<group>"; };
+		7194CFE52B2367BE0094BE56 /* EditProfile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditProfile.swift; sourceTree = "<group>"; };
 		71D79DA12B1570E4009A054C /* BubbleAnimation.atlas */ = {isa = PBXFileReference; lastKnownFileType = folder.skatlas; path = BubbleAnimation.atlas; sourceTree = "<group>"; };
 		FE32AC972B159A650056B003 /* PostTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PostTest.swift; path = newHereTests/PostTest.swift; sourceTree = SOURCE_ROOT; };
 		FE32AC992B159A9E0056B003 /* MockMessageState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockMessageState.swift; sourceTree = "<group>"; };
@@ -217,6 +221,7 @@
 		71D79DA52B15758E009A054C /* Profile */ = {
 			isa = PBXGroup;
 			children = (
+				7194CFE52B2367BE0094BE56 /* EditProfile.swift */,
 				1531A90A2AED964A009F644E /* Profile.swift */,
 			);
 			path = Profile;
@@ -293,6 +298,7 @@
 		71D79DAD2B1578F5009A054C /* Models */ = {
 			isa = PBXGroup;
 			children = (
+				7194CFE32B2367AA0094BE56 /* UserProfileViewModel.swift */,
 				1531A9122AEDAE2A009F644E /* LocationDataManager.swift */,
 			);
 			path = Models;
@@ -478,12 +484,14 @@
 				1531A90D2AED9663009F644E /* Messages.swift in Sources */,
 				158392302AFC72D3007A53C7 /* CustomARViewRepresentable.swift in Sources */,
 				7194CFD42B2153D30094BE56 /* PhotoLibraryManager.swift in Sources */,
+				7194CFE62B2367BE0094BE56 /* EditProfile.swift in Sources */,
 				1531A90F2AED9917009F644E /* Post.swift in Sources */,
 				1531A9152AEDCADB009F644E /* Message.swift in Sources */,
 				1531A9092AED9618009F644E /* Home.swift in Sources */,
 				158392332AFC72F3007A53C7 /* LoginView.swift in Sources */,
 				158392312AFC72D3007A53C7 /* CustomARView.swift in Sources */,
 				1531A8DE2AED95FD009F644E /* newHereApp.swift in Sources */,
+				7194CFE42B2367AA0094BE56 /* UserProfileViewModel.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -668,7 +676,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"newHere/Preview Content\"";
-				DEVELOPMENT_TEAM = A7X36A78B2;
+				DEVELOPMENT_TEAM = W23Y365YR7;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -713,7 +721,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"newHere/Preview Content\"";
-				DEVELOPMENT_TEAM = A7X36A78B2;
+				DEVELOPMENT_TEAM = W23Y365YR7;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
diff --git a/app/newHere1/newHere/Assets.xcassets/AccentColor.colorset/Contents.json b/app/newHere1/newHere/Assets.xcassets/AccentColor.colorset/Contents.json
index eb87897..97650a1 100644
--- a/app/newHere1/newHere/Assets.xcassets/AccentColor.colorset/Contents.json
+++ b/app/newHere1/newHere/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -1,6 +1,15 @@
 {
   "colors" : [
     {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
       "idiom" : "universal"
     }
   ],
diff --git a/app/newHere1/newHere/Assets.xcassets/Color.colorset/Contents.json b/app/newHere1/newHere/Assets.xcassets/Color.colorset/Contents.json
new file mode 100644
index 0000000..88fe200
--- /dev/null
+++ b/app/newHere1/newHere/Assets.xcassets/Color.colorset/Contents.json
@@ -0,0 +1,29 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final000.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final000.png
new file mode 100755
index 0000000..71d186d
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final000.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0000.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0000.png
deleted file mode 100755
index aacc160..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0000.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0001.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0001.png
deleted file mode 100755
index 6a12213..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0001.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0002.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0002.png
deleted file mode 100755
index e691291..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0002.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0003.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0003.png
deleted file mode 100755
index 71af753..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0003.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0004.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0004.png
deleted file mode 100755
index fd2cc99..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0004.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0005.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0005.png
deleted file mode 100755
index 0f4a20c..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0005.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0006.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0006.png
deleted file mode 100755
index 8041b64..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0006.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0007.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0007.png
deleted file mode 100755
index 18d3387..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0007.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0008.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0008.png
deleted file mode 100755
index c56adfc..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0008.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0009.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0009.png
deleted file mode 100755
index eaa4570..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0009.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final001.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final001.png
new file mode 100755
index 0000000..cb41944
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final001.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0010.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0010.png
deleted file mode 100755
index aa9677c..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0010.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0011.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0011.png
deleted file mode 100755
index 44e0b19..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0011.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0012.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0012.png
deleted file mode 100755
index 584d5cf..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0012.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0013.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0013.png
deleted file mode 100755
index 9da5218..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0013.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0014.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0014.png
deleted file mode 100755
index 51ce610..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0014.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0015.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0015.png
deleted file mode 100755
index 8ab4d4c..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0015.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0016.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0016.png
deleted file mode 100755
index b016134..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0016.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0017.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0017.png
deleted file mode 100755
index 2d5007e..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0017.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0018.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0018.png
deleted file mode 100755
index f44cd94..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0018.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0019.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0019.png
deleted file mode 100755
index b8cf3e9..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0019.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final002.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final002.png
new file mode 100755
index 0000000..319c972
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final002.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0020.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0020.png
deleted file mode 100755
index b463667..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0020.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0021.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0021.png
deleted file mode 100755
index b9d9f8a..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0021.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0022.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0022.png
deleted file mode 100755
index d32bcdc..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0022.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0023.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0023.png
deleted file mode 100755
index f72df8c..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0023.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0024.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0024.png
deleted file mode 100755
index aa65e0e..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0024.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0025.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0025.png
deleted file mode 100755
index a21299f..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0025.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0026.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0026.png
deleted file mode 100755
index e70aa80..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0026.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0027.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0027.png
deleted file mode 100755
index 9209742..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0027.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0028.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0028.png
deleted file mode 100755
index 7918e69..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0028.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0029.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0029.png
deleted file mode 100755
index 74e9ea8..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0029.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final003.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final003.png
new file mode 100755
index 0000000..ec06018
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final003.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0030.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0030.png
deleted file mode 100755
index ce83752..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0030.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0031.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0031.png
deleted file mode 100755
index 0df2b7e..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0031.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0032.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0032.png
deleted file mode 100755
index 5839e82..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0032.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0033.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0033.png
deleted file mode 100755
index 585af30..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0033.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0034.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0034.png
deleted file mode 100755
index fd5b8ca..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0034.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0035.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0035.png
deleted file mode 100755
index 1b6c450..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0035.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0036.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0036.png
deleted file mode 100755
index 824bf7c..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0036.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0037.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0037.png
deleted file mode 100755
index 2bf63eb..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0037.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0038.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0038.png
deleted file mode 100755
index 5e34378..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0038.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0039.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0039.png
deleted file mode 100755
index b83b7ec..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0039.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final004.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final004.png
new file mode 100755
index 0000000..1ab609b
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final004.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0040.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0040.png
deleted file mode 100755
index 6076471..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0040.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0041.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0041.png
deleted file mode 100755
index a21f76a..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0041.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0042.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0042.png
deleted file mode 100755
index 5b50648..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0042.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0043.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0043.png
deleted file mode 100755
index 96006c7..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0043.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0044.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0044.png
deleted file mode 100755
index 49f2c41..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0044.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0045.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0045.png
deleted file mode 100755
index 6c92294..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0045.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0046.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0046.png
deleted file mode 100755
index b628011..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0046.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0047.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0047.png
deleted file mode 100755
index 912288f..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0047.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0048.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0048.png
deleted file mode 100755
index 908beff..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0048.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0049.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0049.png
deleted file mode 100755
index ca918ec..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0049.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final005.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final005.png
new file mode 100755
index 0000000..4d71807
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final005.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0050.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0050.png
deleted file mode 100755
index ad6f1c2..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0050.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0051.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0051.png
deleted file mode 100755
index 4819010..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0051.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0052.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0052.png
deleted file mode 100755
index b5a1d8b..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0052.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0053.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0053.png
deleted file mode 100755
index 4478857..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0053.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0054.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0054.png
deleted file mode 100755
index a2b9f7c..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0054.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0055.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0055.png
deleted file mode 100755
index 48e2563..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0055.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0056.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0056.png
deleted file mode 100755
index 028890a..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0056.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0057.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0057.png
deleted file mode 100755
index 9b7e96e..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0057.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0058.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0058.png
deleted file mode 100755
index 1502311..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0058.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0059.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0059.png
deleted file mode 100755
index e065014..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0059.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final006.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final006.png
new file mode 100755
index 0000000..2be6067
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final006.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0060.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0060.png
deleted file mode 100755
index f856245..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0060.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0061.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0061.png
deleted file mode 100755
index 276ba71..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0061.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0062.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0062.png
deleted file mode 100755
index 72d6b83..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0062.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0063.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0063.png
deleted file mode 100755
index 9006cd8..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0063.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0064.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0064.png
deleted file mode 100755
index e2cb678..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0064.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0065.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0065.png
deleted file mode 100755
index 0d26186..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0065.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0066.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0066.png
deleted file mode 100755
index 06984f3..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0066.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0067.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0067.png
deleted file mode 100755
index 811c596..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0067.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0068.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0068.png
deleted file mode 100755
index 0271f48..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0068.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0069.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0069.png
deleted file mode 100755
index e8f3c63..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0069.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final007.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final007.png
new file mode 100755
index 0000000..75c1b35
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final007.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0070.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0070.png
deleted file mode 100755
index 0bba6f6..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0070.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0071.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0071.png
deleted file mode 100755
index 22a6095..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0071.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0072.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0072.png
deleted file mode 100755
index 764d108..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0072.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0073.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0073.png
deleted file mode 100755
index 4e1b09c..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0073.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0074.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0074.png
deleted file mode 100755
index f3ded7f..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0074.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0075.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0075.png
deleted file mode 100755
index f29e3d8..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0075.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0076.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0076.png
deleted file mode 100755
index 8484e1f..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0076.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0077.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0077.png
deleted file mode 100755
index 110b911..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0077.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0078.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0078.png
deleted file mode 100755
index 7bc16c7..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0078.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0079.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0079.png
deleted file mode 100755
index 57fc0a2..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0079.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final008.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final008.png
new file mode 100755
index 0000000..2c3ee30
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final008.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0080.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0080.png
deleted file mode 100755
index 572f148..0000000
Binary files a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final0080.png and /dev/null differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final009.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final009.png
new file mode 100755
index 0000000..0e6048c
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final009.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final010.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final010.png
new file mode 100755
index 0000000..d78bb28
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final010.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final011.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final011.png
new file mode 100755
index 0000000..daefcdd
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final011.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final012.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final012.png
new file mode 100755
index 0000000..cdf55da
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final012.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final013.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final013.png
new file mode 100755
index 0000000..e396b08
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final013.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final014.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final014.png
new file mode 100755
index 0000000..56942fc
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final014.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final015.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final015.png
new file mode 100755
index 0000000..499a114
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final015.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final016.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final016.png
new file mode 100755
index 0000000..864dc35
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final016.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final017.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final017.png
new file mode 100755
index 0000000..238f07e
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final017.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final018.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final018.png
new file mode 100755
index 0000000..70aeaa5
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final018.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final019.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final019.png
new file mode 100755
index 0000000..92deff8
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final019.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final020.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final020.png
new file mode 100755
index 0000000..b372131
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final020.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final021.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final021.png
new file mode 100755
index 0000000..4ab86be
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final021.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final022.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final022.png
new file mode 100755
index 0000000..39c08fe
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final022.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final023.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final023.png
new file mode 100755
index 0000000..822d9f9
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final023.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final024.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final024.png
new file mode 100755
index 0000000..5e2cc4d
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final024.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final025.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final025.png
new file mode 100755
index 0000000..a61539e
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final025.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final026.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final026.png
new file mode 100755
index 0000000..ee976bc
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final026.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final027.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final027.png
new file mode 100755
index 0000000..5510846
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final027.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final028.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final028.png
new file mode 100755
index 0000000..21baab5
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final028.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final029.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final029.png
new file mode 100755
index 0000000..752373a
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final029.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final030.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final030.png
new file mode 100755
index 0000000..d1603ae
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final030.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final031.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final031.png
new file mode 100755
index 0000000..318cbd8
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final031.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final032.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final032.png
new file mode 100755
index 0000000..22b8754
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final032.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final033.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final033.png
new file mode 100755
index 0000000..079cdfd
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final033.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final034.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final034.png
new file mode 100755
index 0000000..13d174b
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final034.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final035.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final035.png
new file mode 100755
index 0000000..1142b39
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final035.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final036.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final036.png
new file mode 100755
index 0000000..eaa7400
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final036.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final037.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final037.png
new file mode 100755
index 0000000..b7e07e1
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final037.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final038.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final038.png
new file mode 100755
index 0000000..b5e8e3d
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final038.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final039.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final039.png
new file mode 100755
index 0000000..baf7309
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final039.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final040.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final040.png
new file mode 100755
index 0000000..cc70420
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final040.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final041.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final041.png
new file mode 100755
index 0000000..c424790
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final041.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final042.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final042.png
new file mode 100755
index 0000000..def22f4
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final042.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final043.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final043.png
new file mode 100755
index 0000000..21f75b6
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final043.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final044.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final044.png
new file mode 100755
index 0000000..7c6f83b
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final044.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final045.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final045.png
new file mode 100755
index 0000000..e66a912
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final045.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final046.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final046.png
new file mode 100755
index 0000000..0898bce
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final046.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final047.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final047.png
new file mode 100755
index 0000000..b650efa
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final047.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final048.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final048.png
new file mode 100755
index 0000000..2c1ca55
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final048.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final049.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final049.png
new file mode 100755
index 0000000..5bfe1ae
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final049.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final050.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final050.png
new file mode 100755
index 0000000..11e9774
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final050.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final051.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final051.png
new file mode 100755
index 0000000..e695a59
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final051.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final052.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final052.png
new file mode 100755
index 0000000..198be93
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final052.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final053.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final053.png
new file mode 100755
index 0000000..9ab9ced
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final053.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final054.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final054.png
new file mode 100755
index 0000000..00c2486
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final054.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final055.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final055.png
new file mode 100755
index 0000000..17756f8
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final055.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final056.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final056.png
new file mode 100755
index 0000000..6da1d9a
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final056.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final057.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final057.png
new file mode 100755
index 0000000..a158290
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final057.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final058.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final058.png
new file mode 100755
index 0000000..cafdba8
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final058.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final059.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final059.png
new file mode 100755
index 0000000..c7a8fea
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final059.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final060.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final060.png
new file mode 100755
index 0000000..6387f33
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final060.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final061.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final061.png
new file mode 100755
index 0000000..726e060
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final061.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final062.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final062.png
new file mode 100755
index 0000000..1d5b34e
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final062.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final063.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final063.png
new file mode 100755
index 0000000..eff07d5
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final063.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final064.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final064.png
new file mode 100755
index 0000000..8722ee7
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final064.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final065.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final065.png
new file mode 100755
index 0000000..5a8a72e
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final065.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final066.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final066.png
new file mode 100755
index 0000000..797c9a9
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final066.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final067.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final067.png
new file mode 100755
index 0000000..874ca7c
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final067.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final068.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final068.png
new file mode 100755
index 0000000..23f0c94
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final068.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final069.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final069.png
new file mode 100755
index 0000000..a442e96
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final069.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final070.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final070.png
new file mode 100755
index 0000000..b570d81
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final070.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final071.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final071.png
new file mode 100755
index 0000000..ceba8d5
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final071.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final072.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final072.png
new file mode 100755
index 0000000..08f4876
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final072.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final073.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final073.png
new file mode 100755
index 0000000..c387daa
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final073.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final074.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final074.png
new file mode 100755
index 0000000..cfa0d36
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final074.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final075.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final075.png
new file mode 100755
index 0000000..3a2a7dd
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final075.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final076.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final076.png
new file mode 100755
index 0000000..d74b05b
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final076.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final077.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final077.png
new file mode 100755
index 0000000..97d8d1f
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final077.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final078.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final078.png
new file mode 100755
index 0000000..ceeb478
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final078.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final079.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final079.png
new file mode 100755
index 0000000..81d1366
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final079.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final080.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final080.png
new file mode 100755
index 0000000..eb2a9ae
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final080.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final081.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final081.png
new file mode 100755
index 0000000..98ad642
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final081.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final082.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final082.png
new file mode 100755
index 0000000..b5b9aa4
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final082.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final083.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final083.png
new file mode 100755
index 0000000..9bd778c
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final083.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final084.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final084.png
new file mode 100755
index 0000000..2f28cb0
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final084.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final085.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final085.png
new file mode 100755
index 0000000..73fedd8
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final085.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final086.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final086.png
new file mode 100755
index 0000000..0f3fc91
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final086.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final087.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final087.png
new file mode 100755
index 0000000..466544c
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final087.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final088.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final088.png
new file mode 100755
index 0000000..6b50ee9
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final088.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final089.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final089.png
new file mode 100755
index 0000000..503936a
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final089.png differ
diff --git a/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final090.png b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final090.png
new file mode 100755
index 0000000..be586da
Binary files /dev/null and b/app/newHere1/newHere/BubbleAnimation.atlas/bubble-final090.png differ
diff --git a/app/newHere1/newHere/Models/UserProfileViewModel.swift b/app/newHere1/newHere/Models/UserProfileViewModel.swift
new file mode 100644
index 0000000..2cf977e
--- /dev/null
+++ b/app/newHere1/newHere/Models/UserProfileViewModel.swift
@@ -0,0 +1,18 @@
+//
+//  UserProfileViewModel.swift
+//  newHere
+//
+//  Created by YIMING GUAN on 2023/12/7.
+//
+
+import Foundation
+import SwiftUI
+
+class UserProfileViewModel: ObservableObject {
+    @Published var username: String = userName
+    @Published var email: String = userEmail
+    @Published var profileImage: UIImage? = nil
+    // Add other profile properties here
+
+    // Implement methods to update these properties, for example, from an API
+}
diff --git a/app/newHere1/newHere/Utils/api_call.swift b/app/newHere1/newHere/Utils/api_call.swift
index ef89411..7636c2b 100644
--- a/app/newHere1/newHere/Utils/api_call.swift
+++ b/app/newHere1/newHere/Utils/api_call.swift
@@ -48,6 +48,13 @@ struct MessageResponse: Codable {
     let location: GeoJSONPoint
 }
 
+//// Structure for updating user profile
+struct UpdateProfileRequest: Codable {
+    let userName: String?
+    let email: String?
+    let avatar: String? // Assuming avatar is a string (URL or base64 encoded image)
+}
+
 //// Structure for response of adding a friend
 struct AddFriendResponse: Codable {
     let message: String
@@ -74,6 +81,46 @@ struct UserMessage: Codable {
     let replies: [String]
 }
 
+//// api call to update user profile
+func updateUserProfile(userId: String, userName: String?, email: String?, avatar: String?, completion: @escaping (Result<Bool, Error>) -> Void) {
+    let urlString = "https://here-swe.vercel.app/user/\(userId)/update-profile" // Adjust URL as needed
+
+    guard let url = URL(string: urlString) else {
+        completion(.failure(URLError(.badURL)))
+        return
+    }
+
+    var request = URLRequest(url: url)
+    request.httpMethod = "PUT"
+    request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+    request.addValue(apiKey, forHTTPHeaderField: "X-API-Key")
+
+    let requestBody = UpdateProfileRequest(userName: userName, email: email, avatar: avatar)
+    do {
+        request.httpBody = try JSONEncoder().encode(requestBody)
+    } catch {
+        completion(.failure(error))
+        return
+    }
+
+    let task = URLSession.shared.dataTask(with: request) { data, response, error in
+        if let error = error {
+            completion(.failure(error))
+            return
+        }
+
+        guard let httpResponse = response as? HTTPURLResponse, (200...299).contains(httpResponse.statusCode) else {
+            completion(.failure(URLError(.badServerResponse)))
+            return
+        }
+
+        completion(.success(true))
+    }
+
+    task.resume()
+}
+
+
 //// Function to fetch user messages
 func getUserMessages(userId: String, completion: @escaping (Result<[MessageResponse], Error>) -> Void) {
     // API URL
@@ -474,6 +521,8 @@ func updateMetrics(completion: @escaping (Result<Bool, Error>) -> Void) {
     
     task.resume()
 }
+
+
 //getAllUserFriends(userId: <#T##String#>, completion: <#T##(Result<[String : String], Error>) -> Void#>) { friendsList in
 //    guard let friendsList = friendsList else {
 //        print("Failed to fetch friends list.")
diff --git a/app/newHere1/newHere/Views/ARView/CustomARViewRepresentable.swift b/app/newHere1/newHere/Views/ARView/CustomARViewRepresentable.swift
index 4f38eca..e57ea7e 100644
--- a/app/newHere1/newHere/Views/ARView/CustomARViewRepresentable.swift
+++ b/app/newHere1/newHere/Views/ARView/CustomARViewRepresentable.swift
@@ -188,7 +188,7 @@ struct CustomARViewRepresentable: UIViewRepresentable {
         textureAtlas.textureNames.forEach { print($0) } // Print each texture name
 
         for i in 0..<numImages {
-            let textureName = "bubble-final\(String(format: "%04d", i))"
+            let textureName = "bubble-final\(String(format: "%03d", i))"
             let texture = textureAtlas.textureNamed(textureName)
             frames.append(texture)
         }
diff --git a/app/newHere1/newHere/Views/Home/Home.swift b/app/newHere1/newHere/Views/Home/Home.swift
index 6699cd1..8b45d8d 100644
--- a/app/newHere1/newHere/Views/Home/Home.swift
+++ b/app/newHere1/newHere/Views/Home/Home.swift
@@ -65,7 +65,7 @@ struct HomePageView: View {
                     HStack(alignment: .bottom, spacing: 28.0) {
                         Button(action: {updateARState.updateTrue = true})
                         {
-                            Image(systemName: "map")
+                            Image(systemName: "arrow.clockwise")
                                 .foregroundColor(.white)
                         }
                         
diff --git a/app/newHere1/newHere/Views/Login/LoginView.swift b/app/newHere1/newHere/Views/Login/LoginView.swift
index 77de485..4ba709b 100644
--- a/app/newHere1/newHere/Views/Login/LoginView.swift
+++ b/app/newHere1/newHere/Views/Login/LoginView.swift
@@ -6,7 +6,7 @@ let logApiKey = "qe5YT6jOgiA422_UcdbmVxxG1Z6G48aHV7fSV4TbAPs"
 
 let userId = UserDefaults.standard.string(forKey: "UserId") ?? ""
 let userName = UserDefaults.standard.string(forKey: "UserName") ?? ""
-
+let userEmail = UserDefaults.standard.string(forKey: "UserEmail") ?? ""
 
 /**
  * LoginView
@@ -159,6 +159,11 @@ struct LoginView: View {
                                             // Store the extracted username in UserDefaults.
                                             UserDefaults.standard.set(userName, forKey: "UserName")
                                         }
+                                        if let email = json["email"] as? String {
+                                            print("Email:\(email)")
+                                            // Store the extracted username in UserDefaults.
+                                            UserDefaults.standard.set(email, forKey: "UserEmail")
+                                        }
                                     }
                                 } catch {
                                     // If JSON parsing fails, print an error message.
diff --git a/app/newHere1/newHere/Views/Profile/EditProfile.swift b/app/newHere1/newHere/Views/Profile/EditProfile.swift
new file mode 100644
index 0000000..b165f6a
--- /dev/null
+++ b/app/newHere1/newHere/Views/Profile/EditProfile.swift
@@ -0,0 +1,155 @@
+//
+//  EditProfile.swift
+//  newHere
+//
+//  Created by TRACY LI on 2023/12/7.
+//
+
+import SwiftUI
+
+struct EditProfile: View {
+    @Binding var isPresented: Bool
+    @ObservedObject var viewModel: UserProfileViewModel
+    @State private var image: Image? = Image(systemName: "person.crop.circle.fill")
+    @State private var isShowingImagePicker = false
+    @State private var inputImage: UIImage?
+    @State private var username: String = ""
+    @State private var email: String = ""
+
+    var body: some View {
+        VStack {
+            // Top bar with close button
+            HStack {
+                Spacer()
+                Button(action: {
+                    isPresented.toggle()
+                }) {
+                    Image(systemName: "xmark.circle")
+                        .font(.system(size: 28))
+                        .foregroundColor(.white)
+                        .shadow(radius: 2.0)
+                }
+                .padding(.trailing, 20)
+            }
+            .padding(.vertical, 8)
+
+            // Edit Profile: Avatar photo, Name, Bio
+            VStack(alignment: .leading) {
+                // User Avatar
+                Button(action: {
+                    self.isShowingImagePicker = true
+                }) {
+                    VStack {
+                        image?
+                            .resizable()
+                            .scaledToFill()
+                            .clipShape(Circle())
+                            .frame(width: 100, height: 100)
+                            .shadow(radius: 3)
+                            .foregroundColor(Color.white)
+
+                        Text("Edit Profile Picture")
+                            .foregroundColor(.white)
+                    }
+                }
+                .sheet(isPresented: $isShowingImagePicker, onDismiss: loadImage) {
+                    ImagePicker(image: self.$inputImage)
+                }
+
+                // Username Input
+                Text("Username:")
+                    .foregroundColor(.white)
+                TextField("Enter new username", text: $username)
+                    .textFieldStyle(RoundedBorderTextFieldStyle())
+                // Bio Input
+                Text("Email:")
+                    .foregroundColor(.white)
+                TextField("Enter new email", text: $email)
+                    .textFieldStyle(RoundedBorderTextFieldStyle())
+            }
+            .padding()
+            
+            // Save Button
+                        Button(action: {
+                            // Action to save the profile details
+                            saveProfile(userId: userId)
+                        }) {
+                            Text("Save")
+                                .foregroundColor(.white)
+                                .padding()
+                                .frame(maxWidth: .infinity)
+                                .background(Color.white.opacity(0.5))
+                                .cornerRadius(10)
+                        }
+                        .padding()
+
+            Spacer()
+        }
+        .frame(width: 350, height: 600)
+        .padding(.top, 10)
+        .padding(.bottom, 10)
+    }
+
+    func loadImage() {
+        guard let inputImage = inputImage else { return }
+        image = Image(uiImage: inputImage)
+        viewModel.profileImage = inputImage
+    }
+    func saveProfile(userId: String) {
+        let userId = userId // Replace with actual user ID
+
+        let userNameToUpdate: String? = username.isEmpty ? nil : username
+        let emailToUpdate: String? = email.isEmpty ? nil : email
+        let avatarToUpdate: String? = nil // Replace with actual logic to handle avatar updates
+
+        updateUserProfile(userId: userId, userName: userNameToUpdate, email: emailToUpdate, avatar: avatarToUpdate) { result in
+            DispatchQueue.main.async {
+                switch result {
+                case .success:
+                    print("Profile updated successfully.")
+                    // Handle successful update (e.g., show confirmation message)
+                    self.viewModel.username = self.username
+                    self.viewModel.email = self.email
+                case .failure(let error):
+                    print("Error updating profile: \(error.localizedDescription)")
+                    // Handle error (e.g., show error message)
+                }
+            }
+        }
+    }
+}
+
+struct ImagePicker: UIViewControllerRepresentable {
+    @Environment(\.presentationMode) var presentationMode
+    @Binding var image: UIImage?
+
+    func makeUIViewController(context: Context) -> UIImagePickerController {
+        let picker = UIImagePickerController()
+        picker.delegate = context.coordinator
+        return picker
+    }
+
+    func updateUIViewController(_ uiViewController: UIImagePickerController, context: Context) {}
+
+    func makeCoordinator() -> Coordinator {
+        Coordinator(self)
+    }
+
+    class Coordinator: NSObject, UINavigationControllerDelegate, UIImagePickerControllerDelegate {
+        let parent: ImagePicker
+
+        init(_ parent: ImagePicker) {
+            self.parent = parent
+        }
+
+        func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) {
+            if let uiImage = info[.originalImage] as? UIImage {
+                parent.image = uiImage
+            }
+
+            parent.presentationMode.wrappedValue.dismiss()
+        }
+    }
+}
+
+
diff --git a/app/newHere1/newHere/Views/Profile/Profile.swift b/app/newHere1/newHere/Views/Profile/Profile.swift
index 0976366..b63212e 100644
--- a/app/newHere1/newHere/Views/Profile/Profile.swift
+++ b/app/newHere1/newHere/Views/Profile/Profile.swift
@@ -12,11 +12,12 @@ import SwiftUI
  * Subviews:
  * - ProfileHeader: Displays the user's profile picture and basic information.
  * - ProfileStats: Shows key statistics like the number of notes and friends.
- * - PostGrid: A placeholder for displaying the user's posts in a grid layout.
  */
 struct ProfilePopup: View {
     @Binding var isPresented: Bool // Added binding to control visibility
+    @StateObject var viewModel = UserProfileViewModel()
     @State private var isShowingFriends: Bool = false
+    @State private var isShowingEditProfile: Bool = false
     
     var body: some View {
         ZStack {
@@ -35,30 +36,35 @@ struct ProfilePopup: View {
                         }
                         .padding(.trailing, 20) // Adjust the position of the close button
                     }
-                    ProfileHeader() // User profile header
+                    ProfileHeader(viewModel: viewModel) // User profile header
                     Divider()
                     
                     HStack {
                         VStack {
-                            Text("Notes")
+                            Text("Edit Profile")
                                 .font(.caption)
                                 .foregroundColor(.gray.opacity(0.8))
-
-                            Text("10")
-                                .font(.headline)
+                            
+                            Image (systemName: "pencil")
+                                .foregroundColor(Color.white)
                         }
                         .padding()
                         .background(Color.white.opacity(0.8))
                         .cornerRadius(8)
                         .shadow(radius: 3)
+                        .onTapGesture {
+                            isShowingEditProfile.toggle() // Toggle the state to show friends
+                        }
                         
                         VStack {
+                            
                             Text("Friends")
                                 .font(.caption)
                                 .foregroundColor(.gray.opacity(0.8))
+                            
+                            Image(systemName: "person.2.fill")
+                                .foregroundColor(Color.white)
 
-                            Text("100")
-                                .font(.headline)
                         }
                         .padding()
                         .background(Color.white.opacity(0.8))
@@ -71,7 +77,6 @@ struct ProfilePopup: View {
                     .padding()
                     
                     Divider()
-                    PostGrid() // Grid to show posts
                 }
                 .padding(.top, 10)
                 .padding(.bottom, 10)
@@ -88,6 +93,14 @@ struct ProfilePopup: View {
                     .shadow(radius: 10)
                     .padding()
             }
+            
+            if isShowingEditProfile {
+                EditProfile(isPresented: $isShowingEditProfile, viewModel: viewModel)
+                    .background(Color.gray)
+                    .cornerRadius(12)
+                    .shadow(radius: 10)
+                    .padding()
+            }
         }
             .frame(width: 350, height: 600)
             .background(Color.white.opacity(0.5))
@@ -103,25 +116,37 @@ struct ProfilePopup: View {
  * A subview within ProfilePopup that displays the user's profile picture, name, and a short bio.
  */
 struct ProfileHeader: View {
+    @ObservedObject var viewModel: UserProfileViewModel
     var body: some View {
         HStack {
             // Profile picture
-            Image("profilePicture")
-                .resizable()
-                .aspectRatio(contentMode: .fill)
-                .frame(width: 80, height: 80)
-                .clipShape(Circle())
-                .padding()
+            if let uiImage = viewModel.profileImage {
+                            Image(uiImage: uiImage)
+                                .resizable()
+                                .aspectRatio(contentMode: .fill)
+                                .frame(width: 80, height: 80)
+                                .clipShape(Circle())
+                                .padding()
+                        } else {
+                            Image(systemName: "person.crop.circle.fill") // Fallback image
+                                .resizable()
+                                .aspectRatio(contentMode: .fill)
+                                .foregroundColor(Color.white)
+                                .frame(width: 80, height: 80)
+                                .clipShape(Circle())
+                                .padding()
+                        }
             // User name and bio
             VStack(alignment: .leading, spacing: 8) {
                 
-                Text(userName)
+                Text(viewModel.username)
                     .font(.title)
                     .bold()
+                    .foregroundColor(.white)
                 
-                Text("Bio or description")
+                Text(viewModel.email)
                     .font(.subheadline)
-                
+                    .foregroundColor(.white)
             }
 
             Spacer()
@@ -229,17 +254,3 @@ struct ProfileStatItem: View {
     }
 }
 
-/**
- * PostGrid
- *
- * A subview within ProfilePopup intended to display the user's posts in a grid format. Currently serves as a placeholder.
- */
-struct PostGrid: View {
-    var body: some View {
-        // Placeholder for posts grid
-        Text("Posts Grid")
-            .font(.title)
-            .padding()
-    }
-}
-