diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt
index 4fb0651af..bf65fbeef 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt
@@ -60,7 +60,6 @@ class AboutFragment : Fragment() {
         view.our_team_rv?.layoutManager = GridLayoutManager(context, 3)
         view.alumni_rv?.layoutManager = GridLayoutManager(context, 3)
         val members = arrayListOf("Rohan Chhaya", "Julius Snipes", "Aaron Mei", "Trini Feng", "Vedha Avali")
-
         val alumni = arrayListOf("Marta García Ferreiro", "Varun Ramakrishnan", "Sahit Penmatcha",
             "Anna Wang", "Sophia Ye", "Awad Irfan", "Liz Powell", "Davies Lumumba", "Anna Jiang", "Ali Krema")
         view.our_team_rv?.adapter = AboutAdapter(members)
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHolderFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHolderFragment.kt
index aa8decd26..59699baf0 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHolderFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHolderFragment.kt
@@ -26,7 +26,6 @@ class DiningHolderFragment : Fragment() {
         super.onCreate(savedInstanceState)
         mActivity = activity as MainActivity
         mActivity.closeKeyboard()
-
     }
 
     @RequiresApi(Build.VERSION_CODES.M)
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessFragment.kt
index dbae8c0cb..82ef219dd 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessFragment.kt
@@ -68,30 +68,6 @@ class FitnessFragment : Fragment() {
             internetConnectionFitness?.visibility = View.GONE
         }
 
-        // get API data
-        val labs = MainActivity.studentLifeInstance
-        labs.gymData.subscribe({ gyms ->
-            mActivity.runOnUiThread {
-                gym_list?.adapter = FitnessAdapter(gyms)
-                // get rid of loading screen
-                loadingPanel?.visibility = View.GONE
-                if (gyms.size > 0) {
-                    no_results?.visibility = View.GONE
-                } else {
-                    no_results?.visibility = View.VISIBLE
-                }
-                // stop refreshing
-                gym_refresh_layout?.isRefreshing = false
-            }
-        }, { throwable ->
-            mActivity.runOnUiThread {
-                throwable.printStackTrace()
-                Toast.makeText(activity, "Could not load gym information", Toast.LENGTH_LONG).show()
-                loadingPanel?.visibility = View.GONE
-                no_results?.visibility = View.VISIBLE
-                gym_refresh_layout?.isRefreshing = false
-            }
-        })
     }
 
     override fun onResume() {
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessHolderFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessHolderFragment.kt
new file mode 100644
index 000000000..e0884feda
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessHolderFragment.kt
@@ -0,0 +1,69 @@
+package com.pennapps.labs.pennmobile
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.fragment.app.Fragment
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.tabs.TabLayoutMediator
+import com.pennapps.labs.pennmobile.adapters.FitnessPagerAdapter
+import com.pennapps.labs.pennmobile.components.collapsingtoolbar.ToolbarBehavior
+import com.pennapps.labs.pennmobile.utils.Utils
+
+import kotlinx.android.synthetic.main.fragment_fitness_holder.pager
+import kotlinx.android.synthetic.main.fragment_fitness_holder.tabLayout
+
+class FitnessHolderFragment: Fragment() {
+    private lateinit var mActivity : MainActivity
+    private lateinit var mView : View
+    private lateinit var pagerAdapter : FitnessPagerAdapter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        mActivity = activity as MainActivity
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+        return inflater.inflate(R.layout.fragment_fitness_holder, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        mView = view
+        // initialize app bar and swipe refresh
+        initAppBar()
+
+        pagerAdapter = FitnessPagerAdapter(this)
+        pager?.adapter = pagerAdapter
+        pager.isUserInputEnabled = false
+        TabLayoutMediator(tabLayout, pager) { tab, position ->
+            if (position == 0) {
+                tab.text = "Pottruck"
+            } else {
+                tab.text = "Favorites"
+            }
+        }.attach()
+    }
+
+    /**
+     * Initialize the app bar of the fragment and
+     * fills in the textViews for the title/date
+     */
+    private fun initAppBar() {
+        val appBarLayout : AppBarLayout = mView.findViewById(R.id.appbar_home_holder)
+        val titleView : TextView = mView.findViewById(R.id.title_view)
+        val dateView : TextView = mView.findViewById(R.id.date_view)
+
+        (appBarLayout.layoutParams as CoordinatorLayout.LayoutParams).behavior = ToolbarBehavior()
+        titleView.text = getString(R.string.fitness)
+        dateView.text = Utils.getCurrentSystemTime()
+    }
+}
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessPreferencesFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessPreferencesFragment.kt
new file mode 100644
index 000000000..0b6cc0ce7
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessPreferencesFragment.kt
@@ -0,0 +1,66 @@
+package com.pennapps.labs.pennmobile
+
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.fragment.app.DialogFragment
+import androidx.recyclerview.widget.RecyclerView
+import com.pennapps.labs.pennmobile.adapters.FitnessPreferenceAdapter
+import com.pennapps.labs.pennmobile.classes.FitnessPreferenceViewModel
+
+interface CloseListener {
+    fun updateAdapters()
+}
+
+class FitnessPreferencesFragment(private val dataModel: FitnessPreferenceViewModel,
+                                 private val listener: CloseListener) : DialogFragment() {
+
+    private lateinit var mActivity : MainActivity
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        mActivity = activity as MainActivity
+        return inflater.inflate(R.layout.fragment_fitness_preferences, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val prefAdapter = FitnessPreferenceAdapter(dataModel)
+
+        val recyclerView: RecyclerView = view.findViewById(R.id.fitness_preference_recycler_view)
+        recyclerView.adapter = prefAdapter
+
+        val cancelText : TextView = view.findViewById(R.id.fitness_fragment_pref_cancel)
+        cancelText.setOnClickListener {
+            dataModel.restorePreferences()
+            dialog?.dismiss()
+        }
+
+        val saveText : TextView = view.findViewById(R.id.fitness_fragment_pref_save)
+        saveText.setOnClickListener {
+            dataModel.updatePositionMap()
+            dataModel.updateRemotePreferences(mActivity)
+            listener.updateAdapters()
+
+            dialog?.dismiss()
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        val dialog = dialog
+
+        if (dialog != null) {
+            val width = ViewGroup.LayoutParams.MATCH_PARENT
+            val height = ViewGroup.LayoutParams.MATCH_PARENT
+            dialog.window!!.setLayout(width, height)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertCreateAlertFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertCreateAlertFragment.kt
index 248d75830..5919e2b00 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertCreateAlertFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertCreateAlertFragment.kt
@@ -59,7 +59,6 @@ class PennCourseAlertCreateAlertFragment : Fragment() {
 //            hideInternetErrorBar(view)
         }
 
-
         val sp = PreferenceManager.getDefaultSharedPreferences(activity)
         val pennKey = sp.getString(getString(R.string.pennkey), null)
         val bearerToken = "Bearer " + sp.getString(getString(R.string.access_token), "").toString()
@@ -80,9 +79,10 @@ class PennCourseAlertCreateAlertFragment : Fragment() {
             viewModel.userInfo.observe(viewLifecycleOwner, Observer {
                 val formattedPhoneNumber = viewModel.userInfo.value?.profile?.phone?.drop(2)
                 val email = viewModel.userInfo.value?.profile?.email
+
                 phoneNumberEditText.text =
-                    Editable.Factory.getInstance().newEditable(formattedPhoneNumber)
-                emailEditText.text = Editable.Factory.getInstance().newEditable(email)
+                    Editable.Factory.getInstance().newEditable(formattedPhoneNumber?: "")
+                emailEditText.text = Editable.Factory.getInstance().newEditable(email?: "")
             })
 
             val alertButton = view.findViewById<Button>(R.id.pca_alert_button)
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PottruckFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PottruckFragment.kt
new file mode 100644
index 000000000..9b9fa30cc
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PottruckFragment.kt
@@ -0,0 +1,203 @@
+package com.pennapps.labs.pennmobile
+
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.appcompat.widget.Toolbar
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.ConcatAdapter
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.google.android.material.appbar.AppBarLayout
+import com.pennapps.labs.pennmobile.adapters.FitnessAdapter
+import com.pennapps.labs.pennmobile.adapters.FitnessHeaderAdapter
+import com.pennapps.labs.pennmobile.adapters.HomeAdapter
+import com.pennapps.labs.pennmobile.api.OAuth2NetworkManager
+import com.pennapps.labs.pennmobile.api.StudentLife
+import com.pennapps.labs.pennmobile.classes.FitnessAdapterDataModel
+import com.pennapps.labs.pennmobile.classes.FitnessPreferenceViewModel
+import com.pennapps.labs.pennmobile.classes.HomeCell
+import com.pennapps.labs.pennmobile.classes.HomeCellInfo
+import com.pennapps.labs.pennmobile.components.collapsingtoolbar.ToolbarBehavior
+import com.pennapps.labs.pennmobile.utils.Utils
+import kotlinx.android.synthetic.main.fragment_home.home_cells_rv
+import kotlinx.android.synthetic.main.fragment_home.home_refresh_layout
+import kotlinx.android.synthetic.main.fragment_home.internetConnectionHome
+import kotlinx.android.synthetic.main.loading_panel.loadingPanel
+
+class PottruckFragment : Fragment() {
+    private lateinit var mActivity : MainActivity
+    private lateinit var mStudentLife : StudentLife
+
+    private lateinit var mView: View
+    private lateinit var swipeRefresh : SwipeRefreshLayout
+    private lateinit var recyclerView : RecyclerView
+    private lateinit var loadingPanel : View
+
+    private lateinit var dataModel : FitnessPreferenceViewModel
+    private lateinit var favoritesAdapter : FitnessAdapter
+    private lateinit var otherAdapter : FitnessAdapter
+    private lateinit var favoriteHeaderAdapter : FitnessHeaderAdapter
+    private lateinit var otherHeaderAdapter : FitnessHeaderAdapter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        mStudentLife = MainActivity.studentLifeInstance
+        mActivity = activity as MainActivity
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        mActivity.hideBottomBar()
+        return inflater.inflate(R.layout.fragment_pottruck, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        mView = view
+
+        swipeRefresh = view.findViewById(R.id.swiperefresh_fitness)
+        recyclerView = view.findViewById(R.id.recycler_view_fitness_rooms)
+        loadingPanel = view.findViewById(R.id.loadingPanel)
+
+        swipeRefresh.setColorSchemeResources(R.color.color_accent, R.color.color_primary)
+        recyclerView.layoutManager = LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false)
+        swipeRefresh.setOnRefreshListener { getFitnessRooms(view) }
+
+        // populate the title/date of the app bar
+        initAppBar()
+
+        // populate recyclerview
+        getFitnessRooms(view)
+    }
+
+    private fun getFitnessRooms(view: View) {
+        //displays banner if not connected
+        if (!getConnected()) return
+
+        mStudentLife.fitnessRooms
+            .subscribe({ fitnessRooms ->
+                for (room in fitnessRooms) {
+                    Log.i("Fitness Room${room.roomId}", "${room.roomName}")
+                }
+                val sortedRooms = fitnessRooms.sortedBy {it.roomName}
+
+                dataModel = FitnessPreferenceViewModel(mActivity, mStudentLife, sortedRooms)
+
+
+                mActivity.runOnUiThread {
+                    OAuth2NetworkManager(mActivity).getAccessToken {
+                        val sp = PreferenceManager.getDefaultSharedPreferences(mActivity)
+                        val context = mActivity.applicationContext
+                        val bearerToken =
+                            "Bearer " + sp.getString(context.getString(R.string.access_token), "")
+                                .toString()
+
+                        mStudentLife.getFitnessPreferences(bearerToken).subscribe({ favorites ->
+                            mActivity.runOnUiThread {
+                                for (roomId in favorites) {
+                                    dataModel.addId(roomId)
+                                }
+                                dataModel.updatePositionMap()
+
+                                setAdapters()
+                            }
+                        }, { throwable ->
+                            mActivity.runOnUiThread {
+                                // empty preferences
+                                setAdapters()
+                                Log.e(
+                                    "Pottruck Fragment",
+                                    "Could not load Fitness Preferences",
+                                    throwable
+                                )
+                            }
+                        })
+                    }
+                }
+            }, {
+                Log.e("PottruckFragment", "Error getting fitness rooms", it)
+                mActivity.runOnUiThread {
+                    Log.e("Fitness", "Could not load Pottruck page", it)
+                    loadingPanel.visibility = View.GONE
+                    swipeRefresh.isRefreshing = false
+                }
+            })
+    }
+
+    private fun setAdapters() {
+        favoritesAdapter = FitnessAdapter(true, dataModel)
+        otherAdapter = FitnessAdapter(false, dataModel)
+
+        favoriteHeaderAdapter = FitnessHeaderAdapter("Favorites")
+        otherHeaderAdapter = FitnessHeaderAdapter("Other Facilities")
+
+        val concatAdapter = ConcatAdapter(favoriteHeaderAdapter, favoritesAdapter,
+            otherHeaderAdapter, otherAdapter)
+
+        recyclerView.adapter = concatAdapter
+        loadingPanel.visibility = View.GONE
+        swipeRefresh.isRefreshing = false
+
+        // set click listener for favorites button
+        val fitnessPref : ImageView = mView.findViewById(R.id.fitness_preferences)
+        fitnessPref.setOnClickListener {
+            dataModel.savePreferences()
+            val prefDialog = FitnessPreferencesFragment(dataModel, object: CloseListener{
+                override fun updateAdapters() {
+                    favoritesAdapter.notifyDataSetChanged()
+                    otherAdapter.notifyDataSetChanged()
+                }
+            })
+            prefDialog.show(mActivity.supportFragmentManager, "Fitness Preferences Dialog")
+        }
+    }
+
+    /**
+     * Checks if app is connected to internet. If not, it displays a banner
+     * @return true if connected to internet and false otherwise
+     */
+    private fun getConnected(): Boolean {
+        //displays banner if not connected
+        val connectionToolbar : Toolbar = mView.findViewById(R.id.toolbar_fitness_connection)
+        val connectionMessage : TextView = mView.findViewById(R.id.text_fitness_connection_message)
+
+        if (!isOnline(context)) {
+            connectionToolbar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.darkRedBackground))
+            connectionMessage.text = getString(R.string.internet_error)
+            connectionToolbar.visibility = View.VISIBLE
+            loadingPanel.visibility = View.GONE
+            swipeRefresh.isRefreshing = false
+            return false
+        }
+        internetConnectionHome?.visibility = View.GONE
+        connectionToolbar.visibility = View.GONE
+        return true
+    }
+
+    /**
+     * Initialize the app bar of the fragment and
+     * fills in the textViews for the title/date
+     */
+    private fun initAppBar() {
+        val appBarLayout : AppBarLayout = mView.findViewById(R.id.appbar_home_holder)
+        val titleView : TextView = mView.findViewById(R.id.title_view)
+        val dateView : TextView = mView.findViewById(R.id.date_view)
+
+        (appBarLayout.layoutParams as CoordinatorLayout.LayoutParams).behavior = ToolbarBehavior()
+
+        titleView.text = getString(R.string.fitness)
+        dateView.text = Utils.getCurrentSystemTime()
+    }
+}
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessAdapter.kt
index 6983a2234..18c7a401e 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessAdapter.kt
@@ -1,123 +1,372 @@
 package com.pennapps.labs.pennmobile.adapters
 
+import android.app.Activity
 import android.content.Context
-import androidx.recyclerview.widget.RecyclerView
+import android.graphics.Color
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-
+import android.view.animation.Animation
+import android.view.animation.LinearInterpolator
+import android.view.animation.RotateAnimation
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.ProgressBar
+import android.widget.TextView
+import android.widget.Toast
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.text.HtmlCompat
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.github.mikephil.charting.charts.BarChart
+import com.github.mikephil.charting.components.XAxis
+import com.github.mikephil.charting.components.YAxis
+import com.github.mikephil.charting.data.BarData
+import com.github.mikephil.charting.data.BarDataSet
+import com.github.mikephil.charting.data.BarEntry
+import com.github.mikephil.charting.formatter.IndexAxisValueFormatter
+import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.classes.Gym
-import com.pennapps.labs.pennmobile.classes.GymHours
-import com.squareup.picasso.Picasso
+import com.pennapps.labs.pennmobile.api.StudentLife
+import com.pennapps.labs.pennmobile.classes.FitnessAdapterDataModel
+import com.pennapps.labs.pennmobile.classes.FitnessRoom
+import com.pennapps.labs.pennmobile.classes.FitnessRoomUsage
+import com.pennapps.labs.pennmobile.classes.RoundedBarChartRenderer
+import java.time.Duration
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
 
-import org.joda.time.DateTime
-import org.joda.time.Interval
+class FitnessAdapter(private val isFavorite : Boolean, private val dataModel: FitnessAdapterDataModel) :
+        RecyclerView.Adapter<FitnessAdapter.ViewHolder>() {
 
-import kotlinx.android.synthetic.main.fitness_list_item.view.*
+    private lateinit var mActivity: Activity
+    private lateinit var mContext : Context
+    private lateinit var mStudentLife : StudentLife
 
-class FitnessAdapter(private val gyms: List<Gym>)// get gym data from fragment (which gets it from the api call)
-    : RecyclerView.Adapter<FitnessAdapter.FitnessViewHolder>() {
+    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
+        val mainView : ConstraintLayout = view.findViewById(R.id.fitness_list_info_layout)
+        val roomView : TextView = view.findViewById(R.id.item_fitness_name)
+        val statusView : TextView = view.findViewById(R.id.item_fitness_status)
+        val hoursView : TextView = view.findViewById(R.id.item_fitness_hours)
+        val imageView : ImageView = view.findViewById(R.id.item_fitness_image)
+        val progressBar : ProgressBar = view.findViewById(R.id.fitness_progress)
+        val arrowView : ImageView = view.findViewById(R.id.fitness_more_indicator)
 
-    private lateinit var mContext: Context
+        val timeCapacityView : TextView = view.findViewById(R.id.timeCapacity)
+        val lastUpdatedView : TextView = view.findViewById(R.id.item_pottruck_last_updated)
+        val capacityViewCircle : com.google.android.material.progressindicator.CircularProgressIndicator =
+            view.findViewById(R.id.item_pottruck_capacity_circle)
+        val capacityView : TextView = view.findViewById(R.id.item_pottruck_capacity)
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FitnessViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.fitness_list_item, parent, false)
-        mContext = parent.context
-        return FitnessViewHolder(view)
-    }
+        private val extraInfoView : LinearLayout = view.findViewById(R.id.fitness_list_extra_layout)
+        private val barChart : BarChart = view.findViewById(R.id.barchart_times)
 
-    override fun onBindViewHolder(holder: FitnessViewHolder, position: Int) {
-        val g = gyms[position]
-        // get the data from Gym class
-        val name = g.name
-        val hours = g.hours
-
-        // if the gym is open or not
-        val open = g.isOpen
-        var openClosed = "OPEN"
-        if (!open) {
-            openClosed = "CLOSED"
-            // set background to red for closed
-            holder.itemView.gym_status_view.setBackgroundResource(R.drawable.label_red)
-        } else {
-            holder.itemView.gym_status_view.setBackgroundResource(R.drawable.label_green)
-        }
+        var extraIsVisible = false
+        var hasExtraData = false
 
-        // get first word in name
-        if (name == null) {
-            holder.itemView.visibility = View.GONE
-            return
+        fun getExtraData(context: Context, activity: Activity, studentLife : StudentLife,
+            room: FitnessRoom
+        ) {
+            if (hasExtraData) return
+            room.roomId?.let { studentLife.getFitnessRoomUsage(it, 3, "week").subscribe(
+                { roomUsage ->
+                    createBarChart(context, roomUsage)
+                    activity.runOnUiThread {
+                        hasExtraData = true
+                        showExtra()
+                    }
+                }, {
+                    Log.e("Fitness Adapter", "Error loading room usage", it)
+                    Toast.makeText(context, "Error loading room", Toast.LENGTH_SHORT).show()
+                }
+            )}
         }
-        val i = name.indexOf(' ')
-        var simpName: String = name
-        if (i >= 0) {
-            simpName = name.substring(0, i)
+        private fun createBarChart(context: Context, roomData: FitnessRoomUsage) {
+            val entries: MutableList<BarEntry> = ArrayList()
+            val labels: MutableList<String> = ArrayList()
+            val colors: MutableList<Int> = ArrayList()
+
+            val blue = Color.parseColor("#A3CBF2")
+            val darkBlue = Color.parseColor("#1280F0")
+
+            val timeData = roomData.roomUsage
+            val curHour = LocalDateTime.now().hour
+            var mxUsage = 0f
+            // assume that we start at 6am and end at 11 pm
+            for (i in 6..23) {
+                val v = if (timeData == null) 0f else timeData[i.toString()] ?: 0f
+                mxUsage = maxOf(mxUsage, v)
+                entries.add(BarEntry((i - 6).toFloat(), v))
+                colors.add(if (i == curHour) darkBlue else blue)
+                labels.add(if (i > 12) "${i - 12}pm" else "${i}am")
+            }
+
+            barChart.xAxis.valueFormatter = IndexAxisValueFormatter(labels)
+
+            val set = BarDataSet(entries, "BarDataSet")
+
+            set.setDrawValues(false)
+            set.colors = colors
+
+            val data = BarData(set)
+            data.isHighlightEnabled = false
+            data.barWidth = 0.5f // set custom bar width
+            val tf = ResourcesCompat.getFont(context, R.font.sf_pro_display_regular)
+            barChart.xAxis.typeface = tf
+
+            val leftAxis: YAxis = barChart.axisLeft
+            leftAxis.setDrawGridLines(false)
+            leftAxis.setDrawAxisLine(false)
+            leftAxis.setDrawLabels(false)
+
+            leftAxis.axisMinimum = -0.05f * mxUsage
+            leftAxis.axisMaximum = mxUsage
+
+            val rightAxis: YAxis = barChart.axisRight
+            rightAxis.setDrawGridLines(false)
+            rightAxis.setDrawAxisLine(false)
+            rightAxis.setDrawLabels(false)
+
+            val xAxis : XAxis = barChart.xAxis
+            xAxis.setDrawGridLines(false)
+            xAxis.axisLineWidth = 1f
+            xAxis.position = XAxis.XAxisPosition.BOTTOM
+            xAxis.setDrawAxisLine(true)
+
+            barChart.legend.isEnabled = false
+            barChart.setDrawBorders(false)
+            barChart.setFitBars(true)
+            barChart.description.isEnabled = false
+            barChart.setScaleEnabled(false)
+
+            barChart.renderer = RoundedBarChartRenderer(barChart, barChart.animator,
+                barChart.viewPortHandler, 50.0f)
+
+            barChart.data = data
+
+            barChart.invalidate() //refresh the bar chart
         }
-        simpName = simpName.toLowerCase()
 
-        // build image resource name from simpName
-        val src_name = "gym_$simpName"
+        fun showExtra() {
+            val view = extraInfoView
+
+            if (!extraIsVisible) {
+                view.visibility = View.VISIBLE
+                view.alpha = 0.0f
+
+                view.animate()
+                    .alpha(1.0f)
+
+                val rotate = RotateAnimation(
+                    0f,
+                    90f,
+                    Animation.RELATIVE_TO_SELF,
+                    0.5f,
+                    Animation.RELATIVE_TO_SELF,
+                    0.5f
+                )
+                rotate.duration = 200
+                rotate.fillAfter = true
+                rotate.interpolator = LinearInterpolator()
+                arrowView.startAnimation(rotate)
+            } else {
+                view.visibility = View.GONE
 
-        // get resource identifier
-        var identifier = mContext.resources.getIdentifier(src_name, "drawable", mContext.packageName)
-        if (identifier == 0) { // if the src name is invalid
-            identifier = mContext.resources.getIdentifier("gym_fox", "drawable", mContext.packageName)
+                val rotate = RotateAnimation(
+                    90f,
+                    0f,
+                    Animation.RELATIVE_TO_SELF,
+                    0.5f,
+                    Animation.RELATIVE_TO_SELF,
+                    0.5f
+                )
+                rotate.duration = 10
+                rotate.fillAfter = true
+                rotate.interpolator = LinearInterpolator()
+                arrowView.startAnimation(rotate)
+            }
+            extraIsVisible = !extraIsVisible
         }
+    }
 
-        // set image
-        Picasso.get().load(identifier).fit().centerCrop().into(holder.itemView.gym_image_view)
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        mContext = parent.context
+        mActivity = mContext as MainActivity
+        mStudentLife = MainActivity.studentLifeInstance
 
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.fitness_list_item, parent, false)
 
-        // update ViewHolder
-        holder.itemView.gym_name_view.text = name
-        holder.itemView.gym_status_view.text = openClosed
-        holder.itemView.gym_hours_view.text = intervalsToString(hours)
+        return ViewHolder(view)
     }
 
+    override fun onViewAttachedToWindow(holder: ViewHolder) {
+        // re-rotate the image if the extra information panels are open
+        if (holder.extraIsVisible) {
+            val rotate = RotateAnimation(
+                0f,
+                90f,
+                Animation.RELATIVE_TO_SELF,
+                0.5f,
+                Animation.RELATIVE_TO_SELF,
+                0.5f
+            )
+            rotate.duration = 10
+            rotate.fillAfter = true
+            rotate.interpolator = LinearInterpolator()
+            holder.arrowView.startAnimation(rotate)
+        }
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+
+        val room = dataModel.getRoom(isFavorite, position)
+        holder.roomView.text = room.roomName
+
+        // check if the room is currently open
+        // NOT time zone safe
+        val currentTime = LocalTime.now()
 
-    // turn list of hours into string
-    private fun intervalsToString(hours: List<Interval>?): String {
-        if (hours == null) {
-            return "" // no hours, return empty string
+        // dayOfWeek gives Sunday -> 0, Monday -> 1, etc.
+        // but we want 0 -> monday
+        val dayOfWeek = (ZonedDateTime.now().dayOfWeek.value + 6) % 7
+
+        // the open and close time lists start with monday
+        val openTimeString = room.openTimeList?.get(dayOfWeek)
+        val closeTimeString = room.closeTimeList?.get(dayOfWeek)
+
+        val openTime = LocalTime.parse(openTimeString)
+        val closeTime = LocalTime.parse(closeTimeString)
+
+        val isOpen = currentTime.isAfter(openTime) and currentTime.isBefore(closeTime)
+        if (isOpen) {
+            holder.statusView.setText(R.string.fitness_room_open)
+            holder.statusView.background = ContextCompat.getDrawable(mContext, R.drawable.label_green)
+        } else {
+            holder.statusView.setText(R.string.fitness_room_closed)
+            holder.statusView.background = ContextCompat.getDrawable(mContext, R.drawable.label_red)
         }
-        val i1 = hours[0]
-        // first check if it's all day
-        if (i1 == GymHours.allDayInterval) {
-            return ""
+
+        // format and assign the times
+        val timeFormatter = DateTimeFormatter.ofPattern("hh:mm a")
+        val hours = "${openTime.format(timeFormatter)} - ${closeTime.format(timeFormatter)}"
+        holder.hoursView.text = hours
+
+        // format and assign the times for the rest of the week
+        // definitely not the best way to do this, but I am lazy
+
+        val mfIndex = if (dayOfWeek < 5) dayOfWeek else 0
+        val mfOpenTime = LocalTime.parse(room.openTimeList?.get(mfIndex))
+        val mfCloseTime = LocalTime.parse(room.closeTimeList?.get(mfIndex))
+        val mfHours = "${mfOpenTime.format(timeFormatter)} - ${mfCloseTime.format(timeFormatter)}"
+
+        val saturdayIndex = 5
+        val saturdayOpenTime = LocalTime.parse(room.openTimeList?.get(saturdayIndex))
+        val saturdayCloseTime = LocalTime.parse(room.closeTimeList?.get(saturdayIndex))
+        val saturdayHours = "${saturdayOpenTime.format(timeFormatter)} - ${saturdayCloseTime.format(timeFormatter)}"
+
+        val sundayIndex = 6
+        val sundayOpenTime = LocalTime.parse(room.openTimeList?.get(sundayIndex))
+        val sundayCloseTime = LocalTime.parse(room.closeTimeList?.get(sundayIndex))
+        val sundayHours = "${sundayOpenTime.format(timeFormatter)} - ${sundayCloseTime.format(timeFormatter)}"
+
+
+        (holder.view.findViewById(R.id.fitness_sunday_time) as TextView).text = sundayHours
+        (holder.view.findViewById(R.id.fitness_mf_time) as TextView).text = mfHours
+        (holder.view.findViewById(R.id.fitness_sat_time) as TextView).text = saturdayHours
+
+        val blue = Color.parseColor("#1280F0")
+
+        if (dayOfWeek < 5) {
+            (holder.view.findViewById(R.id.fitness_mf) as TextView).setTextColor(blue)
+            (holder.view.findViewById(R.id.fitness_mf_time) as TextView).setTextColor(blue)
+        } else if (dayOfWeek == 5) {
+            (holder.view.findViewById(R.id.fitness_sat) as TextView).setTextColor(blue)
+            (holder.view.findViewById(R.id.fitness_sat_time) as TextView).setTextColor(blue)
+        } else {
+            (holder.view.findViewById(R.id.fitness_sunday) as TextView).setTextColor(blue)
+            (holder.view.findViewById(R.id.fitness_sunday_time) as TextView).setTextColor(blue)
+
         }
-        // otherwise add intervals to String
-        val sb = StringBuilder()
-        sb.append(intervalToString(i1))
-        for (ii in 1 until hours.size) {
-            val interval = hours[ii]
-            sb.append(" | ")
-            sb.append(intervalToString(interval))
+
+        // make progress bar invisible
+        holder.progressBar.visibility = View.INVISIBLE
+
+        // get image from url
+        Glide.with(mContext).load(room.imageURL).into(holder.imageView)
+
+        val busyness : String
+
+        // update the capacity
+        if (room.capacity == null) {
+            busyness = "N/A"
+            holder.capacityView.text = "N/A"
+            holder.capacityViewCircle.progress = 0
+        } else {
+            val capacityInt = room.capacity!!.toInt()
+            val capacity = "$capacityInt%"
+
+            busyness = if (capacityInt == 0) {
+                "Empty"
+            } else if (capacityInt < 10) {
+                "Not very busy"
+            } else if (capacityInt < 30) {
+                "Slightly busy"
+            } else if (capacityInt < 60) {
+                "Pretty busy"
+            } else if (capacityInt < 90) {
+                "Extremely busy"
+            } else {
+                "Packed"
+            }
+
+            holder.capacityViewCircle.progress = capacityInt
+            holder.capacityView.text = capacity
         }
 
-        return sb.toString()
-    }
+        // update the time and capacity
+        var curHour = currentTime.hour
 
-    private fun intervalToString(interval: Interval): String {
-        val d1 = interval.start
-        val d2 = interval.end
+        val amPm = if (curHour >= 12) "PM" else "AM"
+        if (curHour > 12) curHour -= 12
+        if (curHour == 0) curHour += 12
 
-        return formatTime(d1) + " - " + formatTime(d2)
-    }
+        val timeCap = "<a><font color = #1280F0>$curHour $amPm:</a> $busyness"
+        holder.timeCapacityView.text = HtmlCompat.fromHtml(timeCap, HtmlCompat.FROM_HTML_MODE_COMPACT)
 
-    private fun formatTime(time: DateTime): String {
-        return if (time.toString("mm") == "00") {
-            time.toString("h a")
+        // update the time for last updated
+        val lastUpdateTime = ZonedDateTime.parse(room.lastUpdated)
+        val duration = Duration.between(lastUpdateTime, ZonedDateTime.now())
+
+        val updHours = duration.toHours()
+
+        val lastUpd = if (updHours > 2L) {
+            "Updated $updHours hours ago"
+        } else if (updHours == 1L) {
+            "Updated $updHours hour ago"
         } else {
-            time.toString("h:mm a")
+            val updMinutes = duration.toMinutes()
+            "Updated $updMinutes minutes ago"
         }
-    }
 
-    override fun getItemCount(): Int {
-        return gyms.size
-    }
+        holder.lastUpdatedView.text = lastUpd
 
-    inner class FitnessViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val view = itemView
+        holder.mainView.bringToFront()
+        // garbage code starts here ------------------------------------
+
+        holder.mainView.setOnClickListener {
+            if (holder.hasExtraData) {
+                holder.showExtra()
+            } else {
+                holder.getExtraData(mContext, mActivity, mStudentLife, room)
+            }
+        }
     }
+
+    override fun getItemCount() = dataModel.getNumber(isFavorite)
 }
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessHeaderAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessHeaderAdapter.kt
new file mode 100644
index 000000000..1ac7323f5
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessHeaderAdapter.kt
@@ -0,0 +1,34 @@
+package com.pennapps.labs.pennmobile.adapters
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.pennapps.labs.pennmobile.R
+
+class FitnessHeaderAdapter(private val text : String) : RecyclerView.Adapter<FitnessHeaderAdapter.ViewHolder>() {
+    class ViewHolder(view: View) :RecyclerView.ViewHolder(view) {
+        val headerView : TextView
+        init {
+            headerView = view.findViewById(R.id.fitness_section_title_text)
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.fitness_section_title, parent, false)
+
+        return ViewHolder(view)
+    }
+
+    override fun getItemCount(): Int {
+        return 1
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.headerView.text = text
+    }
+
+}
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessPagerAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessPagerAdapter.kt
new file mode 100644
index 000000000..1017e2168
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessPagerAdapter.kt
@@ -0,0 +1,16 @@
+package com.pennapps.labs.pennmobile.adapters
+
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.pennapps.labs.pennmobile.DiningFragment
+import com.pennapps.labs.pennmobile.PottruckFragment
+
+class FitnessPagerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
+    override fun getItemCount(): Int = 2
+    override fun createFragment(position: Int): Fragment {
+        if (position == 0) {
+            return PottruckFragment()
+        }
+        return PottruckFragment()
+    }
+}
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessPreferenceAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessPreferenceAdapter.kt
new file mode 100644
index 000000000..3867a72bb
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessPreferenceAdapter.kt
@@ -0,0 +1,56 @@
+package com.pennapps.labs.pennmobile.adapters
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.classes.FitnessAdapterDataModel
+
+class FitnessPreferenceAdapter(private val dataModel: FitnessAdapterDataModel)
+    : RecyclerView.Adapter<FitnessPreferenceAdapter.ViewHolder>() {
+    class ViewHolder(view: View) :RecyclerView.ViewHolder(view) {
+        val v : View
+        val imv : ImageView
+        val textView : TextView
+
+        init {
+            v = view
+            imv = v.findViewById(R.id.fitness_preference_select)
+            textView = v.findViewById(R.id.fitness_preference_text)
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.fitness_preference_list_item, parent, false)
+
+        return ViewHolder(view)
+    }
+
+    override fun getItemCount(): Int {
+        return dataModel.getTot()
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val room = dataModel.getRoomAll(position)
+        holder.textView.text = room.roomName
+
+        val rid : Int = room.roomId!!
+
+        if (dataModel.isFavorite(rid)) {
+            holder.imv.visibility = View.VISIBLE
+        }
+
+        holder.v.setOnClickListener {
+            val b = dataModel.flipState(rid)
+            if (b) {
+                holder.imv.visibility = View.VISIBLE
+            } else {
+                holder.imv.visibility = View.INVISIBLE
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MainPagerAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MainPagerAdapter.kt
index 65b965e43..a3877776c 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MainPagerAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MainPagerAdapter.kt
@@ -38,4 +38,4 @@ class MainPagerAdapter(fragmentManager: FragmentManager, lifecycle: Lifecycle?)
         const val MORE_POSITION = 4
         const val COUNT = 5
     }
-}
\ No newline at end of file
+}
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java
index 89fc598d3..347107821 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java
@@ -7,6 +7,9 @@
 import com.pennapps.labs.pennmobile.classes.DiningHall;
 import com.pennapps.labs.pennmobile.classes.DiningPreferences;
 import com.pennapps.labs.pennmobile.classes.DiningRequest;
+import com.pennapps.labs.pennmobile.classes.FitnessRequest;
+import com.pennapps.labs.pennmobile.classes.FitnessRoom;
+import com.pennapps.labs.pennmobile.classes.FitnessRoomUsage;
 import com.pennapps.labs.pennmobile.classes.FlingEvent;
 import com.pennapps.labs.pennmobile.classes.GSR;
 import com.pennapps.labs.pennmobile.classes.GSRBookingResult;
@@ -196,6 +199,22 @@ void createPollVote(
             @Field("id_hash") String idHash,
             @Field("poll_options") ArrayList<Integer> pollOptions,
             Callback<Response> callback);
+    @GET("/penndata/fitness/rooms/")
+    Observable<List<FitnessRoom>> getFitnessRooms();
 
+    @GET("/penndata/fitness/usage/{id}")
+    Observable<FitnessRoomUsage> getFitnessRoomUsage(
+            @Path("id") int id,
+            @Query("num_samples") int samples,
+            @Query("group_by") String groupBy);
 
+    @GET("/penndata/fitness/preferences")
+    Observable<List<Integer>> getFitnessPreferences(
+            @Header("Authorization") String bearerToken);
+
+    @POST("/penndata/fitness/preferences/")
+    void sendFitnessPref(
+            @Header("Authorization") String bearerToken,
+            @Body FitnessRequest rooms,
+            Callback<Response> callback);
 }
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessAdapterDataModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessAdapterDataModel.kt
new file mode 100644
index 000000000..ca1f3f0de
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessAdapterDataModel.kt
@@ -0,0 +1,12 @@
+package com.pennapps.labs.pennmobile.classes
+
+interface FitnessAdapterDataModel {
+    fun flipState(roomId: Int) : Boolean
+    fun getNumber(isFavorite: Boolean) : Int
+    fun getRoom(isFavorite: Boolean, position: Int) : FitnessRoom
+
+    fun getTot() : Int
+    fun getRoomAll(roomId: Int) : FitnessRoom
+
+    fun isFavorite(roomId: Int) : Boolean
+}
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessPreferenceViewModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessPreferenceViewModel.kt
new file mode 100644
index 000000000..6c3fbcd6c
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessPreferenceViewModel.kt
@@ -0,0 +1,118 @@
+package com.pennapps.labs.pennmobile.classes
+
+import android.app.Activity
+import android.util.Log
+import androidx.preference.PreferenceManager
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.api.OAuth2NetworkManager
+import com.pennapps.labs.pennmobile.api.StudentLife
+import retrofit.ResponseCallback
+import retrofit.RetrofitError
+import retrofit.client.Response
+
+class FitnessPreferenceViewModel(private val activity: Activity,
+    private val studentLife: StudentLife, private val roomList: List<FitnessRoom>) : FitnessAdapterDataModel {
+
+    private val roomTot = roomList.size
+
+    // hashset of the favorite room ids
+    private val favoriteRooms : HashSet<Int>  = hashSetOf()
+    private val prevFavoriteRooms :  HashSet<Int> = hashSetOf()
+
+    // hashmap that maps position --> position in array
+    private val positionMap : Array<Int> = (0 until roomTot).toList().toTypedArray()
+
+    override fun flipState(roomId: Int) : Boolean {
+        if (favoriteRooms.contains(roomId)) {
+            favoriteRooms.remove(roomId)
+            return false
+        }
+        favoriteRooms.add(roomId)
+        return true
+    }
+
+    override fun getNumber(isFavorite: Boolean): Int {
+        if (isFavorite) {
+            return favoriteRooms.size
+        }
+        return roomTot - favoriteRooms.size
+    }
+
+    override fun getRoom(isFavorite: Boolean, position: Int): FitnessRoom {
+        if (isFavorite) {
+            return roomList[positionMap[position]]
+        }
+        return roomList[positionMap[position + favoriteRooms.size]]
+    }
+
+    override fun getTot(): Int {
+        return roomTot
+    }
+
+    override fun getRoomAll(roomId: Int): FitnessRoom {
+        return roomList[roomId]
+    }
+
+    override fun isFavorite(roomId: Int): Boolean {
+        return favoriteRooms.contains(roomId)
+    }
+
+    fun clearFavorites() {
+        favoriteRooms.clear()
+    }
+
+    fun addId(roomId: Int) {
+        favoriteRooms.add(roomId)
+    }
+
+    fun updatePositionMap() {
+        val numFavorites = favoriteRooms.size
+        var curFavIndex = 0
+        var curOtherIndex = 0
+        for (i in 0 until roomTot) {
+            if (favoriteRooms.contains(roomList[i].roomId)) {
+                positionMap[curFavIndex++] = i
+            } else {
+                positionMap[numFavorites + curOtherIndex++] = i
+            }
+        }
+    }
+
+    fun savePreferences() {
+        prevFavoriteRooms.clear()
+        prevFavoriteRooms.addAll(favoriteRooms)
+    }
+
+    fun restorePreferences() {
+        favoriteRooms.clear()
+        favoriteRooms.addAll(prevFavoriteRooms)
+    }
+
+    fun updateRemotePreferences(mActivity : MainActivity) {
+        val sp = PreferenceManager.getDefaultSharedPreferences(activity)
+        val context = activity.applicationContext
+
+        OAuth2NetworkManager(mActivity).getAccessToken {
+
+            val bearerToken =
+                "Bearer " + sp.getString(context.getString(R.string.access_token), "").toString()
+
+
+            studentLife.sendFitnessPref(bearerToken, FitnessRequest(ArrayList(favoriteRooms)),
+                object : ResponseCallback() {
+                    override fun success(response: Response) {
+                        Log.i("Fitness Preference View Model", "fitness preferences saved")
+                    }
+
+                    override fun failure(error: RetrofitError) {
+                        Log.e(
+                            "Fitness Preference View Model", "Error saving fitness " +
+                                    "preferences: $error", error
+                        )
+                    }
+                })
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRequest.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRequest.kt
new file mode 100644
index 000000000..ec79705f5
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRequest.kt
@@ -0,0 +1,5 @@
+package com.pennapps.labs.pennmobile.classes
+
+class FitnessRequest(favoriteFitnessRooms: ArrayList<Int>) {
+    var rooms: ArrayList<Int> = favoriteFitnessRooms
+}
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRoom.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRoom.kt
new file mode 100644
index 000000000..6df1ce902
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRoom.kt
@@ -0,0 +1,38 @@
+package com.pennapps.labs.pennmobile.classes
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+class FitnessRoom {
+    @SerializedName("id")
+    @Expose
+    var roomId: Int? = null
+
+    @SerializedName("name")
+    @Expose
+    var roomName: String? = null
+
+    @SerializedName("last_updated")
+    @Expose
+    var lastUpdated: String? = null
+
+    @SerializedName("count")
+    @Expose
+    var count: Int? = null
+
+    @SerializedName("capacity")
+    @Expose
+    var capacity: Float? = null
+
+    @SerializedName("open")
+    @Expose
+    var openTimeList: List<String>? = null
+
+    @SerializedName("close")
+    @Expose
+    var closeTimeList: List<String>? = null
+
+    @SerializedName("image_url")
+    @Expose
+    var imageURL: String? = null
+}
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRoomUsage.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRoomUsage.kt
new file mode 100644
index 000000000..4c08af071
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRoomUsage.kt
@@ -0,0 +1,22 @@
+package com.pennapps.labs.pennmobile.classes
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+class FitnessRoomUsage {
+    @SerializedName("room_name")
+    @Expose
+    var roomName: String? = null
+
+    @SerializedName("start_date")
+    @Expose
+    var startDate: String? = null
+
+    @SerializedName("end_date")
+    @Expose
+    var endDate: String? = null
+
+    @SerializedName("usage")
+    @Expose
+    var roomUsage: Map<String?, Float?>? = null
+}
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/RoundedBarChartRenderer.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/RoundedBarChartRenderer.kt
new file mode 100644
index 000000000..5fdd5e529
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/RoundedBarChartRenderer.kt
@@ -0,0 +1,146 @@
+package com.pennapps.labs.pennmobile.classes
+
+import android.graphics.Canvas
+import com.github.mikephil.charting.animation.ChartAnimator
+import com.github.mikephil.charting.buffer.BarBuffer
+import com.github.mikephil.charting.charts.BarChart
+import com.github.mikephil.charting.highlight.Highlight
+import com.github.mikephil.charting.interfaces.datasets.IBarDataSet
+import com.github.mikephil.charting.model.GradientColor
+import com.github.mikephil.charting.renderer.BarChartRenderer
+import com.github.mikephil.charting.utils.ViewPortHandler
+
+class RoundedBarChartRenderer constructor(
+    chart: BarChart,
+    animator: ChartAnimator,
+    vpHandler: ViewPortHandler,
+    cornersDimen: Float
+) : BarChartRenderer(chart, animator, vpHandler) {
+    private val mCornersDimen : Float
+
+    init {
+        mCornersDimen = cornersDimen
+    }
+
+    override fun drawDataSet(c: Canvas, dataSet: IBarDataSet, index: Int) {
+
+        val trans: com.github.mikephil.charting.utils.Transformer =
+            mChart.getTransformer(dataSet.getAxisDependency())
+
+        mBarBorderPaint.setColor(dataSet.getBarBorderColor())
+        mBarBorderPaint.setStrokeWidth(
+            com.github.mikephil.charting.utils.Utils.convertDpToPixel(
+                dataSet.getBarBorderWidth()
+            )
+        )
+
+        val drawBorder: Boolean = dataSet.getBarBorderWidth() > 0f
+
+        val phaseX: Float = mAnimator.getPhaseX()
+        val phaseY: Float = mAnimator.getPhaseY()
+
+        // initialize the buffer
+        val buffer: BarBuffer = mBarBuffers.get(index)
+        buffer.setPhases(phaseX, phaseY)
+        buffer.setDataSet(index)
+        buffer.setInverted(mChart.isInverted(dataSet.getAxisDependency()))
+        buffer.setBarWidth(mChart.getBarData().getBarWidth())
+
+        buffer.feed(dataSet)
+
+        trans.pointValuesToPixel(buffer.buffer)
+
+        val isSingleColor = dataSet.getColors().size == 1
+
+        if (isSingleColor) {
+            mRenderPaint.setColor(dataSet.getColor())
+        }
+
+        for (j in 0 until buffer.size() step 4) {
+
+            if (!mViewPortHandler.isInBoundsLeft(buffer.buffer.get(j + 2))) continue
+
+            if (!mViewPortHandler.isInBoundsRight(buffer.buffer.get(j))) break
+
+            if (!isSingleColor) {
+                // Set the color for the currently drawn value. If the index
+                // is out of bounds, reuse colors.
+                mRenderPaint.setColor(dataSet.getColor(j / 4))
+            }
+
+            if (dataSet.getGradientColor() != null) {
+                val gradientColor: GradientColor = dataSet.getGradientColor()
+                mRenderPaint.setShader(
+                    android.graphics.LinearGradient(
+                        buffer.buffer.get(j),
+                        buffer.buffer.get(j + 3),
+                        buffer.buffer.get(j),
+                        buffer.buffer.get(j + 1),
+                        gradientColor.getStartColor(),
+                        gradientColor.getEndColor(),
+                        android.graphics.Shader.TileMode.MIRROR
+                    )
+                )
+            }
+
+            if (dataSet.getGradientColors() != null) {
+                mRenderPaint.setShader(
+                    android.graphics.LinearGradient(
+                        buffer.buffer.get(j),
+                        buffer.buffer.get(j + 3),
+                        buffer.buffer.get(j),
+                        buffer.buffer.get(j + 1),
+                        dataSet.getGradientColor(j / 4).getStartColor(),
+                        dataSet.getGradientColor(j / 4).getEndColor(),
+                        android.graphics.Shader.TileMode.MIRROR
+                    )
+                )
+            }
+
+            c.drawRoundRect(
+                buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
+                buffer.buffer[j + 3], mCornersDimen, mCornersDimen, mRenderPaint
+            )
+
+            if (drawBorder) {
+                c.drawRoundRect(
+                    buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
+                    buffer.buffer[j + 3], mCornersDimen, mCornersDimen, mBarBorderPaint
+                )
+            }
+        }
+    }
+
+    override fun drawHighlighted(c: Canvas?, indices: Array<out Highlight>?) {
+        val barData = mChart.barData
+
+        for (high in indices!!) {
+            val set = barData.getDataSetByIndex(high.dataSetIndex)
+            if (set == null || !set.isHighlightEnabled) continue
+            val e = set.getEntryForXValue(high.x, high.y)
+            if (!isInBoundsX(e, set)) continue
+            val trans = mChart.getTransformer(set.axisDependency)
+            mHighlightPaint.color = set.highLightColor
+            mHighlightPaint.alpha = set.highLightAlpha
+            val isStack = high.stackIndex >= 0 && e.isStacked
+            val y1: Float
+            val y2: Float
+            if (isStack) {
+                if (mChart.isHighlightFullBarEnabled) {
+                    y1 = e.positiveSum
+                    y2 = -e.negativeSum
+                } else {
+                    val range = e.ranges[high.stackIndex]
+                    y1 = range.from
+                    y2 = range.to
+                }
+            } else {
+                y1 = e.y
+                y2 = 0f
+            }
+            prepareBarHighlight(e.x, y1, y2, barData.barWidth / 2f, trans)
+            setHighlightDrawPos(high, mBarRect)
+            c!!.drawRoundRect(mBarRect, mCornersDimen, mCornersDimen, mHighlightPaint)
+        }
+    }
+}
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more_fragments/PreferenceFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more_fragments/PreferenceFragment.kt
index bce557bff..daca7dd47 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more_fragments/PreferenceFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more_fragments/PreferenceFragment.kt
@@ -120,6 +120,17 @@ class PreferenceFragment : PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
+        val fitnessFeaturePref: Preference? = findPreference("pref_fitness_feature")
+        fitnessFeaturePref?.setOnPreferenceClickListener {
+            mActivity.supportFragmentManager.beginTransaction()
+                .replace(R.id.content_frame, PottruckFragment())
+                .addToBackStack(null)
+                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
+                .commit()
+            return@setOnPreferenceClickListener true
+        }
+
+
         val pennLabsPref: Preference? = findPreference("pref_labs_link")
         pennLabsPref?.setOnPreferenceClickListener {
             openLink(PennLabs)
diff --git a/PennMobile/src/main/res/drawable-mdpi/ic_about2.png b/PennMobile/src/main/res/drawable-mdpi/ic_about2.png
new file mode 100644
index 000000000..b260ba9fe
Binary files /dev/null and b/PennMobile/src/main/res/drawable-mdpi/ic_about2.png differ
diff --git a/PennMobile/src/main/res/drawable-mdpi/ic_contacts2.png b/PennMobile/src/main/res/drawable-mdpi/ic_contacts2.png
new file mode 100644
index 000000000..9ec240099
Binary files /dev/null and b/PennMobile/src/main/res/drawable-mdpi/ic_contacts2.png differ
diff --git a/PennMobile/src/main/res/drawable-mdpi/ic_fitness2.png b/PennMobile/src/main/res/drawable-mdpi/ic_fitness2.png
new file mode 100644
index 000000000..4dbe07ec7
Binary files /dev/null and b/PennMobile/src/main/res/drawable-mdpi/ic_fitness2.png differ
diff --git a/PennMobile/src/main/res/drawable-mdpi/ic_news2.png b/PennMobile/src/main/res/drawable-mdpi/ic_news2.png
new file mode 100644
index 000000000..c5ebfb2e3
Binary files /dev/null and b/PennMobile/src/main/res/drawable-mdpi/ic_news2.png differ
diff --git a/PennMobile/src/main/res/drawable/icons8_done_24.png b/PennMobile/src/main/res/drawable/icons8_done_24.png
new file mode 100644
index 000000000..01391b391
Binary files /dev/null and b/PennMobile/src/main/res/drawable/icons8_done_24.png differ
diff --git a/PennMobile/src/main/res/drawable/rounded_dialog.xml b/PennMobile/src/main/res/drawable/rounded_dialog.xml
new file mode 100644
index 000000000..64153e82a
--- /dev/null
+++ b/PennMobile/src/main/res/drawable/rounded_dialog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/gray" />
+    <corners android:radius="12dp" />
+</shape>
\ No newline at end of file
diff --git a/PennMobile/src/main/res/layout/fitness_list_item.xml b/PennMobile/src/main/res/layout/fitness_list_item.xml
index 8a0707e7c..cd185cb64 100644
--- a/PennMobile/src/main/res/layout/fitness_list_item.xml
+++ b/PennMobile/src/main/res/layout/fitness_list_item.xml
@@ -1,71 +1,328 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fitness_list_item_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_weight="10"
+    >
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/fitness_list_info_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="10"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        >
 
     <androidx.cardview.widget.CardView
-        android:id="@+id/item_gym_image_cardview"
-        android:layout_width="140dp"
-        android:layout_height="89dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
+        android:id="@+id/item_fitness_image_cardview"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="4dp"
         android:elevation="0dp"
         app:cardCornerRadius="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1.57"
+        app:layout_constraintEnd_toStartOf="@+id/fitness_image_guideline"
+        app:layout_constraintHorizontal_weight="6"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        >
 
         <ImageView
-            android:id="@+id/gym_image_view"
+            android:id="@+id/item_fitness_image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="centerCrop" />
+            android:scaleType="centerCrop"
+            />
     </androidx.cardview.widget.CardView>
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/fitness_image_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.45"
+        />
+
     <TextView
-        android:id="@+id/gym_status_view"
-        style="@style/DiningStatusLabel"
-        android:layout_centerVertical="true"
+        android:id="@+id/item_fitness_status"
+        style="@style/FitnessStatusLabel"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
-        app:layout_constraintBottom_toTopOf="@+id/gym_hours_view"
-        app:layout_constraintStart_toEndOf="@+id/item_gym_image_cardview"
-        app:layout_constraintTop_toBottomOf="@+id/gym_name_view"
+        android:layout_marginTop="8dp"
+        app:layout_constraintStart_toEndOf="@+id/item_fitness_image_cardview"
+        app:layout_constraintTop_toBottomOf="@+id/item_fitness_name"
         tools:background="@drawable/label_green"
-        tools:text="Open" />
+        tools:text="Open"
+        />
 
     <TextView
-        android:id="@+id/gym_name_view"
+        android:id="@+id/item_fitness_name"
         style="@style/HallName"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginTop="6dp"
-        app:layout_constraintStart_toEndOf="@+id/item_gym_image_cardview"
-        app:layout_constraintTop_toTopOf="@+id/item_gym_image_cardview"
-        tools:text="Pottruck" />
+        android:layout_marginTop="4dp"
+        android:ellipsize="marquee"
+        android:fontFamily="@font/sf_pro_display_medium"
+        android:singleLine="true"
+        app:layout_constraintEnd_toStartOf="@+id/fitness_loading_guideline"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@id/item_fitness_image_cardview"
+        app:layout_constraintTop_toTopOf="@+id/item_fitness_image_cardview"
+        tools:text="Pottruck Fitness"
+        />
 
     <TextView
-        android:id="@+id/gym_hours_view"
+        android:id="@+id/item_fitness_hours"
         style="@style/Menu"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
+        android:layout_width="0dp"
+        android:layout_height="22dp"
         android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
-        android:layout_marginBottom="6dp"
-        android:autoSizeMaxTextSize="13sp"
-        android:autoSizeMinTextSize="9sp"
-        android:autoSizeStepGranularity="2sp"
-        android:autoSizeTextType="uniform"
-        app:layout_constraintBottom_toBottomOf="@+id/item_gym_image_cardview"
-        app:layout_constraintStart_toEndOf="@+id/item_gym_image_cardview"
-        tools:text="Open"
-        tools:visibility="visible" />
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        app:autoSizeMaxTextSize="13sp"
+        app:autoSizeMinTextSize="9sp"
+        app:autoSizeStepGranularity="2sp"
+        app:autoSizeTextType="uniform"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/item_fitness_image_cardview"
+        app:layout_constraintTop_toBottomOf="@+id/item_fitness_status"
+        tools:text="Closes at 9:00PM"
+        />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/fitness_loading_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.9"
+        />
+
+    <ProgressBar
+        android:id="@+id/fitness_progress"
+        style="@android:style/Widget.ProgressBar.Small"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="12dp"
+        android:adjustViewBounds="true"
+        android:indeterminate="true"
+        android:indeterminateTint="@color/color_primary"
+        android:indeterminateTintMode="src_in"
+        android:paddingStart="10dp"
+        android:paddingEnd="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        />
+
+    <ImageView
+        android:id="@+id/fitness_more_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="2dp"
+        android:src="@drawable/ic_chevron_right_black_24dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="@color/settings_grey" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <LinearLayout
+        android:id="@+id/fitness_list_extra_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="@+id/fitness_list_info_layout"
+        app:layout_constraintTop_toBottomOf="@+id/fitness_list_info_layout"
+        android:layout_margin="8dp"
+        android:paddingBottom="8dp"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:layout_margin="4dp"
+            app:cardCornerRadius="8dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:id="@+id/timeCapacity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="2 PM: Slightly Busy"
+                    android:fontFamily="@font/sf_pro_display_medium"
+                    android:layout_margin="10dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"/>
+
+                <TextView
+                    android:id="@+id/item_pottruck_last_updated"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="Updated 2 hours ago"
+                    android:fontFamily="@font/sf_pro_display_medium"
+                    android:layout_margin="10dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"/>
+
+                <com.github.mikephil.charting.charts.BarChart
+                    android:id="@+id/barchart_times"
+                    android:layout_width="match_parent"
+                    android:layout_height="110dp"
+                    app:layout_constraintTop_toBottomOf="@id/timeCapacity"
+                    android:layout_marginBottom="8dp" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        </androidx.cardview.widget.CardView>
+
+        <LinearLayout
+            android:id="@+id/linear_layout_extras"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <androidx.cardview.widget.CardView
+                android:layout_weight="2"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"
+                android:layout_margin="4dp"
+                app:cardCornerRadius="8dp"
+                app:layout_constraintRight_toRightOf="@+id/linear_layout_extras">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_margin="10dp"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_weight="1">
+                        <TextView
+                            android:id="@+id/fitness_sunday"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:text="@string/fitness_sunday"
+                            android:gravity="center_vertical|start" />
+                        <TextView
+                            android:id="@+id/fitness_sunday_time"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            tools:text="Closed"
+                            android:gravity="center_vertical|end"
+                            android:layout_weight="1"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_weight="1">
+                        <TextView
+                            android:id="@+id/fitness_mf"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:text="@string/fitness_mf"
+                            android:gravity="center_vertical|start" />
+                        <TextView
+                            android:id="@+id/fitness_mf_time"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            tools:text="6am-8pm"
+                            android:gravity="center_vertical|end"
+                            android:layout_weight="1"/>
+
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_weight="1">
+                        <TextView
+                            android:id="@+id/fitness_sat"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:text="@string/fitness_sat"
+                            android:gravity="center_vertical|start" />
+                        <TextView
+                            android:id="@+id/fitness_sat_time"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            tools:text="10:30am-11:30pm"
+                            android:gravity="center_vertical|end"
+                            android:layout_weight="1"/>
+
+                    </LinearLayout>
+
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dp"
+                app:cardCornerRadius="8dp"
+                app:layout_constraintRight_toRightOf="@+id/linear_layout_extras">
+
+                <com.google.android.material.progressindicator.CircularProgressIndicator
+                    android:id="@+id/item_pottruck_capacity_circle"
+                    android:layout_gravity="center"
+                    app:indicatorSize="90dp"
+                    android:progress="70"
+                    app:trackCornerRadius="5dp"
+                    app:trackThickness="8dp"
+                    app:trackColor="#DDD"
+                    app:indicatorColor="@color/logo_light_blue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"/>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_gravity="center">
+
+                    <TextView
+                        android:id="@+id/item_pottruck_capacity"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        tools:text="60%"
+                        android:textSize="18sp"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/fitness_capacity"
+                        android:textSize="12sp"/>
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+        </LinearLayout>
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/PennMobile/src/main/res/layout/fitness_preference_list_item.xml b/PennMobile/src/main/res/layout/fitness_preference_list_item.xml
new file mode 100644
index 000000000..84f119a60
--- /dev/null
+++ b/PennMobile/src/main/res/layout/fitness_preference_list_item.xml
@@ -0,0 +1,28 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="32dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:gravity="center_vertical"
+    android:layout_margin="10dp">
+
+    <TextView
+        android:id="@+id/fitness_preference_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:fontFamily="@font/sf_pro_display_medium"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"/>
+
+    <ImageView
+        android:id="@+id/fitness_preference_select"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="2dp"
+        android:layout_marginRight="2dp"
+        android:src="@drawable/icons8_done_24"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:visibility="gone"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/PennMobile/src/main/res/layout/fitness_section_title.xml b/PennMobile/src/main/res/layout/fitness_section_title.xml
new file mode 100644
index 000000000..e3abea3dd
--- /dev/null
+++ b/PennMobile/src/main/res/layout/fitness_section_title.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="15dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <TextView
+        android:id="@+id/fitness_section_title_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:fontFamily="@font/sf_pro_display_medium"
+        android:textSize="20sp"
+        android:paddingBottom="5dp"
+        android:text="asdf"/>
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        app:layout_constraintTop_toBottomOf="@+id/fitness_section_title_text"
+        android:background="#e0dfda"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/PennMobile/src/main/res/layout/fragment_dining.xml b/PennMobile/src/main/res/layout/fragment_dining.xml
index ce398db40..159bb9d07 100644
--- a/PennMobile/src/main/res/layout/fragment_dining.xml
+++ b/PennMobile/src/main/res/layout/fragment_dining.xml
@@ -28,8 +28,6 @@
 
         </androidx.appcompat.widget.Toolbar>
 
-        <!--<include layout="@layout/no_results" />-->
-
         <include layout="@layout/loading_panel" />
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
diff --git a/PennMobile/src/main/res/layout/fragment_dining_holder.xml b/PennMobile/src/main/res/layout/fragment_dining_holder.xml
index 14a107044..8601906dd 100644
--- a/PennMobile/src/main/res/layout/fragment_dining_holder.xml
+++ b/PennMobile/src/main/res/layout/fragment_dining_holder.xml
@@ -14,8 +14,7 @@
         android:background="@color/white"
         android:elevation="0dp"
         android:theme="@style/AppTheme.AppBarOverlay"
-        app:elevation="0dp"
-        tools:targetApi="lollipop">
+        app:elevation="0dp">
 
         <FrameLayout
             android:id="@+id/appbar_container"
diff --git a/PennMobile/src/main/res/layout/fragment_fitness_holder.xml b/PennMobile/src/main/res/layout/fragment_fitness_holder.xml
new file mode 100644
index 000000000..600622626
--- /dev/null
+++ b/PennMobile/src/main/res/layout/fragment_fitness_holder.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:showIn="@layout/activity_main">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_home_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:elevation="0dp"
+        android:theme="@style/AppTheme.AppBarOverlay"
+        app:elevation="0dp">
+
+        <FrameLayout
+            android:id="@+id/appbar_container"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/app_bar_height">
+
+            <TextView
+                android:id="@+id/date_view"
+                style="@style/title_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start|top"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="24dp" />
+
+            <TextView
+                android:id="@+id/title_view"
+                style="@style/title_fragment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start|bottom"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginBottom="4dp"
+                android:maxLines="1"
+                />
+
+            <ImageView
+                android:id="@+id/divider"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:visibility="invisible"
+                app:srcCompat="@drawable/ic_app_bar_divider" />
+
+        </FrameLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/internetConnectionFitnessHolder"
+            android:layout_width="match_parent"
+            android:layout_height="24dp"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            tools:ignore="MissingConstraints">
+
+            <TextView
+                android:id="@+id/internetConnection_message_fitness_holder"
+                style="@style/internet_error_message" />
+
+        </androidx.appcompat.widget.Toolbar>
+
+        <!--<include layout="@layout/no_results" />-->
+
+        <!--<include layout="@layout/loading_panel" />-->
+
+        <FrameLayout
+            android:id="@+id/fitness_fragment"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            tools:visibility="visible">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/fitness_text"
+                    style="@style/InfoText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginBottom="10dp"
+                    android:text="@string/pottruck"
+                    android:textSize="22sp"
+                    android:textStyle="bold"
+                    android:visibility="gone" />
+
+                <LinearLayout
+                    android:id="@+id/constraint"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    tools:showIn="@layout/activity_main">
+
+                    <com.google.android.material.tabs.TabLayout
+                        android:id="@+id/tabLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        app:layout_constraintBottom_toTopOf="@+id/pager"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:tabTextAppearance="@style/tab_text"
+                        app:tabSelectedTextColor="#257FE1"
+                        app:tabTextColor="#101E3B"/>
+
+                    <androidx.viewpager2.widget.ViewPager2
+                        android:id="@+id/pager"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+                </LinearLayout>
+
+            </LinearLayout>
+        </FrameLayout>
+
+    </LinearLayout>
+
+    <!-- Coordinator Layout used to position the SnackBar -->
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/snack_bar_fitness"
+        android:rotation="180"
+        android:layout_below="@id/appbar_home"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+        android:background="@android:color/transparent">
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/PennMobile/src/main/res/layout/fragment_fitness_preferences.xml b/PennMobile/src/main/res/layout/fragment_fitness_preferences.xml
new file mode 100644
index 000000000..8d4299ce1
--- /dev/null
+++ b/PennMobile/src/main/res/layout/fragment_fitness_preferences.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/fitness_fragment_pref_cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_margin="12dp"
+            android:textSize="16sp"
+            android:fontFamily="@font/sf_pro_display_medium"
+            android:textColor="#1280F0"
+            android:text="Cancel"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            android:gravity="center_horizontal"
+            android:layout_margin="12dp"
+            android:textSize="20sp"
+            android:fontFamily="@font/sf_pro_display_medium"
+            android:text="Select Favorites"/>
+
+
+        <TextView
+            android:id="@+id/fitness_fragment_pref_save"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_margin="12dp"
+            android:textSize="16sp"
+            android:fontFamily="@font/sf_pro_display_medium"
+            android:textColor="#1280F0"
+            android:text="Save"/>
+
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintTop_toBottomOf="@id/fitness_fragment_pref_save"
+            app:layout_constraintLeft_toLeftOf="parent"
+            android:layout_marginTop="15dp">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/fitness_preference_recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layoutManager="LinearLayoutManager"/>
+
+
+        </FrameLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/PennMobile/src/main/res/layout/fragment_pottruck.xml b/PennMobile/src/main/res/layout/fragment_pottruck.xml
new file mode 100644
index 000000000..01de01d98
--- /dev/null
+++ b/PennMobile/src/main/res/layout/fragment_pottruck.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_home_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:elevation="0dp"
+        android:theme="@style/AppTheme.AppBarOverlay"
+        app:elevation="0dp">
+
+        <FrameLayout
+            android:id="@+id/appbar_container"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/app_bar_height">
+
+            <TextView
+                android:id="@+id/date_view"
+                style="@style/title_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start|top"
+                android:layout_marginStart="24dp"
+                android:layout_marginTop="24dp" />
+
+
+            <TextView
+                android:id="@+id/title_view"
+                style="@style/title_fragment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start|bottom"
+                android:layout_marginStart="24dp"
+                android:layout_marginBottom="4dp"
+                android:maxLines="1"
+                />
+
+            <ImageView
+                android:id="@+id/fitness_preferences"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_bottom_nav_settings_blue"
+                android:layout_gravity="end|bottom"
+                android:layout_marginEnd="24dp"
+                android:layout_marginBottom="8dp"
+                />
+
+
+            <ImageView
+                android:id="@+id/divider"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:visibility="invisible"
+                app:srcCompat="@drawable/ic_app_bar_divider" />
+
+        </FrameLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar_fitness_connection"
+            android:layout_width="match_parent"
+            android:layout_height="24dp"
+            android:visibility="gone"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            tools:ignore="MissingConstraints">
+
+            <TextView
+                android:id="@+id/text_fitness_connection_message"
+                style="@style/internet_error_message" />
+
+        </androidx.appcompat.widget.Toolbar>
+
+        <include layout="@layout/loading_panel" />
+
+
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/swiperefresh_fitness"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="20dp">
+
+
+            <FrameLayout
+                android:id="@+id/framelayout_fitness"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                tools:visibility="visible">
+
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_view_fitness_rooms"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:scrollbars="none"
+                    tools:list_item="@layout/fitness_list_item" />
+
+
+            </FrameLayout>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+    </LinearLayout>
+
+    <!-- Coordinator Layout used to position the SnackBar -->
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/snack_bar_fitness"
+        android:rotation="180"
+        android:layout_below="@id/appbar_home"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+        android:background="@android:color/transparent">
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/PennMobile/src/main/res/values/strings.xml b/PennMobile/src/main/res/values/strings.xml
index 1fa3f478e..cf35b9953 100644
--- a/PennMobile/src/main/res/values/strings.xml
+++ b/PennMobile/src/main/res/values/strings.xml
@@ -31,6 +31,10 @@
     <string name="accessibility_description">Screen menu</string>
     <string name="accessibility_item_description">%1$s menu item</string>
 
+    <!-- Fitness -->
+    <string name="fitness_room_open">Open</string>
+    <string name="fitness_room_closed">Closed</string>
+
     <!-- Dining -->
     <string name="dining_hall_open">Open</string>
     <string name="dining_hall_closed">Closed</string>
@@ -223,4 +227,9 @@
 
     <!-- Poll -->
     <string name="vote">Vote</string>
+    <string name="pottruck">Pottruck</string>
+    <string name="fitness_sunday">Sunday</string>
+    <string name="fitness_mf">Mon - Fri</string>
+    <string name="fitness_sat">Saturday</string>
+    <string name="fitness_capacity">Capacity</string>
 </resources>
diff --git a/PennMobile/src/main/res/values/styles.xml b/PennMobile/src/main/res/values/styles.xml
index 0f9622e89..e4d10e325 100644
--- a/PennMobile/src/main/res/values/styles.xml
+++ b/PennMobile/src/main/res/values/styles.xml
@@ -126,6 +126,17 @@
         <item name="android:textColor">#13284B</item>
     </style>
 
+    <style name="FitnessStatusLabel">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">11sp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:paddingRight">8dp</item>
+        <item name="android:paddingLeft">8dp</item>
+        <item name="android:layout_marginTop">4dp</item>
+    </style>
+
+
     <style name="DiningStatusLabel">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/PennMobile/src/main/res/xml/settings.xml b/PennMobile/src/main/res/xml/settings.xml
index 176ab5328..289173590 100644
--- a/PennMobile/src/main/res/xml/settings.xml
+++ b/PennMobile/src/main/res/xml/settings.xml
@@ -26,7 +26,7 @@
 
         <Preference
             android:id="@+id/pref_news_feature"
-            app:icon="@drawable/ic_news_setting"
+            app:icon="@drawable/ic_news2"
             app:iconSpaceReserved="false"
             app:key="pref_news_feature"
             app:title="News" />
@@ -34,7 +34,7 @@
         <Preference
             android:id="@+id/pref_contact_feature"
             android:hapticFeedbackEnabled="true"
-            app:icon="@drawable/ic_contacts_setting"
+            app:icon="@drawable/ic_contacts2"
             app:iconSpaceReserved="false"
             app:key="pref_contacts_feature"
             app:title="Penn Contacts" />
@@ -42,11 +42,19 @@
         <Preference
             android:id="@+id/pref_about_feature"
             android:hapticFeedbackEnabled="true"
-            app:icon="@drawable/ic_about_setting"
+            app:icon="@drawable/ic_about2"
             app:iconSpaceReserved="false"
             app:key="pref_about_feature"
             app:title="About" />
 
+        <Preference
+            android:id="@+id/pref_fitness_feature"
+            android:hapticFeedbackEnabled="true"
+            app:icon="@drawable/ic_fitness2"
+            app:iconSpaceReserved="false"
+            app:key="pref_fitness_feature"
+            app:title="Fitness" />
+
 
     </PreferenceCategory>