diff --git a/app/components/CameraOrientation.vue b/app/components/CameraOrientation.vue
index 222e08cb..c2b15698 100644
--- a/app/components/CameraOrientation.vue
+++ b/app/components/CameraOrientation.vue
@@ -1,6 +1,6 @@
 <script setup>
 import ToolPanel from "@ogw_front/components/ToolPanel";
-import { applyCameraOptions } from "@ogw_internal/stores/hybrid_viewer_camera";
+import { applyCameraOptions } from "@ogw_internal/stores/hybrid_viewer/camera";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
 import { newInstance as vtkAnnotatedCubeActor } from "@kitware/vtk.js/Rendering/Core/AnnotatedCubeActor";
 import { newInstance as vtkGenericRenderWindow } from "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow";
diff --git a/app/stores/hybrid_viewer.js b/app/stores/hybrid_viewer.js
index d03147a9..1c6a38e8 100644
--- a/app/stores/hybrid_viewer.js
+++ b/app/stores/hybrid_viewer.js
@@ -1,80 +1,42 @@
-import {
-  ACTOR_COLOR,
-  BACKGROUND_COLOR,
-  WHEEL_TIME_OUT_MS,
-} from "@ogw_internal/stores/hybrid_viewer_constants";
 import {
   applySnapshot,
   getCameraOptions,
-  performCameraOrientation,
-  performFocusCameraOnObject,
-  performSetCamera,
-  performSyncRemoteCamera,
-} from "@ogw_internal/stores/hybrid_viewer_camera";
-import {
-  createClearHoverData,
-  createHoverHighlight,
-} from "@ogw_internal/stores/hybrid_viewer_highlight";
-import {
-  performAddItem,
-  performClear,
-  performClearHoverHighlight,
-  performClickPicking,
-  performRemoveItem,
-  performResize,
-  performSetClippingPlanes,
-  performSetContainer,
-  performSetShrink,
-  performSetVisibility,
-  performSetZScaling,
-} from "@ogw_internal/stores/hybrid_viewer";
-import { computeAverageBrightness } from "@ogw_internal/stores/hybrid_viewer_brightness";
-import { newInstance as vtkActor } from "@kitware/vtk.js/Rendering/Core/Actor";
+  useHybridViewerCamera,
+} from "@ogw_internal/stores/hybrid_viewer/camera";
+import { BACKGROUND_COLOR } from "@ogw_internal/stores/hybrid_viewer/constants";
+import { useHybridViewerBrightness } from "@ogw_internal/stores/hybrid_viewer/brightness";
+import { useHybridViewerFilters } from "@ogw_internal/stores/hybrid_viewer/filters";
+import { useHybridViewerHighlight } from "@ogw_internal/stores/hybrid_viewer/highlight";
+import { useHybridViewerScene } from "@ogw_internal/stores/hybrid_viewer/scene";
+import { useHybridViewerViewport } from "@ogw_internal/stores/hybrid_viewer/viewport";
 import { newInstance as vtkGenericRenderWindow } from "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow";
-import { newInstance as vtkMapper } from "@kitware/vtk.js/Rendering/Core/Mapper";
-import { newInstance as vtkXMLPolyDataReader } from "@kitware/vtk.js/IO/XML/XMLPolyDataReader";
 
 import { Status } from "@ogw_front/utils/status";
-import { useDataStore } from "@ogw_front/stores/data";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 // oxlint-disable max-lines-per-function, max-statements
 export const useHybridViewerStore = defineStore("hybridViewer", () => {
-  const dataStore = useDataStore();
-  const hybridDb = reactive({});
   const viewerStore = useViewerStore();
-  const camera_options = reactive({});
   const genericRenderWindow = reactive({});
   const status = ref(Status.NOT_CREATED);
   const is_moving = ref(false);
   const is_picking = ref(false);
-  const is_hover_highlight = ref(false);
-  const hover_highlight_field_type = ref("CELL");
-  const hoverData = ref(undefined);
-  const hoverPosition = ref({ x: 0, y: 0 });
-  const zScale = ref(1);
   let imageStyle = undefined;
-  let viewStream = undefined;
-  let wheelEventEndTimeout = undefined;
-  const gridActor = undefined;
 
   watch(is_picking, (value) => {
-    const element = genericRenderWindow.value
-      ?.getApiSpecificRenderWindow()
-      ?.getCanvas()?.parentElement;
-    if (element) {
-      element.style.cursor = value ? "crosshair" : "default";
+    if (!genericRenderWindow.value) {
+      return;
+    }
+    const webGLRenderWindow = genericRenderWindow.value.getApiSpecificRenderWindow();
+    const canvas = webGLRenderWindow.getCanvas();
+    if (canvas && canvas.parentElement) {
+      canvas.parentElement.style.cursor = value ? "crosshair" : "default";
     }
   });
 
-  const latestImage = ref(undefined);
-  const offscreenCanvas =
-    typeof document === "undefined" ? undefined : document.createElement("canvas");
-  const offscreenCtx = offscreenCanvas
-    ? offscreenCanvas.getContext("2d", { willReadFrequently: true })
-    : undefined;
+  const brightnessStore = useHybridViewerBrightness();
 
   async function initHybridViewer() {
     if (status.value !== Status.NOT_CREATED) {
@@ -89,112 +51,25 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     imageStyle = webGLRenderWindow.getReferenceByName("bgImage").style;
     Object.assign(imageStyle, { transition: "opacity 0.1s ease-in", zIndex: 1 });
     await viewerStore.ws_connect();
-    viewStream = viewerStore.client.getImageStream().createViewStream("-1");
-    viewStream.onImageReady((event) => {
+    const imageStream = viewerStore.client.getImageStream();
+    viewportStore.viewStream.value = imageStream.createViewStream("-1");
+    viewportStore.viewStream.value.onImageReady((event) => {
       if (is_moving.value) {
         return;
       }
-      latestImage.value = event.image;
+      brightnessStore.latestImage.value = event.image;
       webGLRenderWindow.setBackgroundImage(event.image);
       imageStyle.opacity = 1;
     });
-    const camera = genericRenderWindow.value.getRenderer().getActiveCamera();
-    Object.assign(camera_options, getCameraOptions(camera));
+    const renderer = genericRenderWindow.value.getRenderer();
+    const camera = renderer.getActiveCamera();
+    Object.assign(cameraStore.camera_options, getCameraOptions(camera));
     camera.onModified(() => {
-      Object.assign(camera_options, getCameraOptions(camera));
+      Object.assign(cameraStore.camera_options, getCameraOptions(camera));
     });
     status.value = Status.CREATED;
   }
 
-  async function addItem(id) {
-    await performAddItem(id, {
-      genericRenderWindow: genericRenderWindow.value,
-      dataStore,
-      vtkXMLPolyDataReader,
-      vtkActor,
-      vtkMapper,
-      actorColor: ACTOR_COLOR,
-      hybridDb,
-    });
-  }
-
-  function removeItem(id) {
-    performRemoveItem(id, { genericRenderWindow: genericRenderWindow.value, hybridDb });
-  }
-
-  function setVisibility(id, visibility) {
-    performSetVisibility(id, visibility, {
-      genericRenderWindow: genericRenderWindow.value,
-      hybridDb,
-    });
-  }
-
-  async function setZScaling(z_scale) {
-    await performSetZScaling(z_scale, {
-      zScale,
-      genericRenderWindow: genericRenderWindow.value,
-      gridActor,
-      viewerStore,
-      viewer_schemas,
-      remoteRender,
-    });
-  }
-
-  async function setClippingPlanes(ids, planes) {
-    await performSetClippingPlanes(ids, planes, { viewerStore, viewer_schemas, remoteRender });
-  }
-
-  async function setShrink(ids, shrink_factor) {
-    await performSetShrink(ids, shrink_factor, { viewerStore, viewer_schemas, remoteRender });
-  }
-
-  function resetCamera() {
-    genericRenderWindow.value.getRenderer().resetCamera();
-    genericRenderWindow.value.getRenderWindow().render();
-    syncRemoteCamera();
-  }
-
-  async function focusCameraOnObject(id, block_ids = []) {
-    await performFocusCameraOnObject(id, {
-      hybridDb,
-      viewerStore,
-      viewer_schemas,
-      genericRenderWindow: genericRenderWindow.value,
-      block_ids,
-      is_moving,
-      imageStyle,
-      syncRemoteCamera,
-    });
-  }
-
-  function setCameraOrientation(orientation) {
-    performCameraOrientation(orientation, {
-      genericRenderWindow: genericRenderWindow.value,
-      is_moving,
-      imageStyle,
-      syncRemoteCamera,
-    });
-  }
-
-  function setCamera(targetCameraOptions) {
-    performSetCamera(targetCameraOptions, {
-      genericRenderWindow: genericRenderWindow.value,
-      is_moving,
-      imageStyle,
-      syncRemoteCamera,
-    });
-  }
-
-  function syncRemoteCamera() {
-    performSyncRemoteCamera({
-      genericRenderWindow: genericRenderWindow.value,
-      viewerStore,
-      viewer_schemas,
-      remoteRender,
-      camera_options,
-    });
-  }
-
   let renderPromise = undefined;
   let renderPending = false;
 
@@ -219,124 +94,35 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     return renderPromise;
   }
 
-  const hoverTimeoutRef = ref(undefined);
-  const currentHoverId = ref(undefined);
-
-  const clearHoverData = createClearHoverData(hoverTimeoutRef, hoverData, currentHoverId);
-
-  const hoverHighlight = createHoverHighlight({
-    genericRenderWindow,
-    is_hover_highlight,
-    viewerStore,
-    viewer_schemas,
-    hover_highlight_field_type,
-    hybridDb,
-    hoverData,
-    hoverPosition,
-    currentHoverId,
-    hoverTimeoutRef,
-    clearHoverData,
-  });
-
-  function clearHoverHighlight() {
-    clearHoverData();
-    performClearHoverHighlight({
-      viewerStore,
-      viewer_schemas,
-      hover_highlight_field_type,
-      hybridDb,
-    });
-  }
-
-  function setContainer(container) {
-    performSetContainer({
-      container,
-      genericRenderWindow: genericRenderWindow.value,
-      imageStyleSetter: (style) => (imageStyle = style),
-      resize,
-      useMousePressed,
-      useEventListener,
-      is_picking,
-      is_moving,
-      clickPickingCallback: performClickPicking,
-      viewerStore,
-      viewer_schemas,
-      syncRemoteCamera,
-      hoverHighlight,
-      wheelTimeoutMs: WHEEL_TIME_OUT_MS,
-      wheelEventEndTimeout,
-      wheelTimeoutSetter: (timeout) => (wheelEventEndTimeout = timeout),
-    });
-  }
-
-  async function resize(width, height) {
-    await performResize(width, height, {
-      viewerStore,
-      status,
-      Status,
-      genericRenderWindow: genericRenderWindow.value,
-      viewStream,
-      remoteRender,
-    });
-  }
-
-  function getAverageBrightness(rect) {
-    return computeAverageBrightness(rect, {
-      latestImage: latestImage.value,
-      offscreenCtx,
-      offscreenCanvas,
-      genericRenderWindow: genericRenderWindow.value,
-    });
-  }
+  const sceneStore = useHybridViewerScene();
+  const filtersStore = useHybridViewerFilters();
+  const highlightStore = useHybridViewerHighlight();
+  const cameraStore = useHybridViewerCamera();
+  const viewportStore = useHybridViewerViewport();
 
   function exportStores() {
-    const camera = genericRenderWindow.value.getRenderer().getActiveCamera();
-    return { zScale: zScale.value, camera_options: getCameraOptions(camera) || camera_options };
-  }
-
-  async function importStores(snapshot) {
-    await applySnapshot(snapshot, {
-      genericRenderWindow: genericRenderWindow.value,
-      setZScaling,
-      syncRemoteCamera,
-      setCamera,
-    });
-  }
-
-  function clear() {
-    performClear({ genericRenderWindow: genericRenderWindow.value, hybridDb });
+    const renderer = genericRenderWindow.value.getRenderer();
+    const camera = renderer.getActiveCamera();
+    return {
+      zScale: sceneStore.zScale.value,
+      camera_options: getCameraOptions(camera) || cameraStore.camera_options,
+    };
   }
 
   return {
-    hybridDb,
     genericRenderWindow,
-    addItem,
-    removeItem,
-    setVisibility,
-    setZScaling,
-    setClippingPlanes,
-    setShrink,
-    syncRemoteCamera,
-    setCamera,
+    status,
+    is_moving,
+    is_picking,
     initHybridViewer,
     remoteRender,
-    resize,
-    resetCamera,
-    focusCameraOnObject,
-    setCameraOrientation,
-    setContainer,
-    zScale,
-    is_picking,
-    is_hover_highlight,
-    hover_highlight_field_type,
-    clearHoverHighlight,
-    hoverData,
-    hoverPosition,
-    clear,
     exportStores,
-    importStores,
-    camera_options,
-    latestImage,
-    getAverageBrightness,
+    importStores: applySnapshot,
+    ...brightnessStore,
+    ...sceneStore,
+    ...viewportStore,
+    ...filtersStore,
+    ...highlightStore,
+    ...cameraStore,
   };
 });
diff --git a/internal/stores/hybrid_viewer.js b/internal/stores/hybrid_viewer.js
deleted file mode 100644
index 182866ab..00000000
--- a/internal/stores/hybrid_viewer.js
+++ /dev/null
@@ -1,300 +0,0 @@
-import { centerCameraOnPosition } from "./hybrid_viewer_camera";
-
-function performClickPicking(event, options) {
-  const { container, viewerStore, viewer_schemas, genericRenderWindow, syncRemoteCamera } = options;
-  const rect = container.getBoundingClientRect();
-  const schema = viewer_schemas.opengeodeweb_viewer.viewer.get_point_position;
-  const params = {
-    x: Math.round(event.clientX - rect.left),
-    y: Math.round(rect.height - (event.clientY - rect.top)),
-  };
-  viewerStore.request(
-    {
-      schema,
-      params,
-    },
-    {
-      response_function: ({ x, y, z }) => {
-        const pickedPos = [x, y, z];
-        if (pickedPos.some((val) => val !== 0)) {
-          const camera = genericRenderWindow.getRenderer().getActiveCamera();
-          centerCameraOnPosition(camera, pickedPos);
-          genericRenderWindow.getRenderWindow().render();
-          syncRemoteCamera();
-        }
-      },
-    },
-  );
-}
-
-function performHoverHighlight(event, options) {
-  const {
-    is_hover_highlight,
-    genericRenderWindow,
-    viewerStore,
-    viewer_schemas,
-    hover_highlight_field_type,
-    hybridDb,
-    onResponse,
-  } = options;
-  if (!is_hover_highlight.value) {
-    return;
-  }
-  const container = genericRenderWindow.getContainer();
-  if (!container) {
-    return;
-  }
-  const rect = container.getBoundingClientRect();
-  const schema = viewer_schemas.opengeodeweb_viewer.viewer.highlight;
-  const params = {
-    x: Math.round(event.clientX - rect.left),
-    y: Math.round(rect.height - (event.clientY - rect.top)),
-    field_type: hover_highlight_field_type.value,
-    ids: Object.keys(hybridDb),
-  };
-  viewerStore.request(
-    {
-      schema,
-      params,
-    },
-    {
-      response_function: onResponse,
-    },
-  );
-}
-
-function performClearHoverHighlight(options) {
-  const { viewerStore, viewer_schemas, hover_highlight_field_type, hybridDb } = options;
-  const schema = viewer_schemas.opengeodeweb_viewer.viewer.highlight;
-  const params = {
-    x: -1,
-    y: -1,
-    field_type: hover_highlight_field_type.value,
-    ids: Object.keys(hybridDb),
-  };
-  viewerStore.request({ schema, params });
-}
-
-async function performAddItem(id, options) {
-  const {
-    genericRenderWindow,
-    dataStore,
-    vtkXMLPolyDataReader,
-    vtkActor,
-    vtkMapper,
-    actorColor,
-    hybridDb,
-  } = options;
-  if (!genericRenderWindow) {
-    return;
-  }
-  const value = await dataStore.item(id);
-  if (value && !dataStore.isItemViewable(value)) {
-    return;
-  }
-  const reader = vtkXMLPolyDataReader();
-  await reader.parseAsArrayBuffer(new TextEncoder().encode(value.binary_light_viewable));
-  const actor = vtkActor();
-  const mapper = vtkMapper();
-  const polydata = reader.getOutputData(0);
-  mapper.setInputData(polydata);
-  actor.getProperty().setColor(actorColor);
-  actor.setMapper(mapper);
-  const renderer = genericRenderWindow.getRenderer();
-  if (hybridDb[id] && hybridDb[id].actor) {
-    renderer.removeActor(hybridDb[id].actor);
-  }
-  const isFirst = renderer.getActors().length === 0;
-  renderer.addActor(actor);
-  if (isFirst) {
-    renderer.resetCamera();
-  }
-  hybridDb[id] = { actor, polydata, mapper };
-}
-
-async function performSetZScaling(z_scale, options) {
-  const { zScale, genericRenderWindow, gridActor, viewerStore, viewer_schemas, remoteRender } =
-    options;
-  zScale.value = z_scale;
-  const renderer = genericRenderWindow.getRenderer();
-  for (const actor of renderer.getActors()) {
-    if (actor !== gridActor) {
-      const scale = actor.getScale();
-      actor.setScale(scale[0], scale[1], z_scale);
-    }
-  }
-  renderer.resetCamera();
-  genericRenderWindow.getRenderWindow().render();
-  const schema = viewer_schemas.opengeodeweb_viewer.viewer.set_z_scaling;
-  const params = { z_scale };
-  await viewerStore.request({ schema, params });
-  remoteRender();
-}
-
-function performSetContainer(options) {
-  const {
-    container,
-    genericRenderWindow,
-    imageStyleSetter,
-    resize,
-    useMousePressed,
-    useEventListener,
-    is_picking,
-    is_moving,
-    clickPickingCallback,
-    viewerStore,
-    viewer_schemas,
-    syncRemoteCamera,
-    hoverHighlight,
-    wheelTimeoutMs,
-    wheelEventEndTimeout,
-    wheelTimeoutSetter,
-  } = options;
-
-  if (!container.value) {
-    return;
-  }
-
-  genericRenderWindow.setContainer(container.value.$el);
-  const webGLRenderWindow = genericRenderWindow.getApiSpecificRenderWindow();
-  webGLRenderWindow.setUseBackgroundImage(true);
-  const imageStyle = webGLRenderWindow.getReferenceByName("bgImage").style;
-  Object.assign(imageStyle, { transition: "opacity 0.1s ease-in", zIndex: 1 });
-  imageStyleSetter(imageStyle);
-
-  resize(container.value.$el.offsetWidth, container.value.$el.offsetHeight);
-
-  let has_dragged = false;
-  useMousePressed({
-    target: container,
-    onPressed: (event) => {
-      if (event.button !== 0 && event.button !== 1) {
-        return;
-      }
-      if (event.button === 0 && is_picking.value) {
-        clickPickingCallback(event, {
-          container: container.value.$el,
-          viewerStore,
-          viewer_schemas,
-          genericRenderWindow,
-          syncRemoteCamera,
-        });
-        is_picking.value = false;
-        return;
-      }
-      is_moving.value = true;
-      has_dragged = false;
-      event.stopPropagation();
-    },
-    onReleased: () => {
-      is_moving.value = false;
-      if (has_dragged) {
-        genericRenderWindow.getRenderer().resetCameraClippingRange();
-        syncRemoteCamera();
-      }
-      has_dragged = false;
-    },
-  });
-
-  useEventListener(container, "mousemove", (event) => {
-    if (is_moving.value) {
-      has_dragged = true;
-      if (imageStyle) {
-        imageStyle.opacity = 0;
-      }
-    }
-    hoverHighlight(event);
-  });
-  useEventListener(container, "wheel", () => {
-    is_moving.value = true;
-    if (imageStyle) {
-      imageStyle.opacity = 0;
-    }
-    clearTimeout(wheelEventEndTimeout);
-    wheelTimeoutSetter(
-      setTimeout(() => {
-        is_moving.value = false;
-        genericRenderWindow.getRenderer().resetCameraClippingRange();
-        syncRemoteCamera();
-      }, wheelTimeoutMs),
-    );
-  });
-}
-
-function performRemoveItem(id, options) {
-  const { genericRenderWindow, hybridDb } = options;
-  if (!hybridDb[id]) {
-    return;
-  }
-  genericRenderWindow.getRenderer().removeActor(hybridDb[id].actor);
-  genericRenderWindow.getRenderWindow().render();
-  delete hybridDb[id];
-}
-
-function performSetVisibility(id, visibility, options) {
-  const { genericRenderWindow, hybridDb } = options;
-  if (!hybridDb[id]) {
-    return;
-  }
-  hybridDb[id].actor.setVisibility(visibility);
-  genericRenderWindow.getRenderWindow().render();
-}
-
-function performClear(options) {
-  const { genericRenderWindow, hybridDb } = options;
-  const renderer = genericRenderWindow.getRenderer();
-  for (const actor of renderer.getActors()) {
-    renderer.removeActor(actor);
-  }
-  genericRenderWindow.getRenderWindow().render();
-  for (const id of Object.keys(hybridDb)) {
-    delete hybridDb[id];
-  }
-}
-
-async function performSetClippingPlanes(ids, planes, options) {
-  const { viewerStore, viewer_schemas, remoteRender } = options;
-  const schema = viewer_schemas.opengeodeweb_viewer.viewer.clipping_planes;
-  const params = { ids, planes };
-  await viewerStore.request({ schema, params });
-  await remoteRender();
-}
-
-async function performSetShrink(ids, shrink_factor, options) {
-  const { viewerStore, viewer_schemas, remoteRender } = options;
-  const schema = viewer_schemas.opengeodeweb_viewer.viewer.shrink;
-  const params = { ids, shrink_factor };
-  await viewerStore.request({ schema, params });
-  await remoteRender();
-}
-
-async function performResize(width, height, options) {
-  const { viewerStore, status, Status, genericRenderWindow, viewStream, remoteRender } = options;
-  if (viewerStore.status !== Status.CONNECTED || status.value !== Status.CREATED) {
-    return;
-  }
-  const webGLRenderWindow = genericRenderWindow.getApiSpecificRenderWindow();
-  const canvas = webGLRenderWindow.getCanvas();
-  canvas.width = width;
-  canvas.height = height;
-  await nextTick();
-  webGLRenderWindow.setSize(width, height);
-  viewStream.setSize(width, height);
-  genericRenderWindow.getRenderWindow().render();
-  remoteRender();
-}
-
-export {
-  performAddItem,
-  performClear,
-  performClearHoverHighlight,
-  performClickPicking,
-  performHoverHighlight,
-  performRemoveItem,
-  performResize,
-  performSetClippingPlanes,
-  performSetContainer,
-  performSetShrink,
-  performSetVisibility,
-  performSetZScaling,
-};
diff --git a/internal/stores/hybrid_viewer_brightness.js b/internal/stores/hybrid_viewer/brightness.js
similarity index 62%
rename from internal/stores/hybrid_viewer_brightness.js
rename to internal/stores/hybrid_viewer/brightness.js
index b4da1328..16007db7 100644
--- a/internal/stores/hybrid_viewer_brightness.js
+++ b/internal/stores/hybrid_viewer/brightness.js
@@ -1,9 +1,32 @@
-import { BACKGROUND_GREY_VALUE, RGB_MAX } from "./hybrid_viewer_constants";
+import { BACKGROUND_GREY_VALUE, RGB_MAX } from "./constants";
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
 
 const RGBA_CHANNELS = 4;
 const SAMPLE_SIZE = 10;
 const TOTAL_CHANNELS = 400;
 
+function useHybridViewerBrightness() {
+  const latestImage = ref(undefined);
+  const offscreenCanvas =
+    typeof document === "undefined" ? undefined : document.createElement("canvas");
+  const offscreenCtx = offscreenCanvas
+    ? offscreenCanvas.getContext("2d", { willReadFrequently: true })
+    : undefined;
+
+  function getAverageBrightness(rect) {
+    return computeAverageBrightness(rect, {
+      latestImage: latestImage.value,
+      offscreenCtx,
+      offscreenCanvas,
+    });
+  }
+
+  return {
+    latestImage,
+    getAverageBrightness,
+  };
+}
+
 function mapRect(rect, latestImage, canvasRect) {
   const scaleX = latestImage.width / canvasRect.width;
   const scaleY = latestImage.height / canvasRect.height;
@@ -16,11 +39,12 @@ function mapRect(rect, latestImage, canvasRect) {
 }
 
 function computeAverageBrightness(rect, options) {
-  const { latestImage, offscreenCtx, offscreenCanvas, genericRenderWindow } = options;
-  if (!latestImage || !offscreenCtx || !offscreenCanvas || !genericRenderWindow) {
+  const { latestImage, offscreenCtx, offscreenCanvas } = options;
+  const { genericRenderWindow } = useHybridViewerStore();
+  if (!latestImage || !offscreenCtx || !offscreenCanvas || !genericRenderWindow.value) {
     return BACKGROUND_GREY_VALUE / RGB_MAX;
   }
-  const canvas = genericRenderWindow.getApiSpecificRenderWindow().getCanvas();
+  const canvas = genericRenderWindow.value.getApiSpecificRenderWindow().getCanvas();
   if (!canvas) {
     return BACKGROUND_GREY_VALUE / RGB_MAX;
   }
@@ -59,4 +83,4 @@ function computeAverageBrightness(rect, options) {
   }
 }
 
-export { computeAverageBrightness };
+export { computeAverageBrightness, useHybridViewerBrightness };
diff --git a/internal/stores/hybrid_viewer_camera.js b/internal/stores/hybrid_viewer/camera.js
similarity index 53%
rename from internal/stores/hybrid_viewer_camera.js
rename to internal/stores/hybrid_viewer/camera.js
index eb137883..8f64381f 100644
--- a/internal/stores/hybrid_viewer_camera.js
+++ b/internal/stores/hybrid_viewer/camera.js
@@ -3,8 +3,11 @@ import {
   SHORT_ANIMATION_DURATION,
   animateCamera,
   computeAnimationDuration,
-} from "@ogw_internal/stores/hybrid_viewer_camera_animation";
+} from "./camera_animation";
 import { dot } from "@kitware/vtk.js/Common/Core/Math";
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
+import { useViewerStore } from "@ogw_front/stores/viewer";
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 const BUMP_MULTIPLIER = 0.2;
 const ALIGNMENT_THRESHOLD = 0.9;
@@ -19,8 +22,59 @@ const ORIENTATIONS = {
   xminus: { position: [-1, 0, 0], view_up: [0, 0, 1] },
 };
 
+function getImageStyle() {
+  const { genericRenderWindow } = useHybridViewerStore();
+  if (!genericRenderWindow.value) {
+    return undefined;
+  }
+  const webGLRenderWindow = genericRenderWindow.value.getApiSpecificRenderWindow();
+  if (!webGLRenderWindow) {
+    return undefined;
+  }
+  const bgImage = webGLRenderWindow.getReferenceByName("bgImage");
+  return bgImage ? bgImage.style : undefined;
+}
+
+function useHybridViewerCamera() {
+  const camera_options = reactive({});
+
+  function syncRemoteCamera() {
+    performSyncRemoteCamera();
+  }
+
+  function setCamera(targetCameraOptions) {
+    performSetCamera(targetCameraOptions);
+  }
+
+  function resetCamera() {
+    const { genericRenderWindow } = useHybridViewerStore();
+    const renderer = genericRenderWindow.value.getRenderer();
+    renderer.resetCamera();
+    const renderWindow = genericRenderWindow.value.getRenderWindow();
+    renderWindow.render();
+    syncRemoteCamera();
+  }
+
+  async function focusCameraOnObject(id, block_ids = []) {
+    await performFocusCameraOnObject(id, block_ids);
+  }
+
+  function setCameraOrientation(orientation) {
+    performCameraOrientation(orientation);
+  }
+
+  return {
+    camera_options,
+    syncRemoteCamera,
+    setCamera,
+    resetCamera,
+    focusCameraOnObject,
+    setCameraOrientation,
+  };
+}
+
 function getCameraOptions(camera) {
-  if (!camera?.getFocalPoint) {
+  if (!camera || !camera.getFocalPoint) {
     return camera;
   }
   return {
@@ -34,7 +88,7 @@ function getCameraOptions(camera) {
 }
 
 function applyCameraOptions(camera, options) {
-  if (camera?.set && options) {
+  if (camera && camera.set && options) {
     camera.set({
       focalPoint: options.focal_point,
       viewUp: options.view_up,
@@ -59,9 +113,13 @@ function centerCameraOnPosition(camera, pickedPosition) {
   );
 }
 
-function performSetCamera(targetCameraOptions, options) {
-  const { genericRenderWindow, is_moving, imageStyle, syncRemoteCamera } = options;
-  const camera = genericRenderWindow.getRenderer().getActiveCamera();
+function performSetCamera(targetCameraOptions) {
+  const hybridViewerStore = useHybridViewerStore();
+  const { genericRenderWindow, syncRemoteCamera } = hybridViewerStore;
+  const { is_moving } = storeToRefs(hybridViewerStore);
+  const imageStyle = getImageStyle();
+  const renderer = genericRenderWindow.value.getRenderer();
+  const camera = renderer.getActiveCamera();
   const startState = getCameraOptions(camera);
   const duration = computeAnimationDuration(startState, targetCameraOptions);
   is_moving.value = true;
@@ -75,20 +133,27 @@ function performSetCamera(targetCameraOptions, options) {
     duration,
     bumpMultiplier: 0,
     easeExponent: EASE_EXPONENT,
-    onUpdate: () => genericRenderWindow.getRenderWindow().render(),
+    onUpdate: () => {
+      const renderWindow = genericRenderWindow.value.getRenderWindow();
+      renderWindow.render();
+    },
     onEnd: () => {
       applyCameraOptions(camera, targetCameraOptions);
-      genericRenderWindow.getRenderWindow().render();
+      const renderWindow = genericRenderWindow.value.getRenderWindow();
+      renderWindow.render();
       is_moving.value = false;
       syncRemoteCamera();
     },
   });
 }
 
-function performCameraOrientation(orientation, options) {
-  const { genericRenderWindow, is_moving, imageStyle, syncRemoteCamera } = options;
+function performCameraOrientation(orientation) {
+  const hybridViewerStore = useHybridViewerStore();
+  const { genericRenderWindow, syncRemoteCamera } = hybridViewerStore;
+  const { is_moving } = storeToRefs(hybridViewerStore);
+  const imageStyle = getImageStyle();
   const config = ORIENTATIONS[orientation.toLowerCase()];
-  const renderer = genericRenderWindow.getRenderer();
+  const renderer = genericRenderWindow.value.getRenderer();
   const camera = renderer.getActiveCamera();
   const startState = getCameraOptions(camera);
 
@@ -105,7 +170,9 @@ function performCameraOrientation(orientation, options) {
   const duration =
     alignment > ALIGNMENT_THRESHOLD ? LONG_ANIMATION_DURATION : SHORT_ANIMATION_DURATION;
   is_moving.value = true;
-  imageStyle.opacity = 0;
+  if (imageStyle) {
+    imageStyle.opacity = 0;
+  }
 
   animateCamera({
     camera,
@@ -114,7 +181,10 @@ function performCameraOrientation(orientation, options) {
     duration,
     bumpMultiplier: BUMP_MULTIPLIER,
     easeExponent: EASE_EXPONENT,
-    onUpdate: () => genericRenderWindow.getRenderWindow().render(),
+    onUpdate: () => {
+      const renderWindow = genericRenderWindow.value.getRenderWindow();
+      renderWindow.render();
+    },
     onEnd: () => {
       is_moving.value = false;
       syncRemoteCamera();
@@ -122,22 +192,14 @@ function performCameraOrientation(orientation, options) {
   });
 }
 
-async function performFocusCameraOnObject(id, options) {
-  const {
-    hybridDb,
-    viewerStore,
-    viewer_schemas,
-    genericRenderWindow,
-    block_ids = [],
-    is_moving,
-    imageStyle,
-    syncRemoteCamera,
-  } = options;
+async function performFocusCameraOnObject(id, block_ids = []) {
+  const { genericRenderWindow, hybridDb } = useHybridViewerStore();
 
   if (!hybridDb[id]) {
     return;
   }
 
+  const viewerStore = useViewerStore();
   let bounds = [];
   if (block_ids.length > 0) {
     const schema = viewer_schemas.opengeodeweb_viewer.model.get_blocks_bounds;
@@ -147,25 +209,21 @@ async function performFocusCameraOnObject(id, options) {
     bounds = hybridDb[id].actor.getBounds();
   }
 
-  const renderer = genericRenderWindow.getRenderer();
+  const renderer = genericRenderWindow.value.getRenderer();
   const camera = renderer.getActiveCamera();
   const startOptions = getCameraOptions(camera);
   renderer.resetCamera(bounds);
   const targetOptions = getCameraOptions(camera);
   applyCameraOptions(camera, startOptions);
 
-  performSetCamera(targetOptions, {
-    genericRenderWindow,
-    is_moving,
-    imageStyle,
-    syncRemoteCamera,
-  });
+  performSetCamera(targetOptions);
 }
 
-function performSyncRemoteCamera(options) {
-  const { genericRenderWindow, viewerStore, viewer_schemas, remoteRender, camera_options } =
-    options;
-  const camera = genericRenderWindow.getRenderer().getActiveCamera();
+function performSyncRemoteCamera() {
+  const { genericRenderWindow, camera_options, remoteRender } = useHybridViewerStore();
+  const viewerStore = useViewerStore();
+  const renderer = genericRenderWindow.value.getRenderer();
+  const camera = renderer.getActiveCamera();
   const options_camera = getCameraOptions(camera);
   const schema = viewer_schemas.opengeodeweb_viewer.viewer.update_camera;
   const params = { camera_options: options_camera };
@@ -177,39 +235,30 @@ function performSyncRemoteCamera(options) {
     {
       response_function: () => {
         remoteRender();
-        Object.assign(camera_options, options_camera);
+        if (camera_options) {
+          Object.assign(camera_options, options_camera);
+        }
       },
     },
   );
 }
 
-async function applySnapshot(snapshot, options) {
-  const { genericRenderWindow, setZScaling, syncRemoteCamera, setCamera } = options;
+async function applySnapshot(snapshot) {
   if (!snapshot) {
     return;
   }
-  const z_scale = snapshot.zScale;
-  if (typeof z_scale === "number") {
-    await setZScaling(z_scale);
-  }
-  const { camera_options: snapshot_camera_options } = snapshot;
-  if (snapshot_camera_options) {
-    if (setCamera) {
-      setCamera(snapshot_camera_options);
-    } else {
-      applyCameraOptions(
-        genericRenderWindow.getRenderer().getActiveCamera(),
-        snapshot_camera_options,
-      );
-      genericRenderWindow.getRenderWindow().render();
-      syncRemoteCamera();
-    }
+  const { setZScaling, setCamera } = useHybridViewerStore();
+  if (typeof snapshot.zScale === "number") {
+    await setZScaling(snapshot.zScale);
+  }
+  if (snapshot.camera_options) {
+    setCamera(snapshot.camera_options);
   }
 }
 
 export {
-  BUMP_MULTIPLIER,
   ALIGNMENT_THRESHOLD,
+  BUMP_MULTIPLIER,
   EASE_EXPONENT,
   ORIENTATIONS,
   applyCameraOptions,
@@ -220,4 +269,5 @@ export {
   performFocusCameraOnObject,
   performSetCamera,
   performSyncRemoteCamera,
+  useHybridViewerCamera,
 };
diff --git a/internal/stores/hybrid_viewer_camera_animation.js b/internal/stores/hybrid_viewer/camera_animation.js
similarity index 100%
rename from internal/stores/hybrid_viewer_camera_animation.js
rename to internal/stores/hybrid_viewer/camera_animation.js
diff --git a/internal/stores/hybrid_viewer_constants.js b/internal/stores/hybrid_viewer/constants.js
similarity index 100%
rename from internal/stores/hybrid_viewer_constants.js
rename to internal/stores/hybrid_viewer/constants.js
diff --git a/internal/stores/hybrid_viewer/filters.js b/internal/stores/hybrid_viewer/filters.js
new file mode 100644
index 00000000..fec8ba37
--- /dev/null
+++ b/internal/stores/hybrid_viewer/filters.js
@@ -0,0 +1,38 @@
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
+import { useViewerStore } from "@ogw_front/stores/viewer";
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
+
+function useHybridViewerFilters() {
+  async function setClippingPlanes(ids, planes) {
+    await performSetClippingPlanes(ids, planes);
+  }
+
+  async function setShrink(ids, shrink_factor) {
+    await performSetShrink(ids, shrink_factor);
+  }
+
+  return {
+    setClippingPlanes,
+    setShrink,
+  };
+}
+
+async function performSetClippingPlanes(ids, planes) {
+  const viewerStore = useViewerStore();
+  const { remoteRender } = useHybridViewerStore();
+  const schema = viewer_schemas.opengeodeweb_viewer.viewer.clipping_planes;
+  const params = { ids, planes };
+  await viewerStore.request({ schema, params });
+  await remoteRender();
+}
+
+async function performSetShrink(ids, shrink_factor) {
+  const viewerStore = useViewerStore();
+  const { remoteRender } = useHybridViewerStore();
+  const schema = viewer_schemas.opengeodeweb_viewer.viewer.shrink;
+  const params = { ids, shrink_factor };
+  await viewerStore.request({ schema, params });
+  await remoteRender();
+}
+
+export { performSetClippingPlanes, performSetShrink, useHybridViewerFilters };
diff --git a/internal/stores/hybrid_viewer/highlight.js b/internal/stores/hybrid_viewer/highlight.js
new file mode 100644
index 00000000..940e3d75
--- /dev/null
+++ b/internal/stores/hybrid_viewer/highlight.js
@@ -0,0 +1,162 @@
+import { HOVER_DEBOUNCE_MS, HOVER_TIMEOUT_MS } from "./constants";
+import { database } from "@ogw_internal/database/database.js";
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
+import { useViewerStore } from "@ogw_front/stores/viewer";
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
+
+function useHybridViewerHighlight() {
+  const is_hover_highlight = ref(false);
+  const hover_highlight_field_type = ref("CELL");
+  const hoverData = ref(undefined);
+  const hoverPosition = ref({ x: 0, y: 0 });
+  const hoverTimeoutRef = ref(undefined);
+  const currentHoverId = ref(undefined);
+
+  const clearHoverData = createClearHoverData(hoverTimeoutRef, hoverData, currentHoverId);
+
+  const hoverHighlight = createHoverHighlight({ hoverTimeoutRef, currentHoverId, clearHoverData });
+
+  function clearHoverHighlight() {
+    clearHoverData();
+    performClearHoverHighlight();
+  }
+
+  return {
+    is_hover_highlight,
+    hover_highlight_field_type,
+    hoverData,
+    hoverPosition,
+    clearHoverHighlight,
+    hoverHighlight,
+  };
+}
+
+function performHoverHighlight(event, onResponse) {
+  const hybridViewerStore = useHybridViewerStore();
+  const { genericRenderWindow, hybridDb } = hybridViewerStore;
+  const { is_hover_highlight, hover_highlight_field_type } = storeToRefs(hybridViewerStore);
+  if (!is_hover_highlight.value) {
+    return;
+  }
+  const container = genericRenderWindow.value?.getContainer();
+  if (!container) {
+    return;
+  }
+  const viewerStore = useViewerStore();
+  const rect = container.getBoundingClientRect();
+  const schema = viewer_schemas.opengeodeweb_viewer.viewer.highlight;
+  const params = {
+    x: Math.round(event.clientX - rect.left),
+    y: Math.round(rect.height - (event.clientY - rect.top)),
+    field_type: hover_highlight_field_type.value,
+    ids: Object.keys(hybridDb),
+  };
+  viewerStore.request({ schema, params }, { response_function: onResponse });
+}
+
+function performClearHoverHighlight() {
+  const { hybridDb } = useHybridViewerStore();
+  const { hover_highlight_field_type } = storeToRefs(useHybridViewerStore());
+  const viewerStore = useViewerStore();
+  const schema = viewer_schemas.opengeodeweb_viewer.viewer.highlight;
+  const params = {
+    x: -1,
+    y: -1,
+    field_type: hover_highlight_field_type.value,
+    ids: Object.keys(hybridDb),
+  };
+  viewerStore.request({ schema, params });
+}
+
+function createClearHoverData(hoverTimeoutRef, hoverData, currentHoverId) {
+  return function clearHoverData() {
+    if (hoverTimeoutRef.value) {
+      clearTimeout(hoverTimeoutRef.value);
+      hoverTimeoutRef.value = undefined;
+    }
+    hoverData.value = undefined;
+    currentHoverId.value = undefined;
+  };
+}
+
+function createHoverHighlight({ hoverTimeoutRef, currentHoverId, clearHoverData }) {
+  return useDebounceFn((event) => {
+    const hybridViewerStore = useHybridViewerStore();
+    const { genericRenderWindow } = hybridViewerStore;
+    const { is_hover_highlight, hoverData, hoverPosition } = storeToRefs(hybridViewerStore);
+    const containerElement = genericRenderWindow.value?.getContainer();
+    const relativeMousePosition = containerElement
+      ? {
+          x: event.clientX - containerElement.getBoundingClientRect().left,
+          y: event.clientY - containerElement.getBoundingClientRect().top,
+        }
+      : { x: event.clientX, y: event.clientY };
+
+    performHoverHighlight(event, async (response) => {
+      const isResponseValid =
+        response && response.id && response.picked_id !== undefined && response.picked_id !== -1;
+      if (!is_hover_highlight.value || !isResponseValid) {
+        clearHoverData();
+        return;
+      }
+
+      const hoverKey = `${response.id}_${response.field_type}_${response.picked_id}`;
+      if (currentHoverId.value === hoverKey) {
+        return;
+      }
+
+      if (hoverTimeoutRef.value) {
+        clearTimeout(hoverTimeoutRef.value);
+        hoverTimeoutRef.value = undefined;
+      }
+
+      hoverData.value = undefined;
+      currentHoverId.value = hoverKey;
+
+      let componentInfo = undefined;
+      let modelName = undefined;
+
+      const modelRecord = await database.data.get(response.id);
+      if (modelRecord) {
+        modelName = modelRecord.name;
+      }
+
+      if (response.geode_id) {
+        const components = database.model_components.where("[id+geode_id]");
+        const query = components.equals([response.id, response.geode_id]);
+        const component = await query.first();
+        if (component) {
+          componentInfo = {
+            name: component.name,
+            id: component.geode_id,
+            type: component.type,
+          };
+        }
+      }
+
+      const newHoverData = {
+        modelId: response.id,
+        modelName,
+        blockName: response.geode_id,
+        pickedId: response.picked_id,
+        fieldType: response.field_type,
+        component: componentInfo,
+        attributes: response.attributes || {},
+      };
+
+      hoverTimeoutRef.value = setTimeout(() => {
+        hoverPosition.value = relativeMousePosition;
+        hoverData.value = newHoverData;
+        hoverTimeoutRef.value = undefined;
+      }, HOVER_TIMEOUT_MS);
+    });
+  }, HOVER_DEBOUNCE_MS);
+}
+
+export {
+  createClearHoverData,
+  createHoverHighlight,
+  performClearHoverHighlight,
+  performHoverHighlight,
+  useHybridViewerHighlight,
+};
diff --git a/internal/stores/hybrid_viewer/scene.js b/internal/stores/hybrid_viewer/scene.js
new file mode 100644
index 00000000..b6c8eeaa
--- /dev/null
+++ b/internal/stores/hybrid_viewer/scene.js
@@ -0,0 +1,141 @@
+import { ACTOR_COLOR } from "./constants";
+import { useDataStore } from "@ogw_front/stores/data";
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
+import { useViewerStore } from "@ogw_front/stores/viewer";
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
+import { newInstance as vtkActor } from "@kitware/vtk.js/Rendering/Core/Actor";
+import { newInstance as vtkMapper } from "@kitware/vtk.js/Rendering/Core/Mapper";
+import { newInstance as vtkXMLPolyDataReader } from "@kitware/vtk.js/IO/XML/XMLPolyDataReader";
+
+function useHybridViewerScene() {
+  const hybridDb = reactive({});
+  const zScale = ref(1);
+
+  async function addItem(id) {
+    await performAddItem(id);
+  }
+
+  function removeItem(id) {
+    performRemoveItem(id);
+  }
+
+  function setVisibility(id, visibility) {
+    performSetVisibility(id, visibility);
+  }
+
+  async function setZScaling(z_scale) {
+    await performSetZScaling(z_scale);
+  }
+
+  function clear() {
+    performClear();
+  }
+
+  return {
+    hybridDb,
+    zScale,
+    addItem,
+    removeItem,
+    setVisibility,
+    setZScaling,
+    clear,
+  };
+}
+
+async function performAddItem(id) {
+  const { genericRenderWindow, hybridDb } = useHybridViewerStore();
+  if (!genericRenderWindow.value) {
+    return;
+  }
+  const dataStore = useDataStore();
+  const value = await dataStore.item(id);
+  if (value && !dataStore.isItemViewable(value)) {
+    return;
+  }
+
+  const reader = vtkXMLPolyDataReader();
+  await reader.parseAsArrayBuffer(new TextEncoder().encode(value.binary_light_viewable));
+  const actor = vtkActor();
+  const mapper = vtkMapper();
+  const polydata = reader.getOutputData(0);
+  mapper.setInputData(polydata);
+  const property = actor.getProperty();
+  property.setColor(ACTOR_COLOR);
+  actor.setMapper(mapper);
+  const renderer = genericRenderWindow.value.getRenderer();
+  if (hybridDb[id] && hybridDb[id].actor) {
+    renderer.removeActor(hybridDb[id].actor);
+  }
+  const actors = renderer.getActors();
+  const isFirst = actors.length === 0;
+  renderer.addActor(actor);
+  if (isFirst) {
+    renderer.resetCamera();
+  }
+  hybridDb[id] = { actor, polydata, mapper };
+}
+
+function performRemoveItem(id) {
+  const { genericRenderWindow, hybridDb } = useHybridViewerStore();
+  if (!hybridDb[id]) {
+    return;
+  }
+  const renderer = genericRenderWindow.value.getRenderer();
+  renderer.removeActor(hybridDb[id].actor);
+  const renderWindow = genericRenderWindow.value.getRenderWindow();
+  renderWindow.render();
+  delete hybridDb[id];
+}
+
+function performSetVisibility(id, visibility) {
+  const { genericRenderWindow, hybridDb } = useHybridViewerStore();
+  if (!hybridDb[id]) {
+    return;
+  }
+  hybridDb[id].actor.setVisibility(visibility);
+  const renderWindow = genericRenderWindow.value.getRenderWindow();
+  renderWindow.render();
+}
+
+async function performSetZScaling(z_scale) {
+  const hybridViewerStore = useHybridViewerStore();
+  const { genericRenderWindow, remoteRender } = hybridViewerStore;
+  const { zScale } = storeToRefs(hybridViewerStore);
+  zScale.value = z_scale;
+
+  const renderer = genericRenderWindow.value.getRenderer();
+  for (const actor of renderer.getActors()) {
+    const scale = actor.getScale();
+    actor.setScale(scale[0], scale[1], z_scale);
+  }
+  renderer.resetCamera();
+  const renderWindow = genericRenderWindow.value.getRenderWindow();
+  renderWindow.render();
+  const viewerStore = useViewerStore();
+  const schema = viewer_schemas.opengeodeweb_viewer.viewer.set_z_scaling;
+  const params = { z_scale };
+  await viewerStore.request({ schema, params });
+  await remoteRender();
+}
+
+function performClear() {
+  const { genericRenderWindow, hybridDb } = useHybridViewerStore();
+  const renderer = genericRenderWindow.value.getRenderer();
+  for (const actor of renderer.getActors()) {
+    renderer.removeActor(actor);
+  }
+  const renderWindow = genericRenderWindow.value.getRenderWindow();
+  renderWindow.render();
+  for (const id of Object.keys(hybridDb)) {
+    delete hybridDb[id];
+  }
+}
+
+export {
+  performAddItem,
+  performClear,
+  performRemoveItem,
+  performSetVisibility,
+  performSetZScaling,
+  useHybridViewerScene,
+};
diff --git a/internal/stores/hybrid_viewer/viewport.js b/internal/stores/hybrid_viewer/viewport.js
new file mode 100644
index 00000000..9620880b
--- /dev/null
+++ b/internal/stores/hybrid_viewer/viewport.js
@@ -0,0 +1,148 @@
+import { Status } from "@ogw_front/utils/status";
+import { WHEEL_TIME_OUT_MS } from "./constants";
+import { centerCameraOnPosition } from "./camera";
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
+import { useViewerStore } from "@ogw_front/stores/viewer";
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
+
+function useHybridViewerViewport() {
+  const viewStream = ref(undefined);
+
+  function setContainer(container) {
+    performSetContainer(container);
+  }
+
+  async function resize(width, height) {
+    await performResize(width, height);
+  }
+
+  return {
+    setContainer,
+    resize,
+    viewStream,
+  };
+}
+
+function performClickPicking(event, containerElement) {
+  const { genericRenderWindow, syncRemoteCamera } = useHybridViewerStore();
+  const viewerStore = useViewerStore();
+  const rect = containerElement.getBoundingClientRect();
+  const schema = viewer_schemas.opengeodeweb_viewer.viewer.get_point_position;
+  const params = {
+    x: Math.round(event.clientX - rect.left),
+    y: Math.round(rect.height - (event.clientY - rect.top)),
+  };
+  viewerStore.request(
+    {
+      schema,
+      params,
+    },
+    {
+      response_function: ({ x, y, z }) => {
+        const pickedPos = [x, y, z];
+        if (pickedPos.some((val) => val !== 0)) {
+          const renderer = genericRenderWindow.value.getRenderer();
+          const camera = renderer.getActiveCamera();
+          centerCameraOnPosition(camera, pickedPos);
+          const renderWindow = genericRenderWindow.value.getRenderWindow();
+          renderWindow.render();
+          syncRemoteCamera();
+        }
+      },
+    },
+  );
+}
+
+function performSetContainer(container) {
+  if (!container || !container.value) {
+    return;
+  }
+
+  const hybridViewerStore = useHybridViewerStore();
+  const { genericRenderWindow, syncRemoteCamera, hoverHighlight } = hybridViewerStore;
+  const { is_picking, is_moving } = storeToRefs(hybridViewerStore);
+
+  genericRenderWindow.value.setContainer(container.value.$el);
+  const webGLRenderWindow = genericRenderWindow.value.getApiSpecificRenderWindow();
+  webGLRenderWindow.setUseBackgroundImage(true);
+  const imageStyle = webGLRenderWindow.getReferenceByName("bgImage").style;
+  Object.assign(imageStyle, { transition: "opacity 0.1s ease-in", zIndex: 1 });
+
+  performResize(container.value.$el.offsetWidth, container.value.$el.offsetHeight);
+
+  let has_dragged = false;
+  useMousePressed({
+    target: container,
+    onPressed: (event) => {
+      if (event.button !== 0 && event.button !== 1) {
+        return;
+      }
+      if (event.button === 0 && is_picking.value) {
+        performClickPicking(event, container.value.$el);
+        is_picking.value = false;
+        return;
+      }
+      is_moving.value = true;
+      has_dragged = false;
+      event.stopPropagation();
+    },
+    onReleased: () => {
+      is_moving.value = false;
+      if (has_dragged) {
+        const renderer = genericRenderWindow.value.getRenderer();
+        renderer.resetCameraClippingRange();
+        syncRemoteCamera();
+      }
+      has_dragged = false;
+    },
+  });
+
+  useEventListener(container, "mousemove", (event) => {
+    if (is_moving.value) {
+      has_dragged = true;
+      if (imageStyle) {
+        imageStyle.opacity = 0;
+      }
+    }
+    hoverHighlight(event);
+  });
+
+  let wheelEventEndTimeout = undefined;
+  useEventListener(container, "wheel", () => {
+    is_moving.value = true;
+    if (imageStyle) {
+      imageStyle.opacity = 0;
+    }
+    clearTimeout(wheelEventEndTimeout);
+    wheelEventEndTimeout = setTimeout(() => {
+      is_moving.value = false;
+      const renderer = genericRenderWindow.value.getRenderer();
+      renderer.resetCameraClippingRange();
+      syncRemoteCamera();
+    }, WHEEL_TIME_OUT_MS);
+  });
+}
+
+async function performResize(width, height) {
+  const hybridViewerStore = useHybridViewerStore();
+  const { genericRenderWindow, remoteRender } = hybridViewerStore;
+  const { status, viewStream } = storeToRefs(hybridViewerStore);
+  const viewerStore = useViewerStore();
+  if (viewerStore.status !== Status.CONNECTED || status.value !== Status.CREATED) {
+    return;
+  }
+  const webGLRenderWindow = genericRenderWindow.value.getApiSpecificRenderWindow();
+  const canvas = webGLRenderWindow.getCanvas();
+  canvas.width = width;
+  canvas.height = height;
+  await nextTick();
+  webGLRenderWindow.setSize(width, height);
+  if (viewStream.value) {
+    viewStream.value.setSize(width, height);
+  }
+  const renderWindow = genericRenderWindow.value.getRenderWindow();
+  renderWindow.render();
+  await remoteRender();
+}
+
+export { performClickPicking, performResize, performSetContainer, useHybridViewerViewport };
diff --git a/internal/stores/hybrid_viewer_highlight.js b/internal/stores/hybrid_viewer_highlight.js
deleted file mode 100644
index 2ca311a1..00000000
--- a/internal/stores/hybrid_viewer_highlight.js
+++ /dev/null
@@ -1,114 +0,0 @@
-import { HOVER_DEBOUNCE_MS, HOVER_TIMEOUT_MS } from "./hybrid_viewer_constants";
-import { database } from "@ogw_internal/database/database.js";
-import { performHoverHighlight } from "./hybrid_viewer";
-
-function createClearHoverData(hoverTimeoutRef, hoverData, currentHoverId) {
-  return function clearHoverData() {
-    if (hoverTimeoutRef.value) {
-      clearTimeout(hoverTimeoutRef.value);
-      hoverTimeoutRef.value = undefined;
-    }
-    hoverData.value = undefined;
-    currentHoverId.value = undefined;
-  };
-}
-
-function createHoverHighlight(options) {
-  const {
-    genericRenderWindow,
-    is_hover_highlight,
-    viewerStore,
-    viewer_schemas,
-    hover_highlight_field_type,
-    hybridDb,
-    hoverData,
-    hoverPosition,
-    currentHoverId,
-    hoverTimeoutRef,
-    clearHoverData,
-  } = options;
-
-  return useDebounceFn((event) => {
-    const containerElement = genericRenderWindow.value?.getContainer();
-    let relativeMousePosition = { x: 0, y: 0 };
-    if (containerElement) {
-      const containerRect = containerElement.getBoundingClientRect();
-      relativeMousePosition = {
-        x: event.clientX - containerRect.left,
-        y: event.clientY - containerRect.top,
-      };
-    } else {
-      relativeMousePosition = { x: event.clientX, y: event.clientY };
-    }
-
-    performHoverHighlight(event, {
-      is_hover_highlight,
-      genericRenderWindow: genericRenderWindow.value,
-      viewerStore,
-      viewer_schemas,
-      hover_highlight_field_type,
-      hybridDb,
-      onResponse: async (response) => {
-        const isResponseValid =
-          response && response.id && response.picked_id !== undefined && response.picked_id !== -1;
-        if (!is_hover_highlight.value || !isResponseValid) {
-          clearHoverData();
-          return;
-        }
-
-        const hoverKey = `${response.id}_${response.field_type}_${response.picked_id}`;
-        if (currentHoverId.value === hoverKey) {
-          return;
-        }
-
-        if (hoverTimeoutRef.value) {
-          clearTimeout(hoverTimeoutRef.value);
-          hoverTimeoutRef.value = undefined;
-        }
-
-        hoverData.value = undefined;
-        currentHoverId.value = hoverKey;
-
-        let componentInfo = undefined;
-        let modelName = undefined;
-
-        const modelRecord = await database.data.get(response.id);
-        if (modelRecord) {
-          modelName = modelRecord.name;
-        }
-
-        if (response.geode_id) {
-          const component = await database.model_components
-            .where("[id+geode_id]")
-            .equals([response.id, response.geode_id])
-            .first();
-          if (component) {
-            componentInfo = {
-              name: component.name,
-              id: component.geode_id,
-              type: component.type,
-            };
-          }
-        }
-
-        const newHoverData = {
-          modelId: response.id,
-          modelName,
-          blockName: response.geode_id,
-          pickedId: response.picked_id,
-          fieldType: response.field_type,
-          component: componentInfo,
-          attributes: response.attributes || {},
-        };
-
-        hoverTimeoutRef.value = setTimeout(() => {
-          hoverPosition.value = relativeMousePosition;
-          hoverData.value = newHoverData;
-          hoverTimeoutRef.value = undefined;
-        }, HOVER_TIMEOUT_MS);
-      },
-    });
-  }, HOVER_DEBOUNCE_MS);
-}
-
-export { createClearHoverData, createHoverHighlight };