diff --git a/k8s/base/config.json b/k8s/base/config.json
index 9380f978..83312d32 100644
--- a/k8s/base/config.json
+++ b/k8s/base/config.json
@@ -4,5 +4,6 @@
   "ptrObserveUrl": "https://ptr-observe.lco.global",
   "observationPortalUrl": "https://observe.lco.global/api/",
   "thumbnailServiceUrl": "https://thumbnails.lco.global/",
+  "simbad2kUrl": "https://simbad2k.lco.global/",
   "archiveType": "lco"
 }
diff --git a/public/config/config.json b/public/config/config.json
index 4f94830e..f3bcd130 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -3,5 +3,6 @@
   "datalabArchiveApiUrl": "https://archive-api.lco.global/",
   "observationPortalUrl": "https://observe.lco.global/api/",
   "thumbnailServiceUrl": "https://thumbnails.lco.global/",
+  "simbad2kUrl": "https://simbad2k.lco.global/",
   "archiveType": "lco"
 }
diff --git a/src/App.vue b/src/App.vue
index eabda65b..149542bf 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -22,6 +22,7 @@ onMounted(async () => {
       configurationStore.observationPortalUrl = config.observationPortalUrl
       configurationStore.datalabArchiveApiUrl = config.datalabArchiveApiUrl
       configurationStore.thumbnailServiceUrl = config.thumbnailServiceUrl || ''
+      configurationStore.simbad2kUrl = config.simbad2kUrl || ''
       configurationStore.archiveType = config.archiveType || 'ptr'
       configurationStore.isConfigLoaded = true
     }
diff --git a/src/components/Analysis/LightCurvePlot.vue b/src/components/Analysis/LightCurvePlot.vue
index ad1ec59f..dc7c03c1 100644
--- a/src/components/Analysis/LightCurvePlot.vue
+++ b/src/components/Analysis/LightCurvePlot.vue
@@ -14,7 +14,7 @@ const DECIMAL_PLACES = 4
 const chartData = computed(() => {
   const magTimeSeries = analysisStore.magTimeSeries
 
-  const dates = magTimeSeries.map(({ julian_date }) => julian_date)
+  const dates = magTimeSeries.map(({ observation_date }) => observation_date)
   const magnitudes = magTimeSeries.map(({ mag }) => mag.toFixed(DECIMAL_PLACES))
   // Error bars as [lowerBound, upperBound]
   const errors = magTimeSeries.map(({ mag, magerr }) => {
diff --git a/src/components/Analysis/PeriodPlot.vue b/src/components/Analysis/PeriodPlot.vue
index 1097ab4f..753dccd4 100644
--- a/src/components/Analysis/PeriodPlot.vue
+++ b/src/components/Analysis/PeriodPlot.vue
@@ -21,7 +21,7 @@ const probabilityChipColor = computed(() => {
 
 // Periodogram data formatted for chartJs
 const chartData = computed(() => {
-  const periodogram = analysisStore.variableStarData.magPeriodogram
+  const periodogram = analysisStore.variableStarData.magPhasedLightCurve
 
   const period1 = periodogram.map(( p ) => ({ x: p.phase, y: p.mag}))
   const period2 = periodogram.map(( p ) => ({ x: p.phase + 1, y: p.mag}))
@@ -35,7 +35,7 @@ const chartData = computed(() => {
 })
 
 watch(() => analysisStore.variableStarData, () => {
-  periodChart && analysisStore.variableStarData.magPeriodogram ? updateChart() : createChart()
+  periodChart && analysisStore.variableStarData.magPhasedLightCurve ? updateChart() : createChart()
 }, { deep: true})
 
 function updateChart() {
diff --git a/src/components/Analysis/VariableStarDialog.vue b/src/components/Analysis/VariableStarDialog.vue
index fa605858..7b4a737d 100644
--- a/src/components/Analysis/VariableStarDialog.vue
+++ b/src/components/Analysis/VariableStarDialog.vue
@@ -31,13 +31,12 @@ const matchingImages = ref({ count: 0, results: [] })
 // When date range changes, queries the archive and updates tooltip with how many images are available
 watch([startDate, endDate], () => {
   const { datalabArchiveApiUrl } = configStore
-  const { imageFilter, imageProposalId } = analysisStore
+  const { imageFilter } = analysisStore
   const { ra, dec } = props.coords
 
-  const queryUrl = datalabArchiveApiUrl + 'frames/?' + 
+  const queryUrl = datalabArchiveApiUrl + 'frames/?force_count=true&reduction_level=91&' +
     `start=${ISOStartDate.value}&end=${ISOEndDate.value}&` +
     `primary_optical_element=${imageFilter}&` +
-    `proposal_id=${imageProposalId}&` +
     `covers=POINT(${ra} ${dec})`
 
   fetchApiCall({url: queryUrl, method: 'GET', 
diff --git a/src/components/DataSession/DataSession.vue b/src/components/DataSession/DataSession.vue
index 7bd646de..89e953c0 100644
--- a/src/components/DataSession/DataSession.vue
+++ b/src/components/DataSession/DataSession.vue
@@ -1,13 +1,14 @@
 <script setup>
 import { ref, watch, computed } from 'vue'
-import OperationPipeline from './OperationPipeline.vue'
+import OperationPipeline from './Operation/OperationPipeline.vue'
 import OperationPipelineFlow from './OperationGraph/OperationPipelineFlow.vue'
 import { fetchApiCall, handleError } from '@/utils/api.js'
 import { calculateColumnSpan } from '@/utils/common'
 import { useConfigurationStore } from '@/stores/configuration'
 import { useAlertsStore } from '@/stores/alerts'
-import ImageGrid from '@/components/Global/ImageGrid.vue'
-import OperationWizard from '@/components/DataSession/OperationWizard.vue'
+import OperationOutputGrid from '@/components/Global/OperationOutputGrid.vue'
+import OperationWizard from '@/components/DataSession/Operation/OperationWizard.vue'
+import _ from 'lodash'
 
 const props = defineProps({
   data: {
@@ -24,7 +25,7 @@ const store = useConfigurationStore()
 const alertStore = useAlertsStore()
 
 const operations = ref([...props.data.operations])
-const images = ref([...props.data.input_data])
+const items = ref([...props.data.input_data])
 const showWizardDialog = ref(false)
 const tab = ref('main')
 const operationPollingTimers = {}
@@ -38,9 +39,9 @@ var operationMap = {}
 // When a user clicks on an operation, we filter to only show the outputs of that operation
 const filteredImages = computed(() => {
   if (selectedOperation.value === -1) {
-    return images.value
+    return items.value
   } else {
-    return images.value.filter(image => image.operation === selectedOperation.value)
+    return items.value.filter(item => item.operation === selectedOperation.value)
   }
 })
 
@@ -55,22 +56,27 @@ function selectOperation(operationId) {
 }
 
 
-// Image Equality Check
-function imagesContainsFile(file) {
-  return images.value.some(image => image.basename == file.basename && image.source == file.source && image.operation == file.operation)
+// Output Equality Check
+function itemsContainsOutput(output) {
+  return items.value.some(item => _.isEqual(item, output))
 }
 
-// Add completed operation images to image list and attach operation metadata to identify their source
+// Add completed operation output to output items list and attach operation metadata to identify their source
 function addCompletedOperation(operation) {
-  if ('output' in operation && 'output_files' in operation.output) {
-    operation.output.output_files.forEach(outputFile => {
-      outputFile.operation = operation.id
-      outputFile.operationIndex = operation.index
-      outputFile.operationName = operation.name
-      if (!imagesContainsFile(outputFile)) {
-        images.value.push(outputFile)
+  const outputKeysToExpand = ['output_files', 'output_data']
+  if ('output' in operation){
+    for (const key of outputKeysToExpand) {
+      if (key in operation.output) {
+        operation.output[key].forEach(output => {
+          output.operation = operation.id
+          output.operationIndex = operation.index
+          output.operationName = operation.name
+          if (!itemsContainsOutput(output)) {
+            items.value.push(output)
+          }
+        })
       }
-    })
+    }
   }
 }
 
@@ -101,9 +107,9 @@ function stopPollingById(operationIDs) {
 function operationDeleted(operationIDs){
   // Stop polling for deleted operations
   stopPollingById(operationIDs)
-  // Remove outputFiles with matching operationIDs from images
-  images.value = images.value.filter(image => {
-    return !operationIDs.some(id => image.operation == id)
+  // Remove outputFiles with matching operationIDs from output items
+  items.value = items.value.filter(item => {
+    return !operationIDs.some(id => item.operation == id)
   })
 }
 
@@ -241,7 +247,7 @@ watch(
           :session-id="data.id"
           :operations="operations"
           :selected-operation="selectedOperation"
-          :images="images"
+          :images="items"
           :active="props.active"
           @select-operation="selectOperation"
           @close-graph="tab = 'main'"
@@ -273,8 +279,8 @@ watch(
             @click="showWizardDialog = true"
           />
         </v-col>
-        <image-grid
-          :images="filteredImages"
+        <operation-output-grid
+          :operation-outputs="filteredImages"
           :column-span="calculateColumnSpan(filteredImages.length, IMAGES_PER_ROW)"
         />
       </v-container>
@@ -287,7 +293,7 @@ watch(
     z-index="999"
   >
     <operation-wizard
-      :images="images"
+      :data="items"
       @close-wizard="showWizardDialog = false"
       @add-operation="addOperation"
     />
diff --git a/src/components/DataSession/MultiImageInputSelector.vue b/src/components/DataSession/Operation/MultiImageInputSelector.vue
similarity index 64%
rename from src/components/DataSession/MultiImageInputSelector.vue
rename to src/components/DataSession/Operation/MultiImageInputSelector.vue
index 45c4c2fa..1892a3aa 100644
--- a/src/components/DataSession/MultiImageInputSelector.vue
+++ b/src/components/DataSession/Operation/MultiImageInputSelector.vue
@@ -3,7 +3,7 @@ import { useThumbnailsStore } from '@/stores/thumbnails'
 import { useConfigurationStore } from '@/stores/configuration'
 import ThumbnailImage from '@/components/Global/ThumbnailImage.vue'
 import {Drag,DropList} from 'vue-easy-dnd'
-import { ref, onMounted, computed } from 'vue'
+import { ref, onMounted, computed, watch } from 'vue'
 
 const props = defineProps({
   inputDescriptions: {
@@ -28,11 +28,12 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits(['insertImage', 'removeImage', 'addChannel', 'removeChannel', 'updateChannelColor'])
+const emit = defineEmits(['insertImage', 'removeImage', 'setImages', 'addChannel', 'removeChannel', 'updateChannelColor'])
 
 const thumbnailsStore = useThumbnailsStore()
 const configurationStore = useConfigurationStore()
 var imageDetails = ref({})
+var selectedFilter = ref({})
 
 const colorChannelMode = computed(() => { return props.inputDescriptions.color_channels != null })
 
@@ -54,14 +55,54 @@ const fitsImages = computed(() => {
   })
 })
 
+const filterOptionsMap = computed(() => {
+  let filterMap = new Map()
+  if (fitsImages.value) {
+    fitsImages.value.forEach(image => {
+      const filter = image.filter || image.primary_optical_element
+      filterMap.set(filter, (filterMap.get(filter) || 0) + 1)
+    })
+  }
+  return filterMap
+})
+
 onMounted(() => {
   imageDetails.value = reloadImages(props.images)
 })
 
+// When inputDescriptions is set, update initial selectedFilter if need be
+watch(() => props.inputDescriptions, () => updateSelectedFilter())
+
+function mostFrequentFilterForInputKey(inputKey) {
+  let mostFrequentCount = 0
+  const filterOptions = filterOptionsForInputKey(inputKey)
+  let mostFrequentFilter = undefined
+  for (const [filter, count] of filterOptionsMap.value.entries()) {
+    if (filterOptions.includes(filter) && count > mostFrequentCount) {
+      mostFrequentCount = count
+      mostFrequentFilter = filter
+    }
+  }
+  return mostFrequentFilter
+}
+
+function filterOptionsForInputKey(inputKey) {
+  let filterOptions = Array.from(filterOptionsMap.value.keys())
+  if (props.inputDescriptions[inputKey].filter_options) {
+    return filterOptions.filter(item => props.inputDescriptions[inputKey].filter_options.includes(item))
+  }
+  else{
+    return filterOptions
+  }
+}
+
 // Image dragged into the selected images area
 function insert(inputKey, index, event) {
-  if (inputKey !== 'all' && ! props.inputImages[inputKey].includes(event.data)) {
-    emit('insertImage', inputKey, event.data, index)
+  if (inputKey !== 'all' && !props.inputImages[inputKey].includes(event.data)) {
+    // Also check if the inputKey is single_filter mode and already has another filter set
+    if (!props.inputDescriptions[inputKey].single_filter || event.data.filter == selectedFilter.value[inputKey] || event.data.primary_optical_element == selectedFilter.value[inputKey]) {
+      emit('insertImage', inputKey, event.data, index)
+    }
   }
 }
 
@@ -86,6 +127,24 @@ function reloadImages(newImages) {
   return newImageDetails
 }
 
+function updateSelectedFilter() {
+  if (props.inputDescriptions) {
+    for (const [inputKey, inputDescription] of Object.entries(props.inputDescriptions)) {
+      if (inputDescription.single_filter) {
+        selectedFilter.value[inputKey] = mostFrequentFilterForInputKey(inputKey)
+        updateSelectedImagesForFilter(inputKey, selectedFilter.value[inputKey])
+      }
+    }
+  }
+}
+
+function updateSelectedImagesForFilter(inputKey, filter) {
+  let filteredImages = fitsImages.value.filter(image => {
+    return image.filter == filter || image.primary_optical_element == filter
+  })
+  emit('setImages', inputKey, filteredImages)
+}
+
 </script>
 
 <template>
@@ -94,10 +153,28 @@ function reloadImages(newImages) {
       <v-card
         v-for="(inputKey, index) in inputList"
         :key="inputKey+index"
-        :title="props.inputDescriptions[inputKey].name"
         color="var(--card-background)"
         density="compact"
       >
+        <v-card-title>
+          <div v-if="!props.inputDescriptions[inputKey].single_filter">
+            {{ props.inputDescriptions[inputKey].name }}
+          </div>
+          <div v-if="props.inputDescriptions[inputKey].single_filter">
+            <v-select
+              v-model="selectedFilter[inputKey]"
+              :items="filterOptionsForInputKey(inputKey)"
+              label="Filter"
+              density="compact"
+              variant="outlined"
+              @update:model-value="updateSelectedImagesForFilter(inputKey, $event)"
+            >
+              <template #prepend>
+                {{ props.inputDescriptions[inputKey].name }} Filter:
+              </template>
+            </v-select>
+          </div>
+        </v-card-title>
         <v-card-text>
           <drop-list
             :items="colorChannelMode? [props.inputImages[inputKey][index]] : props.inputImages[inputKey]"
@@ -133,6 +210,13 @@ function reloadImages(newImages) {
               />
             </template>
           </drop-list>
+          <v-alert
+            v-if="props.inputDescriptions[inputKey].minimum && props.inputImages[inputKey].length < props.inputDescriptions[inputKey].minimum"
+            density="compact"
+            :text="'Requires at least ' + props.inputDescriptions[inputKey].minimum + ' images'"
+            type="warning"
+          >
+          </v-alert>
           <v-color-picker
             v-if="colorChannelMode"
             :model-value="props.inputImages[inputKey][index].color"
@@ -234,6 +318,7 @@ function reloadImages(newImages) {
   min-width: 200px;
   min-height: 200px;
   display: flex;
+  overflow-x: scroll;
 }
 
 </style>
diff --git a/src/components/DataSession/OperationPipeline.vue b/src/components/DataSession/Operation/OperationPipeline.vue
similarity index 100%
rename from src/components/DataSession/OperationPipeline.vue
rename to src/components/DataSession/Operation/OperationPipeline.vue
diff --git a/src/components/DataSession/OperationWizard.vue b/src/components/DataSession/Operation/OperationWizard.vue
similarity index 72%
rename from src/components/DataSession/OperationWizard.vue
rename to src/components/DataSession/Operation/OperationWizard.vue
index 646d7f48..b17707e3 100644
--- a/src/components/DataSession/OperationWizard.vue
+++ b/src/components/DataSession/Operation/OperationWizard.vue
@@ -2,10 +2,10 @@
 import { ref, onMounted, computed} from 'vue'
 import { fetchApiCall, handleError } from '@/utils/api'
 import { rgbFilterMap, colorRGBMap } from '@/utils/color'
-import MultiImageInputSelector from '@/components/DataSession/MultiImageInputSelector.vue'
+import MultiImageInputSelector from '@/components/DataSession/Operation/MultiImageInputSelector.vue'
 import WizardScalingPage from '@/components/Global/Scaling/WizardScalingPage.vue'
+import SourceInputWidget from './SourceInputWidget.vue'
 import { useConfigurationStore } from '@/stores/configuration'
-
 /*
   This component is a step wizard for configuring the input of a new operation to the data session.
   It has three main pages:
@@ -15,8 +15,8 @@ import { useConfigurationStore } from '@/stores/configuration'
 */
 
 const props = defineProps({
-  // Available images to select from
-  images: {
+  // Available operation data (images or output data) to select from
+  data: {
     type: Array,
     required: true
   }
@@ -40,8 +40,43 @@ const WIZARD_PAGES = {
 // Start on the select operation page
 const page = ref(WIZARD_PAGES.SELECT)
 
+const images = computed(() => {
+  return props.data.filter(image => image.basename)
+})
+
 const inputDescriptions = computed(() => { return selectedOperation.value.inputs })
 
+// Groups of 2 elements to set for inputDescriptions that are not image based
+const groupedInputDescriptions = computed(() => {
+  const typesToGroup = ['string', 'float', 'int']
+  let groups = []
+  let currentGroup = {}
+  if (inputDescriptions.value) {
+    for( const [inputKey, inputDescription] of Object.entries(inputDescriptions.value)) {
+      if (typesToGroup.includes(inputDescription.type)) {
+        currentGroup[inputKey] = inputDescription
+        if (Object.keys(currentGroup).length == 2) {
+          groups.push({...currentGroup})
+          currentGroup = {}
+        }
+      }
+    }
+  }
+  return groups
+})
+
+const sourceInputDescriptions = computed(() => {
+  let sourceDescriptions = {}
+  if (inputDescriptions.value) {
+    for ( const [inputKey, inputDescription] of Object.entries(inputDescriptions.value)) {
+      if (inputDescription.type == 'source') {
+        sourceDescriptions[inputKey] = {...inputDescription}
+      }
+    }
+  }
+  return sourceDescriptions
+})
+
 // Text for the forward button changes based on the current page
 const goForwardText = computed(() => {
   if (page.value == WIZARD_PAGES.SELECT) {
@@ -88,11 +123,20 @@ const disableGoForward = computed(() => {
 const isInputComplete = computed(() => {
   for (const inputKey in operationInputs.value) {
     const input = operationInputs.value[inputKey]
-    const minimum = inputDescriptions.value[inputKey].minimum
-    const lessThanMinimumInputs = minimum ? input.length < minimum : input.length == 0
-    if ( input === undefined || input === null || lessThanMinimumInputs) {
+    if ( input === undefined || input === null) {
       return false
     }
+    if (inputDescriptions.value[inputKey].type == 'source') {
+      if (!input.ra || !input.dec) {
+        return false
+      }
+    }
+    if (Array.isArray(input)) {
+      const minimum = inputDescriptions.value[inputKey].minimum || 0
+      if (input.length < minimum) {
+        return false
+      }
+    }
   }
   return true
 })
@@ -129,7 +173,7 @@ function goForward() {
     // if there are no images for a filter required by the operation, do not proceed
     for (const inputKey in inputDescriptions.value) {
       const inputField = inputDescriptions.value[inputKey]
-      if (inputField.type == 'fits' && props.images.length == 0){
+      if (inputField.type == 'fits' && images.value.length == 0){
         return
       }
     }
@@ -182,7 +226,7 @@ function selectOperation(name) {
        * Default: start with 3 channels (RGB) and try to preselect images for those
        */
       operationInputs.value[key] = Object.entries(rgbFilterMap).map(([color, filters]) => {
-        const preselectedImage = props.images.find(image => filters.includes(image.filter.toLowerCase()))
+        const preselectedImage = images.value.find(image => filters.includes(image.filter.toLowerCase()))
         let output = {}
         if (preselectedImage) {
           output = {...preselectedImage}
@@ -191,9 +235,22 @@ function selectOperation(name) {
         return output
       })
     }
-    else {
+    else if (value.type == 'fits') {
       operationInputs.value[key] = []
     }
+    else if (value.type == 'source') {
+      operationInputs.value[key] = {}
+    }
+    else {
+      operationInputs.value[key] = null
+    }
+  }
+}
+
+// Set images to the inputKey - only for non-color images
+function setImages(inputKey, filteredImages) {
+  if (!imageInputDescriptions.value[inputKey].color_picker) {
+    operationInputs.value[inputKey] = [...filteredImages]
   }
 }
 
@@ -308,30 +365,66 @@ function updateScaling(channelIndex, zmin, zmax) {
         v-show="page == WIZARD_PAGES.CONFIGURE"
         class="wizard-card"
       >
+        <v-row
+          v-for="(group, index) in groupedInputDescriptions"
+          :key="'input-row-' + index"
+        >
+          <v-col
+            v-for="(inputDescription, inputKey) in group"
+            class="pb-0"
+            :key="'input-col-' + inputKey"
+          >
+            <source-input-widget
+              v-if="inputDescription.type == 'source'"
+              v-model="operationInputs[inputKey]">
+            </source-input-widget>
+            <v-text-field
+              v-else-if="inputDescription.type == 'string' && !inputDescription.options"
+              v-model="operationInputs[inputKey]"
+              :label="inputDescription.name"
+              type="text"
+              class="operation-input"
+            />
+            <v-select
+              v-else-if="inputDescription.type == 'string' && inputDescription.options"
+              v-model="operationInputs[inputKey]"
+              return-object
+              :label="inputDescription.name"
+              :items="inputDescription.options"
+            />
+            <v-number-input
+              v-else-if="inputDescription.type == 'int'"
+              v-model="operationInputs[inputKey]"
+              :label="inputDescription.name"
+              :precision="0"
+            />
+            <v-number-input
+              v-else-if="inputDescription.type == 'float'"
+              v-model="operationInputs[inputKey]"
+              :label="inputDescription.name"
+              :precision="null"
+              control-variant="hidden"
+            />
+          </v-col>
+        </v-row>
+        <source-input-widget
+          v-for="(inputDescription, inputKey) in sourceInputDescriptions"
+          v-model="operationInputs[inputKey]"
+          :key="'source-input-widget-' + inputKey" >
+        </source-input-widget>
         <multi-image-input-selector
           :input-descriptions="imageInputDescriptions"
           :input-images="operationInputs"
-          :images="props.images"
+          :images="images"
           :max-inputs="MAX_COLOR_CHANNELS"
           :min-inputs="MIN_COLOR_CHANNELS"
+          @set-images="setImages"
           @insert-image="insertImage"
           @remove-image="removeImage"
           @add-channel="addColorChannel"
           @remove-channel="removeColorChannel"
           @update-channel-color="updateColorChannel"
         />
-        <div
-          v-for="(inputDescription, inputKey) in inputDescriptions"
-          :key="inputKey"
-        >
-          <v-text-field
-            v-if="inputDescription.type == 'text'"
-            v-model="operationInputs[inputKey]"
-            :label="inputDescription.name"
-            :type="inputDescription.type"
-            class="operation-input"
-          />
-        </div>
       </v-card-text>
     </v-slide-y-reverse-transition>
     <v-slide-y-reverse-transition hide-on-leave>
diff --git a/src/components/DataSession/Operation/SourceInputWidget.vue b/src/components/DataSession/Operation/SourceInputWidget.vue
new file mode 100644
index 00000000..6ee27f2b
--- /dev/null
+++ b/src/components/DataSession/Operation/SourceInputWidget.vue
@@ -0,0 +1,76 @@
+<script setup>
+import { ref } from 'vue'
+import { useConfigurationStore } from '@/stores/configuration'
+
+const configStore = useConfigurationStore()
+
+const source = defineModel()
+const loading = ref(false)
+const targetNameError = ref('')
+
+async function performTargetLookup() {
+  if (source.value.name) {
+    loading.value = true
+    targetNameError.value = ''
+    const url =  configStore.simbad2kUrl + source.value.name + '?target_type=SIDEREAL' 
+    try {
+      const response = await fetch(url)
+      if (!response.ok) {
+        loading.value = false
+        targetNameError.value = 'Failed Target name lookup'
+      }
+      else {
+        const result = await response.json()
+        if (result.error) {
+          targetNameError.value = result.error
+        }
+        if (result.dec) {
+          source.value.dec = result.dec
+        }
+        if (result.ra) {
+          source.value.ra = result.ra
+        }
+        loading.value = false
+      }
+    } catch (error) {
+      loading.value = false
+      targetNameError.value = error
+    }
+  }
+}
+
+</script>
+<template>
+  <v-row>
+    <v-col class="pb-0">
+      <v-text-field
+        v-model="source.name"
+        :loading="loading"
+        :error-messages="targetNameError"
+        label="Source name"
+        type="text"
+        append-inner-icon="mdi-magnify"
+        @click:append-inner="performTargetLookup"
+      />
+    </v-col>
+    <v-col>
+      <v-number-input
+        v-model="source.ra"
+        label="Right Ascension"
+        :precision="null"
+        control-variant="hidden"
+      />
+    </v-col>
+    <v-col>
+      <v-number-input
+        v-model="source.dec"
+        label="Declination"
+        :precision="null"
+        control-variant="hidden"
+      />
+    </v-col>
+  </v-row>
+</template>
+
+<style scoped>
+</style>
diff --git a/src/components/Global/DataOutput.vue b/src/components/Global/DataOutput.vue
new file mode 100644
index 00000000..c99a08a7
--- /dev/null
+++ b/src/components/Global/DataOutput.vue
@@ -0,0 +1,141 @@
+<script setup>
+import { computed } from 'vue'
+import FilterBadge from './FilterBadge.vue'
+
+const props = defineProps({
+  operationOutput: {
+    type: Object,
+    default: () => {}
+  },
+  isSelected: {
+    type: Boolean,
+    default: false
+  },
+  enableCards: {
+    type: Boolean,
+    default: true
+  },
+  enableRemoval: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const lightCurveSparkline = computed(() => {
+  if (props.operationOutput.light_curve) {
+    return props.operationOutput.light_curve.map(({ mag }) => mag)
+  }
+  return []
+})
+
+const periodogramSparkline = computed(() => {
+  if (props.operationOutput.power) {
+    return props.operationOutput.power
+  }
+  return []
+})
+
+const title = computed (() => {
+  let text = ''
+  if (props.operationOutput?.source) {
+    text = props.operationOutput.source?.name
+  }
+  else {
+    text = props.operationOutput?.operationName
+  }
+  return text
+})
+
+const emit = defineEmits(['selectOperationOutput', 'launchAnalysis', 'removeOperationOutput'])
+
+</script>
+<template>
+  <v-sheet
+    v-if="props.operationOutput"
+    class="pa-1 annotated-output"
+    color="var(--secondary-background)"
+    :elevation="2"
+    rounded
+    :class="{ 'selected-output': isSelected }"
+    @click="emit('selectOperationOutput', props.operationOutput)"
+  >
+    <v-card density="compact">
+      <v-card-title class="output-title">
+        <filter-badge
+          v-if="props.operationOutput.filter"
+          :filter="props.operationOutput.filter"
+        />
+        <p class="ml-2 output-title-text">{{ props.operationOutput.operationName }}</p>
+      </v-card-title>
+      <v-card-text class="p-1">
+        <v-sparkline
+          v-if="props.operationOutput.light_curve" 
+          v-model="lightCurveSparkline"
+        ></v-sparkline>
+        <v-sparkline
+          v-if="props.operationOutput.power" 
+          v-model="periodogramSparkline"
+        ></v-sparkline>
+        <p v-if="props.operationOutput.period">{{ props.operationOutput.period.toFixed(4) }} days</p>
+        <span
+          v-if="props.enableRemoval"
+          class="removal-button-overlay"
+        >
+          <v-btn
+            density="compact"
+            icon="mdi-close"
+            @click="emit('removeImage', props.image)"
+          />
+        </span>
+      </v-card-text>
+    </v-card>
+    <div
+      v-if="props.enableCards"
+      class="d-flex flex-row ga-2 align-center mt-2"
+    >
+      <p class="text-subtitle-2 mr-auto prevent-select single-line-text">
+        {{ title }}
+      </p>
+      <v-icon
+        icon="mdi-eye"
+        color="var(--primary-interactive)"
+        @click.stop="emit('launchAnalysis', props.operationOutput)"
+      />
+    </div>
+  </v-sheet>
+  <v-skeleton-loader
+    v-else
+    type="card"
+    color="var(--secondary-background)"
+    bg-color="var(--primary-background)"
+  />
+</template>
+
+<style scoped>
+.output-title {
+  padding: 0 0 0 0;
+  display: flex;
+}
+
+.output-title-text {
+  align-content: center;
+}
+
+.annotated-output {
+  max-width: 200px;
+  min-width: 120px;
+  width: 100%;
+}
+
+.selected-output {
+  outline: 0.3rem solid var(--primary-interactive);
+}
+
+.removal-button-overlay {
+  color: var(--text);
+  font-weight: bold;
+  right: 5px;
+  bottom: 5px;
+  position: absolute;
+}
+</style>
diff --git a/src/components/Global/ImageGrid.vue b/src/components/Global/ImageGrid.vue
index 48e84b1d..933cb2af 100644
--- a/src/components/Global/ImageGrid.vue
+++ b/src/components/Global/ImageGrid.vue
@@ -4,7 +4,7 @@ import { useThumbnailsStore } from '@/stores/thumbnails'
 import { useConfigurationStore } from '@/stores/configuration'
 import { useAlertsStore } from '@/stores/alerts'
 import ThumbnailImage from '@/components/Global/ThumbnailImage.vue'
-import AnalysisView from '../../views/AnalysisView.vue'
+import ImageAnalysisView from '../../views/ImageAnalysisView.vue'
 
 const props = defineProps({
   images: {
@@ -97,7 +97,7 @@ watch(() => props.images, () => {
     v-model="showAnalysisDialog"
     fullscreen
   >
-    <analysis-view
+    <image-analysis-view
       :image="analysisImage"
       @close-analysis-dialog="showAnalysisDialog = false"
     />
diff --git a/src/components/Global/OperationOutputGrid.vue b/src/components/Global/OperationOutputGrid.vue
new file mode 100644
index 00000000..a3d12c47
--- /dev/null
+++ b/src/components/Global/OperationOutputGrid.vue
@@ -0,0 +1,139 @@
+<script setup>
+import { ref, watch } from 'vue'
+import { useThumbnailsStore } from '@/stores/thumbnails'
+import { useConfigurationStore } from '@/stores/configuration'
+import { useAlertsStore } from '@/stores/alerts'
+import ThumbnailImage from '@/components/Global/ThumbnailImage.vue'
+import DataOutput from '@/components/Global/DataOutput.vue'
+import ImageAnalysisView from '@/views/ImageAnalysisView.vue'
+import DataAnalysisView from '@/views/DataAnalysisView.vue'
+
+const props = defineProps({
+  operationOutputs: {
+    type: Array,
+    default: () => []
+  },
+  columnSpan: {
+    type: Number,
+    required: true
+  },
+  enableImageCards: {
+    type: Boolean,
+    default: true
+  }
+})
+
+const configurationStore = useConfigurationStore()
+const alertsStore = useAlertsStore()
+const thumbnailsStore = useThumbnailsStore()
+const showImageAnalysisDialog = ref(false)
+const showDataAnalysisDialog = ref(false)
+const imageDetails = ref({})
+const analysisImage = ref({})
+const analysisData = ref({})
+
+async function ensureLargeCachedUrl(image) {
+  if (!image.largeCachedUrl) {
+    const url = image.large_url || image.largeThumbUrl || ''
+    image.largeCachedUrl = await thumbnailsStore.cacheImage('large', configurationStore.archiveType, url, image.basename)
+  }
+  return image.largeCachedUrl
+}
+
+const launchAnalysis = async (image) => {
+  alertsStore.setAlert('info', `Opening ${image?.basename} for analysis`)
+  try {
+    await ensureLargeCachedUrl(image)
+    analysisImage.value = image
+    showImageAnalysisDialog.value = true
+  } catch {
+    alertsStore.setAlert('error', `Failed to open ${image?.basename}`)
+  }
+}
+
+const launchDataAnalysis = async (data) => {
+  analysisData.value = data
+  showDataAnalysisDialog.value = true
+}
+
+function isImage(operationOutput) {
+  if (operationOutput.basename) {
+    return true
+  }
+  return false
+}
+
+watch(() => props.operationOutputs, () => {
+  props.operationOutputs.forEach(operationOutput => {
+    if (operationOutput.basename && !(operationOutput.basename in imageDetails.value)) {
+      imageDetails.value[operationOutput.basename] = ref('')
+      const url = operationOutput.smallThumbUrl || operationOutput.small_url ||''
+      thumbnailsStore.cacheImage('small', configurationStore.archiveType, url, operationOutput.basename).then((cachedUrl) => {
+        imageDetails.value[operationOutput.basename] = cachedUrl
+      })
+    }
+  })
+}, { deep: true, immediate: true })
+
+</script>
+
+<template>
+  <v-row>
+    <v-col
+      v-for="(operationOutput, index) in props.operationOutputs"
+      :key="index"
+      :cols="columnSpan"
+      class="image-grid-col"
+    >
+      <thumbnail-image
+        v-if="isImage(operationOutput)"
+        :image="operationOutput"
+        :image-url="imageDetails[operationOutput.basename]"
+        :is-selected="false"
+        :enable-image-cards="true"
+        :enable-removal="false"
+        @launch-analysis="launchAnalysis(operationOutput)"
+      />
+      <data-output
+        v-if="!isImage(operationOutput)"
+        :operation-output="operationOutput"
+        :is-selected="false"
+        :enable-cards="true"
+        :enable-removal="false"
+        @launch-analysis="launchDataAnalysis(operationOutput)"
+      >
+      </data-output>
+    </v-col>
+  </v-row>
+  <v-dialog
+    v-model="showImageAnalysisDialog"
+    fullscreen
+  >
+    <image-analysis-view
+      :image="analysisImage"
+      @close-analysis-dialog="showImageAnalysisDialog = false"
+    />
+  </v-dialog>
+  <v-dialog
+    v-model="showDataAnalysisDialog"
+    fullscreen
+  >
+    <data-analysis-view
+      :data="analysisData"
+      @close-analysis-dialog="showDataAnalysisDialog = false"
+    >
+    </data-analysis-view>
+  </v-dialog>
+</template>
+
+<style scoped>
+.image-text-overlay {
+  color: var(--text);
+  font-weight: bold;
+  margin-right: 5px;
+  float: right;
+}
+.image-grid-col {
+  max-width: 200px;
+}
+</style>
diff --git a/src/components/Project/CreateSessionDialog.vue b/src/components/Project/CreateSessionDialog.vue
index f5775eb2..b85b8b71 100644
--- a/src/components/Project/CreateSessionDialog.vue
+++ b/src/components/Project/CreateSessionDialog.vue
@@ -41,8 +41,9 @@ async function addImagesToExistingSession(session){
     'basename': image.basename.replace('-small', '') || image.basename.replace('-large', ''),
     'id': image.id,
     'url': image.url,
-    'filter': image.FILTER,
-    'target_name': image.target_name
+    'filter': image.primary_optical_element,
+    'target_name': image.target_name,
+    'observation_date': image.observation_date
   }))]
   const requestBody = {
     'name': session.name,
@@ -62,8 +63,9 @@ async function createNewDataSession(){
     'basename': image.basename.replace('-small', '') || image.basename.replace('-large', ''),
     'id': image.id,
     'url': image.url,
-    'filter': image.FILTER,
-    'target_name': image.target_name
+    'filter': image.primary_optical_element,
+    'target_name': image.target_name,
+    'observation_date': image.observation_date
   }))
   const requestBody = {
     'name': newSessionName.value,
diff --git a/src/components/Project/ImageList.vue b/src/components/Project/ImageList.vue
index 85328d15..79059c97 100644
--- a/src/components/Project/ImageList.vue
+++ b/src/components/Project/ImageList.vue
@@ -5,7 +5,7 @@ import { useAlertsStore } from '@/stores/alerts'
 import { useConfigurationStore } from '@/stores/configuration'
 import { siteIDToName } from '@/utils/common'
 import FilterBadge from '@/components/Global/FilterBadge.vue'
-import ImageAnalyzer from '../../views/AnalysisView.vue'
+import ImageAnalyzer from '../../views/ImageAnalysisView.vue'
 
 const props = defineProps({
   images: {
diff --git a/src/stores/analysis.js b/src/stores/analysis.js
index 79da6a5f..0607205d 100644
--- a/src/stores/analysis.js
+++ b/src/stores/analysis.js
@@ -29,7 +29,7 @@ export const useAnalysisStore = defineStore('analysis', {
     variableStarData: {
       loading: false, // flag to indicate if variable star data is loading
       targetCoords: 0, // target coordinates for the variable star
-      magPeriodogram: [], // magTimeSeries sorted by phase
+      magPhasedLightCurve: [], // magTimeSeries sorted by phase
       period: 0, // period of the variable star
       falseAlarmProbability: 0, // false alarm probability for the variable star
       fluxFallback: false, // flag to indicate if flux fallback is used
@@ -38,8 +38,8 @@ export const useAnalysisStore = defineStore('analysis', {
   }),
   getters: {
     // General
-    imageProposalId: (state) => { return state.image?.proposal_id},
-    imageFilter: (state) => { return state.image?.FILTER },
+    imageProposalId: (state) => { return state.image?.proposal_id || state.headerData?.PROPID },
+    imageFilter: (state) => { return state.image?.filter || state.headerData?.FILTER },
     loading: (state) => { return state.imageScaleLoading || state.variableStarData.loading },
     // Histogram Editing
     imageScaleReady: (state) => state.imageWidth && state.imageHeight && state.rawData && state.zmin != null && state.zmax != null,
@@ -150,7 +150,7 @@ export const useAnalysisStore = defineStore('analysis', {
         this.variableStarData = {
           loading: false,
           targetCoords: target_coords,
-          magPeriodogram: [],
+          magPhasedLightCurve: [],
           period: period,
           falseAlarmProbability: fap,
           fluxFallback: flux_fallback,
@@ -160,7 +160,7 @@ export const useAnalysisStore = defineStore('analysis', {
         foldPeriod(this.magTimeSeries, this.variableStarData.period)
 
         // Sort the light curve data by phase
-        this.variableStarData.magPeriodogram = [...this.magTimeSeries].sort((a, b) => a.phase - b.phase)
+        this.variableStarData.magPhasedLightCurve = [...this.magTimeSeries].sort((a, b) => a.phase - b.phase)
       }
 
       this.variableStarData.loading = false
diff --git a/src/views/DataAnalysisView.vue b/src/views/DataAnalysisView.vue
new file mode 100644
index 00000000..dc16a42c
--- /dev/null
+++ b/src/views/DataAnalysisView.vue
@@ -0,0 +1,67 @@
+<script setup>
+import { computed } from 'vue'
+import FilterBadge from '@/components/Global/FilterBadge.vue'
+
+const props = defineProps({
+  data: {
+    type: Object,
+    required: true,
+    default: null,
+  }
+})
+
+const emit = defineEmits(['closeAnalysisDialog'])
+
+const title = computed(() => {
+  let text = props.data?.operationName || 'Unknown'
+  if (props.data?.source) {
+    text += ': ' + props.data.source?.name
+  }
+  return text
+})
+
+</script>
+<template>
+  <v-sheet class="analysis-page">
+    <v-toolbar
+      class="analysis-toolbar"
+      density="comfortable"
+    >
+      <filter-badge
+        v-if="props.data.filter"
+        :filter="props.data.filter"
+        class="ml-2"
+      />
+      <v-toolbar-title :text="title" />
+      <v-btn
+        icon="mdi-close"
+        color="var(--cancel)"
+        @click="emit('closeAnalysisDialog')"
+      />
+    </v-toolbar>
+    <div class="analysis-content">
+    </div>
+  </v-sheet>
+</template>
+<style scoped>
+/* Main Sections */
+.analysis-page{
+  background-color: var(--primary-background);
+  color: greenyellow;
+  font-family: var(--font-stack);
+  height: 100vh;
+  max-height: 100vh;
+  display: flex;
+  flex-direction: column;
+}
+.analysis-toolbar{
+  color: var(--text);
+  background-color: var(--header);
+}
+.analysis-content{
+  flex: 1;
+  display: flex;
+  flex-direction: row;
+  padding: 0.5rem;
+}
+</style>
diff --git a/src/views/AnalysisView.vue b/src/views/ImageAnalysisView.vue
similarity index 97%
rename from src/views/AnalysisView.vue
rename to src/views/ImageAnalysisView.vue
index c03250aa..67bc1d2a 100644
--- a/src/views/AnalysisView.vue
+++ b/src/views/ImageAnalysisView.vue
@@ -55,7 +55,7 @@ const filteredCatalog = computed(() => {
 
 const sideChartItems = computed(() => {
   const chartItems = []
-  if (analysisStore.variableStarData.magPeriodogram?.length) chartItems.push('Periodogram')
+  if (analysisStore.variableStarData.magPhasedLightCurve?.length) chartItems.push('Phased Light Curve')
   if (analysisStore.magTimeSeries?.length) chartItems.push('Light Curve')
   if (lineProfile.value?.length) chartItems.push('Line Profile')
   return chartItems
@@ -115,7 +115,7 @@ function handleAnalysisOutput(response, action, action_callback){
   case 'variable-star':
     analysisStore.setVariableStarData(response)
     // Default to periodogram if available, otherwise light curve
-    analysisStore.variableStarData.period ? sideChart.value = 'Periodogram' : sideChart.value = 'Light Curve'
+    analysisStore.variableStarData.period ? sideChart.value = 'Phased Light Curve' : sideChart.value = 'Light Curve'
     break
   case 'get-tif':
     // ImageDownloadMenu.vue downloadFile()
@@ -278,7 +278,7 @@ function updateScaling(min, max){
               :end-coords="endCoords"
               :position-angle="positionAngle"
             />
-            <period-plot v-show="analysisStore.variableStarData.magPeriodogram?.length && sideChart === 'Periodogram'" />
+            <period-plot v-show="analysisStore.variableStarData.magPhasedLightCurve?.length && sideChart === 'Phased Light Curve'" />
             <light-curve-plot v-show="analysisStore.magTimeSeries?.length && sideChart === 'Light Curve'" />
           </v-sheet>
         </v-expand-transition>