diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt
index 76b83e228..0c6783632 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt
@@ -155,6 +155,7 @@ class HomeFragment : Fragment() {
             return
         }
 
+        val studentLife = mStudentLife
         mActivity.mNetworkManager.getAccessToken {
             val sp = sharedPreferences
             val deviceID = OAuth2NetworkManager(mActivity).getDeviceId()
@@ -165,7 +166,7 @@ class HomeFragment : Fragment() {
             lifecycleScope.launch(Dispatchers.Default) {
                 // set adapter if it is null
                 if (binding.homeCellsRv.adapter == null) {
-                    homepageViewModel.populateHomePageCells(mStudentLife, isLoggedIn, bearerToken, deviceID)
+                    homepageViewModel.populateHomePageCells(studentLife, isLoggedIn, bearerToken, deviceID)
                     withContext(Dispatchers.Main) {
                         binding.homeCellsRv.adapter = HomeAdapter(homepageViewModel)
                         binding.homeCellsRv.visibility = View.INVISIBLE
@@ -173,7 +174,7 @@ class HomeFragment : Fragment() {
                         binding.homeRefreshLayout.isRefreshing = false
                     }
                 } else { // otherwise, call updateHomePageCells which only updates the cells that are changed
-                    val updatedIndices = homepageViewModel.updateHomePageCells(mStudentLife, isLoggedIn,
+                    val updatedIndices = homepageViewModel.updateHomePageCells(studentLife, isLoggedIn,
                         bearerToken, deviceID)
                     withContext(Dispatchers.Main) {
                         updatedIndices.forEach { pos ->
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennMobileApp.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennMobileApp.kt
index f919674b4..8b695db74 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennMobileApp.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennMobileApp.kt
@@ -1,6 +1,7 @@
 package com.pennapps.labs.pennmobile
 
 import android.app.Application
+import androidx.preference.PreferenceManager
 import com.pennapps.labs.pennmobile.api.NetworkContainer
 
 class PennMobileApp : Application() {
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/OAuth2NetworkManager2.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/OAuth2NetworkManager2.kt
new file mode 100644
index 000000000..cb2b4f6a2
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/OAuth2NetworkManager2.kt
@@ -0,0 +1,102 @@
+package com.pennapps.labs.pennmobile.api
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.preference.PreferenceManager
+import android.provider.Settings
+import android.util.Log
+import androidx.lifecycle.lifecycleScope
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.pennapps.labs.pennmobile.BuildConfig
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.classes.AccessTokenResponse
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import retrofit.Callback
+import retrofit.RetrofitError
+import retrofit.client.Response
+import java.util.*
+
+class OAuth2NetworkManager2(private val mStudentLife: StudentLife,
+    private val sp: SharedPreferences,
+    private val applicationScope: CoroutineScope,
+    private val tokenMutex: Mutex,
+    private val context: Context
+){
+
+    val editor: SharedPreferences.Editor = sp.edit()
+
+    @Synchronized
+    fun getAccessToken(function: () -> Unit) {
+        // if guest mode, then just do network request dangerously(TEMPORARY FIX, PLEASE DO SOMETHING
+        // ABOUT THIS IN FUTURE)
+        val guestMode = sp.getBoolean(context.getString(R.string.guest_mode), false)
+        if (guestMode) {
+            function.invoke()
+            return
+        }
+
+        applicationScope.launch {
+            tokenMutex.lock()
+            val expiresIn = sp.getString(context.getString(R.string.expires_in), "")
+            if (expiresIn != "") {
+                val expiresAt = sp.getLong(context.getString(R.string.token_expires_at), 0)
+                val currentTime = Calendar.getInstance().timeInMillis
+                if (currentTime >= expiresAt) { // if it has expired, refresh access token
+                    Log.i("Accounts", "Expired")
+                    refreshAccessToken (function) {
+                        tokenMutex.unlock()
+                    }
+                } else {
+                    Log.i("Accounts", "Not Expired")
+                    tokenMutex.unlock()
+                    function.invoke()
+                }
+            } else {
+                refreshAccessToken (function) {
+                    tokenMutex.unlock()
+                }
+            }
+        }
+    }
+
+    @Synchronized
+    private fun refreshAccessToken(function: () -> Unit, unlockMutex: () -> Unit) {
+        val refreshToken = sp.getString(context.getString(R.string.refresh_token), "")
+        val clientID = BuildConfig.PLATFORM_CLIENT_ID
+
+        mStudentLife.refreshAccessToken(refreshToken,
+            "refresh_token", clientID,
+            object : Callback<AccessTokenResponse> {
+
+                override fun success(t: AccessTokenResponse?, response: Response?) {
+                    if (response?.status == 200) {
+                        val editor = sp.edit()
+                        editor.putString(context.getString(R.string.access_token), t?.accessToken)
+                        editor.putString(context.getString(R.string.refresh_token), t?.refreshToken)
+                        editor.putString(context.getString(R.string.expires_in), t?.expiresIn)
+                        val expiresIn = t?.expiresIn
+                        val expiresInInt = (expiresIn!!.toInt() * 1000)
+                        val currentTime = Calendar.getInstance().timeInMillis
+                        editor.putLong(context.getString(R.string.token_expires_at), currentTime + expiresInInt)
+                        editor.apply()
+                        unlockMutex.invoke()
+                        function.invoke()
+                        Log.i("Accounts", "Reloaded Homepage")
+                    }
+                }
+
+                override fun failure(error: RetrofitError) {
+
+                    FirebaseCrashlytics.getInstance().recordException(error)
+                    Log.e("Accounts", "Error refreshing access token $error")
+
+                    if (error.response != null && error.response.status == 400) {
+                        unlockMutex.invoke()
+                    }
+                }
+            })
+    }
+}