diff --git a/app/newHere1/.DS_Store b/app/newHere1/.DS_Store
index 6297406..71d761b 100644
Binary files a/app/newHere1/.DS_Store and b/app/newHere1/.DS_Store differ
diff --git a/app/newHere1/newHere.xcodeproj/project.pbxproj b/app/newHere1/newHere.xcodeproj/project.pbxproj
index 6f84b9b..7195e57 100644
--- a/app/newHere1/newHere.xcodeproj/project.pbxproj
+++ b/app/newHere1/newHere.xcodeproj/project.pbxproj
@@ -569,7 +569,7 @@
 				"BUNDLE_LOADER[arch=*]" = "$(BUILT_PRODUCTS_DIR)/newHere.app/newHere";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = ACLZN9M2VC;
+				DEVELOPMENT_TEAM = A7X36A78B2;
 				GCC_GENERATE_TEST_COVERAGE_FILES = YES;
 				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -620,7 +620,7 @@
 				"BUNDLE_LOADER[arch=*]" = "$(BUILT_PRODUCTS_DIR)/newHere.app/newHere";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = ACLZN9M2VC;
+				DEVELOPMENT_TEAM = A7X36A78B2;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
diff --git a/app/newHere1/newHere/ContentView.swift b/app/newHere1/newHere/ContentView.swift
index f0620a7..afa44b8 100644
--- a/app/newHere1/newHere/ContentView.swift
+++ b/app/newHere1/newHere/ContentView.swift
@@ -4,34 +4,31 @@
 //
 //  Created by Eric  Wang on 10/28/23.
 //
+//  Description:
+//  This file defines the ContentView struct, which serves as the main view for the application.
+//  It handles user authentication and navigation between the HomePage and Login views.
 
 import SwiftUI
 
 struct ContentView: View {
     @State private var isAuthenticated = false
     @State private var isRegistered = false
-    @ObservedObject var locationDataManager = LocationDataManager()    
+    @ObservedObject var locationDataManager = LocationDataManager()
     
-    // testing
-    @State var friendsPresented = true
-    //@State var userId = ""
+    @State private var userId: String = ""
     
+    /// The body of the view, which conditionally presents either the HomePageView or LoginView based on authentication status.
     var body: some View {
         if isAuthenticated {
                 HomePageView()
                     .environmentObject(locationDataManager)
         } else {
-            LoginView(isAuthenticated: $isAuthenticated)
+            LoginView(isAuthenticated: $isAuthenticated, user_id: $userId)
         }
-//
-//        if isRegistered {
-//            HomePageView()
-//        } else {
-//            RegistrationView(isRegistered: $isRegistered)
-//        }
     }
 }
 
+/// A preview provider for ContentView, used for rendering the view in Xcode's canvas.
 struct ContentView_Previews: PreviewProvider {
     static var previews: some View {
         ContentView()
diff --git a/app/newHere1/newHere/CustomARViewRepresentable.swift b/app/newHere1/newHere/CustomARViewRepresentable.swift
index 1bbd6a7..1b6b7e5 100644
--- a/app/newHere1/newHere/CustomARViewRepresentable.swift
+++ b/app/newHere1/newHere/CustomARViewRepresentable.swift
@@ -17,6 +17,7 @@ import ARKit
 //}
 
 struct CustomARViewRepresentable: UIViewRepresentable {
+    @Binding var userId: String
     @EnvironmentObject var messageState: MessageState
     @EnvironmentObject var fetchedMessagesState: FetchedMessagesState
     
@@ -27,8 +28,8 @@ struct CustomARViewRepresentable: UIViewRepresentable {
         
         let configuration = ARWorldTrackingConfiguration()
         sceneView.session.run(configuration)
-        
-        getUserMessages(userId: "653d51478ff5b3c9ace45c26") {
+        print("user id: \(userId)")
+        getUserMessages(userId: userId) {
             result in
             switch result {
             case .success(let response):
@@ -37,6 +38,7 @@ struct CustomARViewRepresentable: UIViewRepresentable {
                 for m in response {
                     do {
                         let convertedMessage = try Message(id: m._id,
+                                                           user_id: userId,
                                                            location: m.location.toCLLocation(),
                                                            messageStr: m.text)
                         convertedMessages.append(convertedMessage)
diff --git a/app/newHere1/newHere/Home.swift b/app/newHere1/newHere/Home.swift
index 4195028..9b1cd9d 100644
--- a/app/newHere1/newHere/Home.swift
+++ b/app/newHere1/newHere/Home.swift
@@ -4,217 +4,102 @@
 //
 //  Created by Lindsay Chen on 10/14/23.
 //
+//  Description:
+//  This file defines the HomePageView and associated state management classes for the application.
+//  It integrates ARKit and manages UI components for messages, posts, and user profile.
 
 import SwiftUI
 import ARKit
 
+/// Manages the state of the current message in the application.
 class MessageState: ObservableObject {
     @Published var currentMessage: Message?
 }
 
+/// Manages the fetched messages state in the application.
 class FetchedMessagesState: ObservableObject {
     var fetchedMessages: [Message]?
 }
 
+/// The main view for the home page of the application.
 struct HomePageView: View {
     @State private var isShowingProfile = false
     @State private var isShowingMessages = false
     @State private var isShowingPosts = false
-    
-    @State var userId = "6546a496b72c080d30e20493"
-    
-    @EnvironmentObject var locationDataManager: LocationDataManager
-    
+    @State var userId = ""
     @StateObject var messageState = MessageState()
     @StateObject var fetchedMessagesState = FetchedMessagesState()
     
+    @EnvironmentObject var locationDataManager: LocationDataManager
+    
+    /// The body of the view, presenting the AR view along with overlay controls for navigation and interaction.
     var body: some View {
-        CustomARViewRepresentable()
+        CustomARViewRepresentable(userId: $userId)
             .environmentObject(messageState)
             .environmentObject(fetchedMessagesState)
-            //.ignoresSafeArea()
             .overlay(alignment: .bottom){
-                    VStack(){
-//                        if let currentLocation = locationDataManager.location {
-//                          Text("Your current location is:")
-//                          Text("Latitude: \(currentLocation.coordinate.latitude.description)")
-//                          Text("Longitude: \(currentLocation.coordinate.longitude.description)\n")
-//                          } else {
-//                              Text("Finding your location...\n")
-//                              ProgressView()
-//                          }
-
-//                              // render the stored messages on the screen
-//                              if !storedMessages.isEmpty {
-//                                  List {
-//                                      ForEach(0..<storedMessages.count, id:\.self) { i in
-//                                          Text(storedMessages[i].displayMessage())
-//                                      }
-//                                  }
-//                                  .listStyle(PlainListStyle())
-//                                  .background(Color.clear) // Set the list background to clear
-//                              }
-//                              else {
-//                                  Text("No Messages Stored!")
-                          }
-                          
-                        Spacer()
-                        HStack{
-                            HStack(alignment: .bottom, spacing: 28.0) {
-                                Button{
-                                    
-                                }label:
-                                {
-                                    Image(systemName: "map")
-                                }
-                                
-                                Button{isShowingMessages.toggle()
-                                    
-                                }label:
-                                {
-                                    Image(systemName: "message")
-                                }
-                                
-                                Button{isShowingPosts.toggle()
-                                    
-                                }label:
-                                {
-                                    Image(systemName: "plus.circle")
-                                        .scaleEffect(2)
-                                }
-                                
-                                Button{
-                                    
-                                }label:
-                                {
-                                    Image(systemName: "square.and.arrow.up")
-                                }
-                                
-                                Button{isShowingProfile.toggle()
-                                    
-                                }label:
-                                {
-                                    Image(systemName: "person")
-                                }
-                    
-                            }.alignmentGuide(.bottom) { d in d[.bottom]}
-                                .font(.largeTitle)
-                                .padding(10)
+                // Overlay containing buttons for various features like map, messages, posts, etc.
+                // Each button toggles the state to show respective views or popups.
+                Spacer()
+                HStack{
+                    HStack(alignment: .bottom, spacing: 28.0) {
+                        Button{
+                            
+                        }label:
+                        {
+                            Image(systemName: "map")
                         }
-                     }
-                    .sheet(isPresented: $isShowingProfile) {
-                        ProfilePopup(isPresented: $isShowingProfile, userId: $userId) // Pass the binding to control visibility
-                    }
-                    .sheet(isPresented: $isShowingMessages) {
-                        MessagesPopup(isPresented: $isShowingMessages)
-                    }
-                    .sheet(isPresented: $isShowingPosts){
-                        PostsPopup(isPresented: $isShowingPosts)
-                            .environmentObject(messageState)
-                    }
-                
+                        
+                        Button{isShowingMessages.toggle()
+                            
+                        }label:
+                        {
+                            Image(systemName: "message")
+                        }
+                        
+                        Button{isShowingPosts.toggle()
+                            
+                        }label:
+                        {
+                            Image(systemName: "plus.circle")
+                                .scaleEffect(2)
+                        }
+                        
+                        Button{
+                            
+                        }label:
+                        {
+                            Image(systemName: "square.and.arrow.up")
+                        }
+                        
+                        Button{isShowingProfile.toggle()
+                            
+                        }label:
+                        {
+                            Image(systemName: "person")
+                        }
+            
+                    }.alignmentGuide(.bottom) { d in d[.bottom]}
+                        .font(.largeTitle)
+                        .padding(10)
+                }
+             }
+            // Render popups upon state variables being true.
+            .sheet(isPresented: $isShowingProfile) {
+                ProfilePopup(isPresented: $isShowingProfile, userId: $userId) // Pass the binding to control visibility
+            }
+            .sheet(isPresented: $isShowingMessages) {
+                MessagesPopup(isPresented: $isShowingMessages)
             }
+            .sheet(isPresented: $isShowingPosts){
+                PostsPopup(isPresented: $isShowingPosts)
+                    .environmentObject(messageState)
+            }
+                
         }
-        
-    
-
-
-//struct HomePageView: View {
-//    @State private var isShowingProfile = false
-//    @State private var isShowingMessages = false
-//    @State private var isShowingPosts = false
-//    
-//    @State private var storedMessages: [Message] = []
-//    
-//    @EnvironmentObject var locationDataManager: LocationDataManager
-//    
-//    var body: some View {
-//        CustomARViewRepresentable()
-//            .ignoreSafeArea()
-//            .overlay(alignment: .bottom){}
-//        
-////        VStack(){
-////            
-////            // display current locaation
-////            if let currentLocation = locationDataManager.location {
-////                Text("Your current location is:")
-////                Text("Latitude: \(currentLocation.coordinate.latitude.description)")
-////                Text("Longitude: \(currentLocation.coordinate.longitude.description)\n")
-////            } else {
-////                Text("Finding your location...\n")
-////                ProgressView()
-////            }
-////            
-////            // render the stored messages on the screen
-////            if !storedMessages.isEmpty {
-////                List {
-////                    ForEach(0..<storedMessages.count, id:\.self) { i in
-////                        Text(storedMessages[i].displayMessage())
-////                    }
-////                }
-////            }
-////            else {
-////                Text("No Messages Stored!")
-////            }
-////            
-////            Spacer()
-////            HStack{
-////                HStack(alignment: .bottom, spacing: 28.0) {
-////                    Button{
-////                        
-////                    }label:
-////                    {
-////                        Image(systemName: "map")
-////                    }
-////                    
-////                    Button{isShowingMessages.toggle()
-////                        
-////                    }label:
-////                    {
-////                        Image(systemName: "message")
-////                    }
-////                    
-////                    Button{isShowingPosts.toggle()
-////                        
-////                    }label:
-////                    {
-////                        Image(systemName: "plus.circle")
-////                            .scaleEffect(2)
-////                    }
-////                    
-////                    Button{
-////                        
-////                    }label:
-////                    {
-////                        Image(systemName: "square.and.arrow.up")
-////                    }
-////                    
-////                    Button{isShowingProfile.toggle()
-////                        
-////                    }label:
-////                    {
-////                        Image(systemName: "person")
-////                    }
-////        
-////                }.alignmentGuide(.bottom) { d in d[.bottom]}
-////                    .font(.largeTitle)
-////                    .padding(10)
-////            }
-////         }
-////        .sheet(isPresented: $isShowingProfile) {
-////            ProfilePopup(isPresented: $isShowingProfile) // Pass the binding to control visibility
-////        }
-////        .sheet(isPresented: $isShowingMessages) {
-////            MessagesPopup(isPresented: $isShowingMessages)
-////        }
-////        .sheet(isPresented: $isShowingPosts){
-////            PostsPopup(isPresented: $isShowingPosts, 
-////                       storedMessages: $storedMessages)
-////                .environmentObject(locationDataManager)
-////        }
-////    }
-//}
+    }
 
+/// A preview provider for HomePageView, used for rendering the view in Xcode's canvas.
 struct HomePageView_Previews: PreviewProvider {
     static var previews: some View {
         HomePageView()
diff --git a/app/newHere1/newHere/LoginView.swift b/app/newHere1/newHere/LoginView.swift
index 4feee04..6507212 100644
--- a/app/newHere1/newHere/LoginView.swift
+++ b/app/newHere1/newHere/LoginView.swift
@@ -15,6 +15,7 @@ struct LoginView: View {
     @State internal var password: String = ""
     @State internal var isRegistered = false
     @Binding var isAuthenticated: Bool
+    @Binding var user_id: String
     
     @State internal var showingAlert = false
     @State internal var alertMessage = ""
@@ -50,7 +51,7 @@ struct LoginView: View {
                 }
                 .padding(.horizontal)
                 
-                NavigationLink(destination: RegistrationView(isRegistered: $isRegistered)) {
+                NavigationLink(destination: RegistrationView(isRegistered: $isRegistered, userId: $user_id)) {
                     Text("Don't have an account? Signup")
                 }
                 .padding()
@@ -90,7 +91,7 @@ struct LoginView: View {
             request.httpBody = jsonData
             request.setValue("application/json", forHTTPHeaderField: "Content-Type")
             request.setValue(logApiKey, forHTTPHeaderField: "x-api-key")
-            
+                        
             URLSession.shared.dataTask(with: request) { data, response, error in
                 DispatchQueue.main.async {
                     if let error = error{
@@ -106,10 +107,13 @@ struct LoginView: View {
                                     if let jsonData = responseString.data(using: .utf8) {
                                     do {
                                         if let json = try JSONSerialization.jsonObject(with: jsonData, options:[]) as? [String: Any],
-                                        let userId = json["_id"] as? String {
-                                            print("User ID:\(userId)")
-                                            UserDefaults.standard.set(userId, forKey: "UserId")
-                                        }
+                                           let extractedUserId = json["_id"] as? String {
+                                            print("User id: \(extractedUserId)")
+                                            self.user_id = extractedUserId;
+                                            print("updated: \(self.user_id)")
+                                           UserDefaults.standard.set(extractedUserId, forKey: "UserId")
+//                                            self.isAuthenticated = true;
+                                       }
                                         
                                         if let json = try JSONSerialization.jsonObject(with: jsonData, options:[]) as? [String: Any],
                                         let userName = json["userName"] as? String {
@@ -122,6 +126,8 @@ struct LoginView: View {
                                 }
                                 }
                                 self.isAuthenticated = true;
+                                print("authenticated: \(self.isAuthenticated)")
+                                print("user_id: \(self.user_id)")
                             }
                         }else if statusCode == 404 {
                             self.alertMessage = "User not found. Please check your credentials."
diff --git a/app/newHere1/newHere/Message.swift b/app/newHere1/newHere/Message.swift
index fe85dc8..b7c7867 100644
--- a/app/newHere1/newHere/Message.swift
+++ b/app/newHere1/newHere/Message.swift
@@ -15,10 +15,9 @@ class Message {
     var location: CLLocation
     var messageStr: String
     
-    init(id:String, location:CLLocation, messageStr: String) {
+    init(id:String, user_id: String, location:CLLocation, messageStr: String) {
         self.id = id
-//        self.username = username
-        self.user_id = "653d51478ff5b3c9ace45c26"
+        self.user_id = user_id
         self.location = location
         self.messageStr = messageStr
     }
diff --git a/app/newHere1/newHere/Post.swift b/app/newHere1/newHere/Post.swift
index 0d352a3..e534f0d 100644
--- a/app/newHere1/newHere/Post.swift
+++ b/app/newHere1/newHere/Post.swift
@@ -72,7 +72,7 @@ struct PostsPopup: View {
                                 Spacer()
                                 
                                 Button(action: {
-                                    postMessage(user_id: "653d51478ff5b3c9ace45c26", text: noteMessage, visibility: "friends", locationDataManager: locationDataManager) {
+                                    postMessage(user_id: userId, text: noteMessage, visibility: "friends", locationDataManager: locationDataManager) {
                                         result in
                                         switch result {
                                         case .success(let response):
@@ -82,6 +82,7 @@ struct PostsPopup: View {
                                             do {
                                                 let newMessage = try Message(
                                                     id: response._id,
+                                                    user_id: userId,
                                                     location: response.location.toCLLocation(),
                                                     messageStr: response.text)
                                                 // Use newMessage here
diff --git a/app/newHere1/newHere/Registration.swift b/app/newHere1/newHere/Registration.swift
index 97b426f..0e750ab 100644
--- a/app/newHere1/newHere/Registration.swift
+++ b/app/newHere1/newHere/Registration.swift
@@ -18,6 +18,7 @@ struct RegistrationView: View {
     @State private var password: String = ""
     @State private var confirmPassword: String = ""
     @Binding var isRegistered: Bool
+    @Binding var userId: String
     @State private var isAuthenticated = false
     
     @State private var showingAlert = false
@@ -50,7 +51,7 @@ struct RegistrationView: View {
                         Text("Submit")
                     }
               
-                    NavigationLink(destination: LoginView(isAuthenticated: $isAuthenticated)) {
+                    NavigationLink(destination: LoginView(isAuthenticated: $isAuthenticated, user_id: $userId)) {
                         Text("Already have an account? Login")
                     }
                 }
diff --git a/app/newHere1/newHere/api_call.swift b/app/newHere1/newHere/api_call.swift
index d491240..4c08e65 100644
--- a/app/newHere1/newHere/api_call.swift
+++ b/app/newHere1/newHere/api_call.swift
@@ -166,10 +166,14 @@ func getAllUserFriends(userId: String, completion: @escaping (Result<[String], E
         
         do {
             // Deserialize the JSON response into an array of strings
-            let jsonArray = try JSONSerialization.jsonObject(with: data, options: []) as? [String]
+//            let jsonArray = try JSONSerialization.jsonObject(with: data, options: []) as? [String]
+            print("Friends")
+            print(data)
+            let jsonArray = try JSONSerialization.jsonObject(with: data, options: []) as? [String: String]
+            let valuesList = jsonArray?.values.map { $0 }
             
-            if let friends = jsonArray {
-                completion(.success(friends))                
+            if let friends = valuesList {
+                completion(.success(friends))
             } else {
                 completion(.failure(URLError(.cannotParseResponse)))
             }