diff --git a/extensions/cornerstone/src/OHIFCornerstoneViewport.js b/extensions/cornerstone/src/OHIFCornerstoneViewport.js
index 8e567e89c..a71b7f0d7 100644
--- a/extensions/cornerstone/src/OHIFCornerstoneViewport.js
+++ b/extensions/cornerstone/src/OHIFCornerstoneViewport.js
@@ -78,6 +78,7 @@ class OHIFCornerstoneViewport extends Component {
   }
 
   getViewportData = async displaySet => {
+    debugger;
     let viewportData;
 
     const { dataSource } = this.props;
diff --git a/platform/core/src/utils/StackManager.js b/platform/core/src/utils/StackManager.js
index a4bac499f..dfa4d1665 100644
--- a/platform/core/src/utils/StackManager.js
+++ b/platform/core/src/utils/StackManager.js
@@ -31,6 +31,10 @@ function createAndAddStack(
     return;
   }
 
+  // TODO: This is broken because it needs to give DisplaySetService to the dataSource
+  // DisplaySetService
+  // Should be something like:
+  // const imageIds = dataSource.getImageIdsForDisplaySet(displaySetInstanceUID, DisplaySetService);
   const imageIds = dataSource.getImageIdsForDisplaySet(displaySetInstanceUID);
 
   const stack = {
diff --git a/platform/ui/src/components/ViewportPane/ViewportPane.jsx b/platform/ui/src/components/ViewportPane/ViewportPane.jsx
index 3f848126c..f417785f3 100644
--- a/platform/ui/src/components/ViewportPane/ViewportPane.jsx
+++ b/platform/ui/src/components/ViewportPane/ViewportPane.jsx
@@ -13,7 +13,7 @@ function ViewportPane({
   onDrop,
   acceptDropsFor,
 }) {
-  const [{ isHovered, isHighlighted }, drop] = useDrop({
+  /*const [{ isHovered, isHighlighted }, drop] = useDrop({
     accept: acceptDropsFor,
     // TODO: pass in as prop?
     drop: (droppedItem, monitor) => {
@@ -29,11 +29,11 @@ function ViewportPane({
       isHighlighted: monitor.canDrop(),
       isHovered: monitor.isOver(),
     }),
-  });
+  });*/
 
+  //       ref={drop}
   return (
     <div
-      ref={drop}
       className={classnames(
         'rounded-lg hover:border-primary-light transition duration-300 outline-none overflow-hidden',
         {
diff --git a/platform/viewer/src/components/ViewportGrid.jsx b/platform/viewer/src/components/ViewportGrid.jsx
index cd1fe5a0f..8eb92f81b 100644
--- a/platform/viewer/src/components/ViewportGrid.jsx
+++ b/platform/viewer/src/components/ViewportGrid.jsx
@@ -20,7 +20,7 @@ function ViewerViewportGrid(props) {
 
   // TODO -> Make a HangingProtocolService
   const HangingProtocolService = displaySets => {
-    const displaySetInstanceUid = displaySets[Object.keys(displaySets)[0]][0].displaySetInstanceUid;
+    const displaySetInstanceUID = displaySets[Object.keys(displaySets)[0]][0].displaySetInstanceUID;
 
     return {
       numRows: 1,
@@ -28,7 +28,7 @@ function ViewerViewportGrid(props) {
       activeViewportIndex: 0,
       viewports: [
         {
-          displaySetInstanceUid,
+          displaySetInstanceUID,
         },
       ],
     };
@@ -56,16 +56,17 @@ function ViewerViewportGrid(props) {
 
   // viewportData --> displaySets
 
+  debugger;
   const getViewportPanes = () =>
     viewportGrid.viewports.map((viewport, viewportIndex) => {
-      const displaySetInstanceUid = viewport.displaySetInstanceUid;
-      if (!displaySetInstanceUid) {
+      const displaySetInstanceUID = viewport.displaySetInstanceUID;
+      if (!displaySetInstanceUID) {
         return null;
       }
 
       // TODO: Is this ever being hit??
       debugger;
-      const displaySet = DisplaySetService.getDisplaySetByUID(displaySetInstanceUid);
+      const displaySet = DisplaySetService.getDisplaySetByUID(displaySetInstanceUID);
 
       if (!displaySet) {
         return (