diff --git a/src/components/Dashboard/UpcomingBookings.vue b/src/components/Dashboard/UpcomingBookings.vue
index 461b60b..12396cd 100644
--- a/src/components/Dashboard/UpcomingBookings.vue
+++ b/src/components/Dashboard/UpcomingBookings.vue
@@ -1,16 +1,18 @@
 <script setup>
 import { useRouter } from 'vue-router'
 import { ref, computed, onMounted } from 'vue'
-import { useObsPortalDataStore } from '../../stores/sessions'
+import { useRealTimeSessionsStore } from '../../stores/sessions'
+import { useObsPortalDataStore } from '../../stores/obsPortalData'
 import { useUserDataStore } from '../../stores/userData'
 import { useConfigurationStore } from '../../stores/configuration'
 import { formatDate, formatTime } from '../../utils/formatTime.js'
 import { fetchApiCall } from '../../utils/api.js'
 
 const router = useRouter()
-const obsPortalDataStore = useObsPortalDataStore()
+const realTimeSessionsStore = useRealTimeSessionsStore()
 const userDataStore = useUserDataStore()
 const configurationStore = useConfigurationStore()
+const obsPortalDataStore = useObsPortalDataStore()
 
 const requestGroups = ref([])
 // change to bookings and add an icon to show completion
@@ -18,19 +20,19 @@ const sortedSessions = computed(() => {
   const now = new Date().getTime()
   // TODO: Show past sessions for a certain amount of time in a separate section
   const twoHoursAgo = now - 120 * 60 * 1000
-  const sessions = obsPortalDataStore.upcomingRealTimeSessions || []
+  const sessions = Object.values(obsPortalDataStore.upcomingRealTimeSessions)
   return sessions.filter(session => new Date(session.start).getTime() >= twoHoursAgo)
     .slice()
     .sort((a, b) => new Date(a.start) - new Date(b.start))
 })
 
 const selectSession = (sessionId) => {
-  obsPortalDataStore.currentSessionId = sessionId
+  realTimeSessionsStore.currentSessionId = sessionId
   router.push(`/realtime/${sessionId}`)
 }
 
 async function deleteSession (sessionId) {
-  obsPortalDataStore.currentSessionId = sessionId
+  realTimeSessionsStore.currentSessionId = sessionId
   const token = userDataStore.authToken
   await fetchApiCall({
     url: configurationStore.observationPortalUrl + `realtime/${sessionId}/`,
@@ -42,7 +44,7 @@ async function deleteSession (sessionId) {
 }
 
 onMounted(() => {
-  obsPortalDataStore.fetchObservations()
+  obsPortalDataStore.fetchCompleteObservationsAndUpcomingRTSessions()
   obsPortalDataStore.fetchPendingRequestGroups()
   requestGroups.value = obsPortalDataStore.pendingRequestGroups
 })
diff --git a/src/components/Images/MyGallery.vue b/src/components/Images/MyGallery.vue
index 4b296b9..a566942 100644
--- a/src/components/Images/MyGallery.vue
+++ b/src/components/Images/MyGallery.vue
@@ -1,21 +1,20 @@
 <script setup>
 import { computed, ref, onMounted } from 'vue'
-import { useObsPortalDataStore } from '../../stores/sessions'
-import { useUserDataStore } from '../../stores/userData'
+import { useObsPortalDataStore } from '../../stores/obsPortalData'
 import { useConfigurationStore } from '../../stores/configuration'
 import { formatDate } from '../../utils/formatTime.js'
 import { fetchApiCall } from '../../utils/api.js'
 
-const obsPortalDataStore = useObsPortalDataStore()
-const userDataStore = useUserDataStore()
 const configurationStore = useConfigurationStore()
+const obsPortalDataStore = useObsPortalDataStore()
 
 const thumbnailsMap = ref({})
 const loading = ref(true)
 
 const filteredSessions = computed(() => {
   const now = new Date()
-  const cutoffTime = new Date(now.getTime() - 16 * 60 * 1000)
+  const sixteenMinutes = 16 * 60 * 1000
+  const cutoffTime = new Date(now.getTime() - sixteenMinutes)
   // Object.values returns an array of all the values of the object
   const sessions = Object.values(obsPortalDataStore.completedObservations)
   const filtered = sessions
@@ -25,17 +24,9 @@ const filteredSessions = computed(() => {
 })
 
 const getThumbnails = async (observationId) => {
-  const token = userDataStore.authToken
-  const headers = {
-    'Content-Type': 'application/json',
-    'Accept': 'application/json',
-    'Authorization': `Token ${token}`
-  }
-
   await fetchApiCall({
-    url: configurationStore.thumbnailArchiveUrl + `thumbnails/?observation_id=${observationId}&size=small`,
+    url: configurationStore.thumbnailArchiveUrl + `thumbnails/?observation_id=${observationId}&size=large`,
     method: 'GET',
-    header: headers,
     successCallback: (data) => {
       if (data.results.length > 0) {
         thumbnailsMap.value[observationId] = data.results.map(result => result.url)
diff --git a/src/components/RealTimeInterface/CelestialMap/SkyChart.vue b/src/components/RealTimeInterface/CelestialMap/SkyChart.vue
index e5296cc..a87b899 100644
--- a/src/components/RealTimeInterface/CelestialMap/SkyChart.vue
+++ b/src/components/RealTimeInterface/CelestialMap/SkyChart.vue
@@ -1,11 +1,11 @@
 <script setup>
-import { ref, onMounted, watch } from 'vue'
-import { useObsPortalDataStore } from '../../../stores/sessions'
+import { ref, onMounted } from 'vue'
+import { useRealTimeSessionsStore } from '../../../stores/sessions'
 import sites from '../../../utils/sites.JSON'
 import celestial from 'd3-celestial'
 
 const Celestial = celestial.Celestial ? celestial.Celestial() : celestial
-const obsPortalDataStore = useObsPortalDataStore()
+const realTimeSessionsStore = useRealTimeSessionsStore()
 
 const lat = ref(35)
 const lng = ref(-105)
@@ -146,7 +146,7 @@ function initializeCelestial () {
 }
 
 onMounted(() => {
-  const currentSession = obsPortalDataStore.currentSession
+  const currentSession = realTimeSessionsStore.currentSession
   if (currentSession && currentSession.site) {
     const siteInfo = sites[currentSession.site]
     if (siteInfo && Celestial) {
diff --git a/src/components/RealTimeInterface/GlobeMap/WindyMap.vue b/src/components/RealTimeInterface/GlobeMap/WindyMap.vue
index b5f5aac..f899e87 100644
--- a/src/components/RealTimeInterface/GlobeMap/WindyMap.vue
+++ b/src/components/RealTimeInterface/GlobeMap/WindyMap.vue
@@ -1,11 +1,11 @@
 <script setup>
 import { computed } from 'vue'
-import { useObsPortalDataStore } from '../../../stores/sessions'
+import { useRealTimeSessionsStore } from '../../../stores/sessions'
 import sites from '../../../utils/sites.JSON'
 
-const obsPortalDataStore = useObsPortalDataStore()
+const realTimeSessionsStore = useRealTimeSessionsStore()
 
-const selectedSession = obsPortalDataStore.currentSession
+const selectedSession = realTimeSessionsStore.currentSession
 
 const siteInfo = computed(() => {
   if (selectedSession && selectedSession.site) {
diff --git a/src/components/RealTimeInterface/PolledThumbnails.vue b/src/components/RealTimeInterface/PolledThumbnails.vue
index a6f62bb..34b8c9f 100644
--- a/src/components/RealTimeInterface/PolledThumbnails.vue
+++ b/src/components/RealTimeInterface/PolledThumbnails.vue
@@ -1,13 +1,11 @@
 <script setup>
 import { ref, onMounted, defineEmits } from 'vue'
-import { useObsPortalDataStore } from '../../stores/sessions'
+import { useRealTimeSessionsStore } from '../../stores/sessions'
 import { fetchApiCall } from '../../utils/api'
 import { useConfigurationStore } from '../../stores/configuration'
-import { useUserDataStore } from '../../stores/userData'
 
-const obsPortalDataStore = useObsPortalDataStore()
-const currentSession = obsPortalDataStore.currentSession
-const userDataStore = useUserDataStore()
+const realTimeSessionsStore = useRealTimeSessionsStore()
+const currentSession = realTimeSessionsStore.currentSession
 const configurationStore = useConfigurationStore()
 
 const sessionId = currentSession.id
@@ -19,16 +17,9 @@ const thumbnails = ref([])
 let pollingInterval = null
 
 const getThumbnails = async () => {
-  const token = userDataStore.authToken
-  const headers = {
-    'Content-Type': 'application/json',
-    'Accept': 'application/json',
-    'Authorization': `Token ${token}`
-  }
   await fetchApiCall({
     url: configurationStore.thumbnailArchiveUrl + `thumbnails/?observation_id=${sessionId}&size=large`,
     method: 'GET',
-    header: headers,
     successCallback: (data) => {
       thumbnails.value = data.results.map(result => result.url)
       if (thumbnails.value.length > 0) {
diff --git a/src/components/RealTimeInterface/SessionImageCapture.vue b/src/components/RealTimeInterface/SessionImageCapture.vue
index b1eff99..a873d45 100644
--- a/src/components/RealTimeInterface/SessionImageCapture.vue
+++ b/src/components/RealTimeInterface/SessionImageCapture.vue
@@ -4,13 +4,13 @@ import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import PolledThumbnails from './PolledThumbnails.vue'
 import { fetchApiCall } from '../../utils/api.js'
 import { useConfigurationStore } from '../../stores/configuration'
-import { useObsPortalDataStore } from '../../stores/sessions'
+import { useRealTimeSessionsStore } from '../../stores/sessions'
 import { LottieAnimation } from 'lottie-web-vue'
 import BlocksJSON from '@/assets/progress-blocks-bodymovin.json'
 import GalaxyJSON from '@/assets/galaxy_loading_pixels.json'
 
 const configurationStore = useConfigurationStore()
-const obsPortalDataStore = useObsPortalDataStore()
+const realTimeSessionsStore = useRealTimeSessionsStore()
 
 const status = ref(null)
 let pollingInterval = null
@@ -40,7 +40,7 @@ const fetchTelescopeStatus = async () => {
     imagesDone.value = false
     return
   }
-  const token = obsPortalDataStore.getTokenForCurrentSession
+  const token = realTimeSessionsStore.getTokenForCurrentSession
   const headers = {
     'Content-Type': 'application/json',
     'Accept': 'application/json',
@@ -71,7 +71,7 @@ const goBackToSessionStarted = () => {
 }
 
 const sendStopCommand = async () => {
-  const token = obsPortalDataStore.getTokenForCurrentSession
+  const token = realTimeSessionsStore.getTokenForCurrentSession
   const headers = {
     'Content-Type': 'application/json',
     'Accept': 'application/json',
diff --git a/src/components/RealTimeInterface/SessionPending.vue b/src/components/RealTimeInterface/SessionPending.vue
index 575a49d..e3afbc5 100644
--- a/src/components/RealTimeInterface/SessionPending.vue
+++ b/src/components/RealTimeInterface/SessionPending.vue
@@ -1,12 +1,12 @@
 <script setup>
 import { computed } from 'vue'
-import { useObsPortalDataStore } from '../../stores/sessions'
+import { useRealTimeSessionsStore } from '../../stores/sessions'
 import sites from '../../utils/sites.JSON'
 import WindyMap from './GlobeMap/WindyMap.vue'
 
-const obsPortalDataStore = useObsPortalDataStore()
+const realTimeSessionsStore = useRealTimeSessionsStore()
 
-const selectedSession = obsPortalDataStore.currentSession
+const selectedSession = realTimeSessionsStore.currentSession
 
 const lat = computed(() => sites[selectedSession.site]?.lat)
 const lon = computed(() => sites[selectedSession.site]?.lon)
diff --git a/src/components/RealTimeInterface/SessionStarted.vue b/src/components/RealTimeInterface/SessionStarted.vue
index 2291186..535070d 100644
--- a/src/components/RealTimeInterface/SessionStarted.vue
+++ b/src/components/RealTimeInterface/SessionStarted.vue
@@ -5,13 +5,13 @@ import AladinSkyMap from '../RealTimeInterface/AladinSkyMap.vue'
 import SkyChart from '../RealTimeInterface/CelestialMap/SkyChart.vue'
 import SessionImageCapture from '../RealTimeInterface/SessionImageCapture.vue'
 import { calcAltAz } from '../../utils/visibility.js'
-import { useObsPortalDataStore } from '../../stores/sessions'
+import { useRealTimeSessionsStore } from '../../stores/sessions'
 import sites from '../../utils/sites.JSON'
 import { fetchApiCall } from '../../utils/api'
 import { useConfigurationStore } from '../../stores/configuration'
 import { useUserDataStore } from '../../stores/userData'
 
-const obsPortalDataStore = useObsPortalDataStore()
+const realTimeSessionsStore = useRealTimeSessionsStore()
 const configurationStore = useConfigurationStore()
 const userDataStore = useUserDataStore()
 
@@ -20,7 +20,7 @@ const isCapturingImages = computed(() => {
     // Change this to true to test the image capture component and false for target select
     return true
   } else {
-    return obsPortalDataStore.isCapturingImagesForCurrentSession
+    return realTimeSessionsStore.isCapturingImagesForCurrentSession
   }
 })
 
@@ -39,7 +39,7 @@ const loading = ref(false)
 const exposureError = ref('')
 const isExposureTimeValid = ref(true)
 
-const currentSession = obsPortalDataStore.currentSession
+const currentSession = realTimeSessionsStore.currentSession
 const siteInfo = sites[currentSession.site]
 
 function getRaDecFromTargetName () {
@@ -87,7 +87,7 @@ function changeFov (fov) {
 }
 
 const resetValues = () => {
-  obsPortalDataStore.updateImageCaptureState(true)
+  realTimeSessionsStore.updateImageCaptureState(true)
   ra.value = ''
   dec.value = ''
   targetName.value = ''
@@ -103,7 +103,7 @@ const sendGoCommand = async () => {
   exposureError.value = ''
   isExposureTimeValid.value = true
 
-  const token = obsPortalDataStore.getTokenForCurrentSession
+  const token = realTimeSessionsStore.getTokenForCurrentSession
   const headers = {
     'Content-Type': 'application/json',
     'Accept': 'application/json',
@@ -117,9 +117,9 @@ const sendGoCommand = async () => {
     expTime: exposTime,
     name: targetName.value,
     ra: Number(ra.value) / 15,
-    proposalId: obsPortalDataStore.currentSession.proposal,
-    requestGroupId: obsPortalDataStore.currentSession.request_group_id,
-    requestId: obsPortalDataStore.currentSession.request.id
+    proposalId: realTimeSessionsStore.currentSession.proposal,
+    requestGroupId: realTimeSessionsStore.currentSession.request_group_id,
+    requestId: realTimeSessionsStore.currentSession.request.id
   }
   if (configurationStore.demo == true) {
     loading.value = false
@@ -163,7 +163,7 @@ const getFilterList = async () => {
 
 function updateRenderGallery (value) {
   if (!value) {
-    obsPortalDataStore.updateImageCaptureState(false)
+    realTimeSessionsStore.updateImageCaptureState(false)
   }
 }
 
diff --git a/src/components/RealTimeInterface/TimePicker.vue b/src/components/RealTimeInterface/TimePicker.vue
index 3df75ee..bce6c59 100644
--- a/src/components/RealTimeInterface/TimePicker.vue
+++ b/src/components/RealTimeInterface/TimePicker.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, watch, defineEmits, onMounted, computed } from 'vue'
 import { useRouter } from 'vue-router'
-import { useObsPortalDataStore } from '../../stores/sessions'
+import { useRealTimeSessionsStore } from '../../stores/sessions'
 import { useUserDataStore } from '../../stores/userData'
 import { fetchApiCall } from '../../utils/api'
 import { formatToUTC, formatDate } from '../../utils/formatTime.js'
@@ -9,7 +9,7 @@ import { useConfigurationStore } from '../../stores/configuration'
 import LeafletMap from './GlobeMap/LeafletMap.vue'
 
 const router = useRouter()
-const obsPortalDataStore = useObsPortalDataStore()
+const realTimeSessionsStore = useRealTimeSessionsStore()
 const configurationStore = useConfigurationStore()
 const userDataStore = useUserDataStore()
 
@@ -126,7 +126,7 @@ const refreshTimes = () => {
 const resetSession = () => {
   errorMessage.value = null
   selectedSite.value = null
-  obsPortalDataStore.currentSessionId = null
+  realTimeSessionsStore.currentSessionId = null
 }
 
 const blockRti = async () => {
diff --git a/src/components/Scheduling/SchedulingSettings.vue b/src/components/Scheduling/SchedulingSettings.vue
index 7136a99..712a14d 100644
--- a/src/components/Scheduling/SchedulingSettings.vue
+++ b/src/components/Scheduling/SchedulingSettings.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { ref, reactive, computed, defineProps, defineEmits, onMounted } from 'vue'
 import { useConfigurationStore } from '../../stores/configuration.js'
-import { useUserDataStore } from '../../stores/userData.js'
 import { fetchApiCall } from '../../utils/api.js'
 
 const props = defineProps({
@@ -22,7 +21,6 @@ const props = defineProps({
 const emits = defineEmits(['exposuresUpdated', 'targetUpdated'])
 
 const configurationStore = useConfigurationStore()
-const userDataStore = useUserDataStore()
 
 const projectName = ref('')
 const targetList = ref([{ name: '', exposures: [], ra: '', dec: '' }])
@@ -116,7 +114,6 @@ const addExposure = () => {
     settings.exposureTime = ''
     settings.count = ''
     emits('exposuresUpdated', targetList.value[activeTargetIndex.value].exposures)
-    console.log('Exposures updated:', targetList.value[activeTargetIndex.value].exposures)
   }
 }
 
diff --git a/src/components/Views/RealTimeInterfaceView.vue b/src/components/Views/RealTimeInterfaceView.vue
index b1408ff..004b30d 100644
--- a/src/components/Views/RealTimeInterfaceView.vue
+++ b/src/components/Views/RealTimeInterfaceView.vue
@@ -1,30 +1,30 @@
 <script setup>
 import { ref, computed, onMounted, onBeforeUnmount, watch } from 'vue'
-import { useObsPortalDataStore } from '../../stores/sessions'
+import { useRealTimeSessionsStore } from '../../stores/sessions'
 import SessionPending from '../RealTimeInterface/SessionPending.vue'
 import SessionStarted from '../RealTimeInterface/SessionStarted.vue'
 import { formatCountdown, calculateSessionCountdown } from '../../utils/formatTime.js'
 import { useConfigurationStore } from '../../stores/configuration'
 
 const configurationStore = useConfigurationStore()
-const obsPortalDataStore = useObsPortalDataStore()
+const realTimeSessionsStore = useRealTimeSessionsStore()
 
 const timeRemaining = ref(0)
 const loading = ref(true)
 
-const selectedSession = obsPortalDataStore.currentSession
+const selectedSession = realTimeSessionsStore.currentSession
 const site = computed(() => selectedSession.site)
 const telescope = computed(() => selectedSession.telescope)
 
 const statusNotExpired = computed(() => {
-  return obsPortalDataStore.currentStatus === 'ACTIVE' || obsPortalDataStore.currentStatus === 'UNEXPIRED' || obsPortalDataStore.currentStatus === 'INACTIVE'
+  return realTimeSessionsStore.currentStatus === 'ACTIVE' || realTimeSessionsStore.currentStatus === 'UNEXPIRED' || realTimeSessionsStore.currentStatus === 'INACTIVE'
 })
 
 const statusSessionNotActive = computed(() => {
   if (configurationStore.demo == true) {
     return false
   } else {
-    return ((obsPortalDataStore.currentStatus === 'INACTIVE' || obsPortalDataStore.currentStatus === 'UNEXPIRED') && timeRemaining.value >= 0)
+    return ((realTimeSessionsStore.currentStatus === 'INACTIVE' || realTimeSessionsStore.currentStatus === 'UNEXPIRED') && timeRemaining.value >= 0)
   }
 })
 
@@ -43,31 +43,31 @@ function countdown () {
   }, 1000)
 }
 
-watch(() => obsPortalDataStore.currentStatus, (newStatus, oldStatus) => {
+watch(() => realTimeSessionsStore.currentStatus, (newStatus, oldStatus) => {
   if (newStatus === 'ACTIVE') {
     countdown()
   } else {
-    obsPortalDataStore.resetSessionState()
+    realTimeSessionsStore.resetSessionState()
     timeRemaining.value = 0
-    obsPortalDataStore.updateImageCaptureState(false)
+    realTimeSessionsStore.updateImageCaptureState(false)
   }
 })
 
 onBeforeUnmount(() => {
-  obsPortalDataStore.stopPolling()
+  realTimeSessionsStore.stopPolling()
 })
 
 onMounted(async () => {
   loading.value = true
   // initiate the handshake and retrieve a token prior to polling
-  await obsPortalDataStore.fetchSessionToken()
-  obsPortalDataStore.startPolling()
+  await realTimeSessionsStore.fetchSessionToken()
+  realTimeSessionsStore.startPolling()
   countdown()
   const checkTimeRemaining = setInterval(() => {
-    // if (timeRemaining.value > 0 && (obsPortalDataStore.currentStatus === 'ACTIVE' || obsPortalDataStore.currentStatus === 'UNEXPIRED' || obsPortalDataStore.currentStatus === 'INACTIVE')) {
+    // if (timeRemaining.value > 0 && (realTimeSessionsStore.currentStatus === 'ACTIVE' || realTimeSessionsStore.currentStatus === 'UNEXPIRED' || realTimeSessionsStore.currentStatus === 'INACTIVE')) {
     clearInterval(checkTimeRemaining)
     loading.value = false
-    // } else if (obsPortalDataStore.currentStatus === 'EXPIRED' || timeRemaining.value <= 0) {
+    // } else if (realTimeSessionsStore.currentStatus === 'EXPIRED' || timeRemaining.value <= 0) {
     // clearInterval(checkTimeRemaining)
     // loading.value = false
     // }
@@ -88,13 +88,13 @@ onMounted(async () => {
           <p><span class="green-bg px-2 py-2">Session starts in {{ formatCountdown(timeRemaining) }}</span></p>
           <SessionPending/>
         </div>
-       <div v-else-if="(obsPortalDataStore.currentStatus === 'ACTIVE' || configurationStore.demo == true)" class="content">
+       <div v-else-if="(realTimeSessionsStore.currentStatus === 'ACTIVE' || configurationStore.demo == true)" class="content">
           <h2>Live Observing Session</h2>
           <p>You are controlling the {{ telescope }} telescope in {{ site }}</p>
           <p><span class="green-bg px-2 py-2">Time Remaining in session: {{ formatCountdown(timeRemaining) }}</span></p>
           <SessionStarted/>
         </div>
-       <div v-else-if="timeRemaining <= 0 && (obsPortalDataStore.currentStatus === 'EXPIRED' || obsPortalDataStore.currentStatus === 'INACTIVE')">
+       <div v-else-if="timeRemaining <= 0 && (realTimeSessionsStore.currentStatus === 'EXPIRED' || realTimeSessionsStore.currentStatus === 'INACTIVE')">
           <p><span class="red-bg px-2 py-2">Session has ended</span></p>
         </div>
       </div>
diff --git a/src/components/Views/SchedulingView.vue b/src/components/Views/SchedulingView.vue
index 5c66cfb..38b35dd 100644
--- a/src/components/Views/SchedulingView.vue
+++ b/src/components/Views/SchedulingView.vue
@@ -3,7 +3,6 @@ import { computed, ref } from 'vue'
 import AdvancedScheduling from '../Scheduling/AdvancedScheduling.vue'
 import BeginnerScheduling from '../Scheduling/BeginnerScheduling.vue'
 import ScheduledObservations from '../Scheduling/ScheduledObservations.vue'
-import { useUserDataStore } from '../../stores/userData'
 import { fetchApiCall } from '../../utils/api.js'
 import { formatToUTC } from '../../utils/formatTime'
 
@@ -11,7 +10,7 @@ import { formatToUTC } from '../../utils/formatTime'
 const level = ref('')
 const observationData = ref(null)
 const showScheduled = ref(false)
-const userDataStore = useUserDataStore()
+const operatorValue = ref('')
 const displayButton = ref(false)
 
 const createInstrumentConfigs = (exposures) => {
@@ -97,22 +96,21 @@ const sendObservationRequest = async () => {
       requestList.push(...targets.map(target => createRequest(target, target.exposures, startDate, endDate)))
     }
 
-    const token = userDataStore.authToken
-    const headers = {
-      'Content-Type': 'application/json',
-      'Accept': 'application/json',
-      'Authorization': `Token ${token}`
+    if (observationData.value.target || observationData.value.targets.length === 1) {
+      operatorValue.value = 'SINGLE'
+    } else if (observationData.value.targets.length > 1) {
+      operatorValue.value = 'MANY'
     }
 
     await fetchApiCall({
       url: 'https://observe.lco.global/api/requestgroups/',
       method: 'POST',
-      header: headers,
       body: {
         'name': 'UserObservation',
         // TO DO: get proposals from user and use the proposal ID here
         'proposal': 'LCOSchedulerTest',
         'ipp_value': 1.05,
+        'operator': operatorValue.value,
         'observation_type': 'NORMAL',
         'requests': requestList
       },
diff --git a/src/stores/obsPortalData.js b/src/stores/obsPortalData.js
new file mode 100644
index 0000000..17d08b5
--- /dev/null
+++ b/src/stores/obsPortalData.js
@@ -0,0 +1,59 @@
+import { defineStore } from 'pinia'
+import { fetchApiCall } from '../utils/api'
+import { useUserDataStore } from './userData'
+import { useConfigurationStore } from './configuration'
+
+const fifteenDaysAgo = new Date(new Date().getTime() - 15 * 24 * 60 * 60 * 1000).toISOString().split('T')[0]
+
+export const useObsPortalDataStore = defineStore('obsPortalData', {
+  state () {
+    return {
+      completedObservations: {},
+      upcomingRealTimeSessions: {},
+      pendingRequestGroups: []
+    }
+  },
+  persist: true,
+  actions: {
+    sortResponseData (response) {
+      const sixteenMinutes = 16 * 60 * 1000
+      const sessionCutoff = new Date(new Date().getTime() - sixteenMinutes).toISOString()
+      for (const result of response.results) {
+        const sessionEnd = new Date(result.end).toISOString()
+        if ((result.state === 'COMPLETED') || (result.observation_type === 'REAL_TIME' && sessionEnd < sessionCutoff)) {
+          if (!this.completedObservations[result.id]) {
+            this.completedObservations[result.id] = result
+          }
+        } else if (result.observation_type === 'REAL_TIME' && sessionEnd > sessionCutoff) {
+          if (!this.upcomingRealTimeSessions[result.id]) {
+            this.upcomingRealTimeSessions[result.id] = result
+          }
+        }
+      }
+    },
+    async fetchCompleteObservationsAndUpcomingRTSessions () {
+      const configurationStore = useConfigurationStore()
+      const userDataStore = useUserDataStore()
+      const username = userDataStore.username
+      await fetchApiCall({
+        url: configurationStore.observationPortalUrl + `observations/?user=${username}&state=PENDING&state=COMPLETED&limit=1000&ordering=start&created_after=${fifteenDaysAgo}`,
+        method: 'GET',
+        successCallback: (response) => {
+          this.sortResponseData(response)
+        }
+      })
+    },
+    fetchPendingRequestGroups () {
+      const configurationStore = useConfigurationStore()
+      const userDataStore = useUserDataStore()
+      const username = userDataStore.username
+      fetchApiCall({
+        url: configurationStore.observationPortalUrl + `requestgroups/?observation_type=NORMAL&state=PENDING&user=${username}created_after=${fifteenDaysAgo}`,
+        method: 'GET',
+        successCallback: (response) => {
+          this.pendingRequestGroups = response.results
+        }
+      })
+    }
+  }
+})
diff --git a/src/stores/sessions.js b/src/stores/sessions.js
index fe41050..1d46366 100644
--- a/src/stores/sessions.js
+++ b/src/stores/sessions.js
@@ -3,17 +3,11 @@ import { fetchApiCall } from '../utils/api'
 import { calculateSessionCountdown } from '../utils/formatTime'
 import { toRaw } from 'vue'
 import { useConfigurationStore } from './configuration'
-import { useUserDataStore } from './userData'
+import { useObsPortalDataStore } from './obsPortalData'
 
-const tomorrow = new Date(new Date().getTime() + 24 * 60 * 60 * 1000).toISOString().split('T')[0]
-const fifteenDaysAgo = new Date(new Date().getTime() - 15 * 24 * 60 * 60 * 1000).toISOString().split('T')[0]
-
-export const useObsPortalDataStore = defineStore('sessions', {
+export const useRealTimeSessionsStore = defineStore('realTimeSessions', {
   state () {
     return {
-      completedObservations: {},
-      upcomingRealTimeSessions: [],
-      pendingRequestGroups: [],
       currentSessionId: null,
       currentStatus: '',
       fetchInterval: null,
@@ -24,7 +18,10 @@ export const useObsPortalDataStore = defineStore('sessions', {
   persist: true,
   getters: {
     currentSession (state) {
-      const currentSession = state.upcomingRealTimeSessions.find(session => session.id === state.currentSessionId)
+      const obsPortalDataStore = useObsPortalDataStore()
+      const upcomingRealTimeSessions = obsPortalDataStore.upcomingRealTimeSessions
+      const currentSession = upcomingRealTimeSessions[state.currentSessionId]
+      // .find(session => session.id === state.currentSessionId)
       // for some reason, vue3 returns a *proxy* object that we can't send over HTTP, so convert it to JSON first.
       return toRaw(currentSession)
     },
@@ -41,33 +38,6 @@ export const useObsPortalDataStore = defineStore('sessions', {
         this.isCapturingImagesMap[this.currentSessionId] = false
       }
     },
-    sortSessions (response) {
-      const sessionCutoff = new Date(new Date().getTime() - 16 * 60 * 1000).toISOString()
-      for (const result of response.results) {
-        const sessionEnd = new Date(result.end).toISOString()
-        if ((result.state === 'COMPLETED') || (result.observation_type === 'REAL_TIME' && sessionEnd < sessionCutoff)) {
-          if (!this.completedObservations[result.id]) {
-            this.completedObservations[result.id] = result
-          }
-        } else if (result.observation_type === 'REAL_TIME' && sessionEnd > sessionCutoff) {
-          if (!this.upcomingRealTimeSessions.some(req => req.id === result.id)) {
-            this.upcomingRealTimeSessions.push(result)
-          }
-        }
-      }
-    },
-    async fetchObservations () {
-      const configurationStore = useConfigurationStore()
-      const userDataStore = useUserDataStore()
-      const username = userDataStore.username
-      await fetchApiCall({
-        url: configurationStore.observationPortalUrl + `observations/?user=${username}&state=PENDING&state=COMPLETED&limit=1000&ordering=start&created_after=${fifteenDaysAgo}&created_before=${tomorrow}`,
-        method: 'GET',
-        successCallback: (response) => {
-          this.sortSessions(response)
-        }
-      })
-    },
     async fetchSessionToken () {
       const configurationStore = useConfigurationStore()
       const requestBody = { ...this.currentSession }
@@ -124,25 +94,6 @@ export const useObsPortalDataStore = defineStore('sessions', {
       if (this.currentSessionId) {
         this.isCapturingImagesMap[this.currentSessionId] = isCapturing
       }
-    },
-    fetchPendingRequestGroups () {
-      const configurationStore = useConfigurationStore()
-      const userDataStore = useUserDataStore()
-      const username = userDataStore.username
-      const token = userDataStore.authToken
-      const headers = {
-        'Content-Type': 'application/json',
-        'Accept': 'application/json',
-        'Authorization': `Token ${token}`
-      }
-      fetchApiCall({
-        url: configurationStore.observationPortalUrl + `requestgroups/?observation_type=NORMAL&state=PENDING&user=${username}created_after=${fifteenDaysAgo}&created_before=${tomorrow}`,
-        method: 'GET',
-        header: headers,
-        successCallback: (response) => {
-          this.pendingRequestGroups = response.results
-        }
-      })
     }
   }
 })
diff --git a/src/utils/api.js b/src/utils/api.js
index 45b76db..7093a05 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -1,18 +1,14 @@
 /* eslint-disable no-unused-expressions */
 import { useUserDataStore } from '../stores/userData.js'
-// import { useObsPortalDataStore } from '../stores/sessions.js'
 
 async function fetchApiCall ({ url, method, body = null, header, successCallback = null, failCallback = null }) {
   const store = useUserDataStore()
-  // const obsPortalDataStore = useObsPortalDataStore()
 
   const defaultHeader = {
     'Content-Type': 'application/json',
     'Accept': 'application/json'
   }
-  // if (obsPortalDataStore.getTokenForCurrentSession && url.match('session_status') && !url.match('login')) {
-  //   defaultHeader.Authorization = `Token ${obsPortalDataStore.getTokenForCurrentSession}`
-  // } else
+
   if (store.authToken) {
     defaultHeader.Authorization = `Token ${store.authToken}`
   }
diff --git a/src/utils/testUtils.js b/src/utils/testUtils.js
index d5cfb35..4d68c16 100644
--- a/src/utils/testUtils.js
+++ b/src/utils/testUtils.js
@@ -1,5 +1,6 @@
 import { createPinia, setActivePinia } from 'pinia'
-import { useObsPortalDataStore } from '../stores/sessions'
+import { useRealTimeSessionsStore } from '../stores/sessions'
+import { useObsPortalDataStore } from '../stores/obsPortalData'
 import { useUserDataStore } from '../stores/userData'
 import { useConfigurationStore } from '../stores/configuration'
 
@@ -8,6 +9,7 @@ export function createTestStores () {
   setActivePinia(pinia)
 
   // Create stores and set the necessary state for the tests
+  const realTimeSessionsStore = useRealTimeSessionsStore()
   const obsPortalDataStore = useObsPortalDataStore()
   const userDataStore = useUserDataStore()
   const configurationStore = useConfigurationStore()
@@ -22,6 +24,7 @@ export function createTestStores () {
 
   return {
     pinia,
+    realTimeSessionsStore,
     obsPortalDataStore,
     userDataStore,
     configurationStore