diff --git a/LesionTracker/client/components/app/app.html b/LesionTracker/client/components/app/app.html
index 5fd7a1ab7..0410e9d30 100644
--- a/LesionTracker/client/components/app/app.html
+++ b/LesionTracker/client/components/app/app.html
@@ -21,13 +21,6 @@
             </div>
         {{/section}}
     {{/header}}
-    <div id="studylistTabs" class="tab-content">
-        <div class="tab-pane active" id="studylistTab">
-            <div class="studylistContainer">
-                {{>studylistResult}}
-            </div>
-        </div>
-        <div class="tab-pane" id="viewerTab">
-        </div>
-    </div>
+
+    {{>Template.dynamic template=(choose this.template 'studylist') data=this}}
 </template>
diff --git a/LesionTracker/client/components/app/app.js b/LesionTracker/client/components/app/app.js
index 8ad73368a..0450bb9f6 100644
--- a/LesionTracker/client/components/app/app.js
+++ b/LesionTracker/client/components/app/app.js
@@ -1,19 +1,18 @@
 import { Template } from 'meteor/templating';
 import { Session } from 'meteor/session';
+import { Router } from 'meteor/iron:router';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { OHIF } from 'meteor/ohif:core';
 
 const studylistContentId = 'studylistTab';
 const viewerContentId = 'viewerTab';
 
-// Define the ViewerData global object
-// If there is currently any Session data for this object,
-// use this to repopulate the variable
+// Define the OHIF.viewer.data global object
 Template.app.onCreated(() => {
     const instance = Template.instance();
     instance.headerClasses = new ReactiveVar('');
 
-    ViewerData = Session.get('ViewerData') || {};
+    OHIF.viewer.data = instance.data.viewerData || {};
 
     OHIF.header.dropdown.setItems([{
         action: OHIF.user.audit,
@@ -46,24 +45,25 @@ Template.app.onCreated(() => {
     }]);
 
     instance.autorun(() => {
-        const contentId = Session.get('activeContentId');
-        instance.headerClasses.set(contentId === viewerContentId ? '' : 'header-big');
-    });
-});
+        const currentRoute = Router.current();
+        if (!currentRoute) return;
+        const routeName = currentRoute.route.getName();
+        const isViewer = routeName.indexOf('viewer') === 0;
 
-Template.app.onRendered(() => {
-    const contentId = Session.get('activeContentId');
-    if (contentId === viewerContentId) {
-        switchToTab(contentId);
-    }
+        // Add or remove the strech class from body
+        $(document.body)[isViewer ? 'addClass' : 'removeClass']('stretch');
+
+        // Set the header on its bigger version if the viewer is not opened
+        instance.headerClasses.set(isViewer ? '' : 'header-big');
+
+        // Set the viewer open state on session
+        Session.set('ViewerOpened', isViewer);
+    });
 });
 
 Template.app.events({
     'click .js-toggle-studyList'(event) {
-        const contentId = Session.get('activeContentId');
-
         OHIF.ui.unsavedChanges.presentProactiveDialog('viewer.*', (hasChanges, userChoice) => {
-
             if (hasChanges) {
 
                 switch (userChoice) {
@@ -79,20 +79,12 @@ Template.app.events({
                 }
 
             }
-
-            if (contentId !== studylistContentId) {
-                switchToTab(studylistContentId);
-            } else {
-                switchToTab(viewerContentId);
-            }
-
         }, {
             position: {
                 x: event.clientX + 15,
                 y: event.clientY + 15
             }
         });
-
     }
 });
 
@@ -104,7 +96,7 @@ Template.app.helpers({
 
         // If the Viewer has not been opened yet, 'Back to viewer' should
         // not be displayed
-        const viewerContentExists = !!Object.keys(ViewerData).length;
+        const viewerContentExists = !!Object.keys(OHIF.viewer.data).length;
         if (!viewerContentExists) {
             return;
         }
diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js
index 1b87b9f7c..c9b26d3bd 100644
--- a/LesionTracker/client/components/viewer/viewer.js
+++ b/LesionTracker/client/components/viewer/viewer.js
@@ -31,12 +31,8 @@ Meteor.startup(() => {
 });
 
 Template.viewer.onCreated(() => {
-
     Session.set('ViewerReady', false);
 
-    const toolManager = OHIF.viewerbase.toolManager;
-    ViewerData = window.ViewerData || ViewerData;
-
     const instance = Template.instance();
 
     const { TimepointApi, MeasurementApi, ConformanceCriteria } = OHIF.measurements;
@@ -59,7 +55,6 @@ Template.viewer.onCreated(() => {
     instance.data.state.set('leftSidebar', Session.get('leftSidebar'));
     instance.data.state.set('rightSidebar', Session.get('rightSidebar'));
 
-    const contentId = instance.data.contentId;
     const viewportUtils = OHIF.viewerbase.viewportUtils;
 
     OHIF.viewer.functionList = $.extend(OHIF.viewer.functionList, {
@@ -84,18 +79,16 @@ Template.viewer.onCreated(() => {
         linkStackScroll: viewportUtils.linkStackScroll
     });
 
-    if (ViewerData[contentId].loadedSeriesData) {
+    if (OHIF.viewer.data.loadedSeriesData) {
         OHIF.log.info('Reloading previous loadedSeriesData');
-        OHIF.viewer.loadedSeriesData = ViewerData[contentId].loadedSeriesData;
-
+        OHIF.viewer.loadedSeriesData = OHIF.viewer.data.loadedSeriesData;
     } else {
-        OHIF.log.info('Setting default ViewerData');
+        OHIF.log.info('Setting default viewer data');
         OHIF.viewer.loadedSeriesData = {};
-        ViewerData[contentId].loadedSeriesData = {};
-        Session.setPersistent('ViewerData', ViewerData);
+        OHIF.viewer.data.loadedSeriesData = {};
     }
 
-    Session.set('activeViewport', ViewerData[contentId].activeViewport || false);
+    Session.set('activeViewport', OHIF.viewer.data.activeViewport || false);
 
     // Set lesion tool buttons as disabled if pixel spacing is not available for active element
     instance.autorun(OHIF.lesiontracker.pixelSpacingAutorunCheck);
diff --git a/LesionTracker/client/routes.js b/LesionTracker/client/routes.js
index ac8a8e6c2..0f2fdb6c1 100644
--- a/LesionTracker/client/routes.js
+++ b/LesionTracker/client/routes.js
@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
-import { Session } from 'meteor/session';
 import { Router } from 'meteor/iron:router';
 import { OHIF } from 'meteor/ohif:core';
 
-Session.setDefault('ViewerData', {});
+// TODO: remove the line below
+window.Router = Router;
 
 // verifyEmail controls whether emailVerification template will be rendered or not
 const verifyEmail = Meteor.settings && Meteor.settings.public && Meteor.settings.public.verifyEmail || false;
@@ -19,27 +19,21 @@ const data = {};
 
 const routerOptions = { data };
 
-Router.route('/', function() {
-    // Check user is logged in
-    if (Meteor.user() && Meteor.userId()) {
+Router.route('/', {
+    name: 'home',
+    onBeforeAction: function() {
+        // Check if user needs to verify its email
         if (verifyEmail && Meteor.user().emails && !Meteor.user().emails[0].verified) {
             this.render('emailVerification', routerOptions);
         } else {
-            const contentId = Session.get('activeContentId');
-            if (!contentId) {
-                Session.setPersistent('activeContentId', 'studylistTab');
-            }
-
             this.render('app', routerOptions);
         }
-    } else {
-        this.render('entrySignIn', routerOptions);
     }
 });
 
 Router.route('/viewer/timepoints/:_id', {
     layoutTemplate: 'layout',
-    name: 'viewer',
+    name: 'viewerTimepoint',
     onBeforeAction: function() {
         const timepointId = this.params._id;
 
@@ -48,6 +42,47 @@ Router.route('/viewer/timepoints/:_id', {
     }
 });
 
+OHIF.viewer.prepare = ({ studyInstanceUids, timepointId }) => {
+    // Clear the cornerstone tool data to sync the measurements with the measurements API
+    cornerstoneTools.globalImageIdSpecificToolStateManager = cornerstoneTools.newImageIdSpecificToolStateManager();
+
+    return new Promise((resolve, reject) => {
+        OHIF.studylist.retrieveStudiesMetadata(studyInstanceUids).then(studies => {
+            // Add additional metadata to our study from the studylist
+            studies.forEach(study => {
+                const studylistStudy = OHIF.studylist.collections.Studies.findOne({
+                    studyInstanceUid: study.studyInstanceUid
+                });
+
+                if (!studylistStudy) {
+                    return;
+                }
+
+                Object.assign(study, studylistStudy);
+            });
+
+            resolve(studies);
+        }).catch(reject);
+    });
+};
+
+Router.route('/viewer/studies/:studyInstanceUids', {
+    name: 'viewerStudies',
+    onBeforeAction: function() {
+        this.render('app', { data: { template: 'loadingText' } });
+
+        const studyInstanceUids = this.params.studyInstanceUids.split(';');
+        OHIF.viewer.prepare({ studyInstanceUids }).then(studies => {
+            this.render('app', {
+                data: {
+                    template: 'viewer',
+                    studies
+                }
+            });
+        });
+    }
+});
+
 Router.onBeforeAction(function() {
     if (!Meteor.userId() && !Meteor.loggingIn()) {
         this.render('entrySignIn');
diff --git a/OHIFViewer/client/components/ohifViewer/ohifViewer.js b/OHIFViewer/client/components/ohifViewer/ohifViewer.js
index a163e3f18..57ba70066 100644
--- a/OHIFViewer/client/components/ohifViewer/ohifViewer.js
+++ b/OHIFViewer/client/components/ohifViewer/ohifViewer.js
@@ -5,13 +5,6 @@ import { OHIF } from 'meteor/ohif:core';
 const studylistContentId = 'studylistTab';
 let lastContentId;
 
-// Define the ViewerData global object
-// If there is currently any Session data for this object,
-// use this to repopulate the variable
-Template.ohifViewer.onCreated(() => {
-    ViewerData = Session.get('ViewerData') || {};
-});
-
 Template.ohifViewer.events({
     'click .js-toggle-studyList'() {
         const contentId = Session.get('activeContentId');
@@ -31,11 +24,10 @@ Template.ohifViewer.events({
 Template.ohifViewer.helpers({
     studyListToggleText() {
         const contentId = Session.get('activeContentId');
-        Session.get('ViewerData');
 
         // If the Viewer has not been opened yet, 'Back to viewer' should
         // not be displayed
-        const viewerContentExists = !!Object.keys(ViewerData).length;
+        const viewerContentExists = !!Object.keys(OHIF.viewer.data).length;
         if (!viewerContentExists) {
             return;
         }
diff --git a/OHIFViewer/client/components/viewer/viewer.js b/OHIFViewer/client/components/viewer/viewer.js
index 3dd7bd2d2..cdbca4bec 100644
--- a/OHIFViewer/client/components/viewer/viewer.js
+++ b/OHIFViewer/client/components/viewer/viewer.js
@@ -2,14 +2,13 @@ import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { ReactiveDict } from 'meteor/reactive-dict';
-import { Tracker } from 'meteor/tracker'
-
+import { Tracker } from 'meteor/tracker';
 import { OHIF } from 'meteor/ohif:core';
+
 import 'meteor/ohif:cornerstone';
 import 'meteor/ohif:viewerbase';
 import 'meteor/ohif:metadata';
 
-
 /**
  * Inits OHIF Hanging Protocol's onReady.
  * It waits for OHIF Hanging Protocol to be ready to instantiate the ProtocolEngine
@@ -47,7 +46,6 @@ Meteor.startup(() => {
     Session.setDefault('leftSidebar', false);
     Session.setDefault('rightSidebar', false);
 
-    OHIF.viewer = OHIF.viewer || {};
     OHIF.viewer.defaultTool = 'wwwc';
     OHIF.viewer.refLinesEnabled = true;
     OHIF.viewer.cine = {
@@ -77,9 +75,7 @@ Meteor.startup(() => {
     cornerstoneTools.metaData.addProvider(metadataProvider.provider.bind(metadataProvider));
 });
 
-
 Template.viewer.onCreated(() => {
-
     Session.set('ViewerReady', false);
 
     const instance = Template.instance();
@@ -88,24 +84,22 @@ Template.viewer.onCreated(() => {
     instance.data.state.set('leftSidebar', Session.get('leftSidebar'));
     instance.data.state.set('rightSidebar', Session.get('rightSidebar'));
 
-    const contentId = instance.data.contentId;
-
-    if (ViewerData[contentId] && ViewerData[contentId].loadedSeriesData) {
+    if (OHIF.viewer.data && OHIF.viewer.data.loadedSeriesData) {
         OHIF.log.info('Reloading previous loadedSeriesData');
-        OHIF.viewer.loadedSeriesData = ViewerData[contentId].loadedSeriesData;
+        OHIF.viewer.loadedSeriesData = OHIF.viewer.data.loadedSeriesData;
     } else {
-        OHIF.log.info('Setting default ViewerData');
+        OHIF.log.info('Setting default viewer data');
         OHIF.viewer.loadedSeriesData = {};
-        ViewerData[contentId] = {};
-        ViewerData[contentId].loadedSeriesData = OHIF.viewer.loadedSeriesData;
+        OHIF.viewer.data = {};
+        OHIF.viewer.data.loadedSeriesData = OHIF.viewer.loadedSeriesData;
 
         // Update the viewer data object
-        ViewerData[contentId].viewportColumns = 1;
-        ViewerData[contentId].viewportRows = 1;
-        ViewerData[contentId].activeViewport = 0;
+        OHIF.viewer.data.viewportColumns = 1;
+        OHIF.viewer.data.viewportRows = 1;
+        OHIF.viewer.data.activeViewport = 0;
     }
 
-    Session.set('activeViewport', ViewerData[contentId].activeViewport || 0);
+    Session.set('activeViewport', OHIF.viewer.data.activeViewport || 0);
 
     // @TypeSafeStudies
     // Clears OHIF.viewer.Studies collection
@@ -115,7 +109,7 @@ Template.viewer.onCreated(() => {
     // Clears OHIF.viewer.StudyMetadataList collection
     OHIF.viewer.StudyMetadataList.removeAll();
 
-    ViewerData[contentId].studyInstanceUids = [];
+    OHIF.viewer.data.studyInstanceUids = [];
     instance.data.studies.forEach(study => {
         const studyMetadata = new OHIF.metadata.StudyMetadata(study, study.studyInstanceUid);
         const displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata);
@@ -126,10 +120,8 @@ Template.viewer.onCreated(() => {
         study.displaySets = displaySets;
         OHIF.viewer.Studies.insert(study);
         OHIF.viewer.StudyMetadataList.insert(studyMetadata);
-        ViewerData[contentId].studyInstanceUids.push(study.studyInstanceUid);
+        OHIF.viewer.data.studyInstanceUids.push(study.studyInstanceUid);
     });
-
-    Session.set('ViewerData', ViewerData);
 });
 
 Template.viewer.onRendered(function() {
@@ -154,6 +146,7 @@ Template.viewer.events({
         const current = instance.data.state.get('leftSidebar');
         instance.data.state.set('leftSidebar', !current);
     },
+
     'click .js-toggle-protocol-editor'() {
         const instance = Template.instance();
         const current = instance.data.state.get('rightSidebar');
diff --git a/OHIFViewer/client/routes.js b/OHIFViewer/client/routes.js
index 6ef416552..e09fb2711 100644
--- a/OHIFViewer/client/routes.js
+++ b/OHIFViewer/client/routes.js
@@ -1,8 +1,6 @@
 import { Session } from 'meteor/session';
 import { Router } from 'meteor/iron:router';
 
-Session.setDefault('ViewerData', {});
-
 Router.configure({
     layoutTemplate: 'layout',
     loadingTemplate: 'layout'
@@ -31,4 +29,4 @@ Router.route('/viewer/:_id', {
             }
         });
     }
-});
\ No newline at end of file
+});
diff --git a/Packages/ohif-design/styles/common/global.styl b/Packages/ohif-design/styles/common/global.styl
index 519222e1c..37c5080a3 100644
--- a/Packages/ohif-design/styles/common/global.styl
+++ b/Packages/ohif-design/styles/common/global.styl
@@ -1,8 +1,16 @@
 @import "{ohif:design}/app"
 
 html body
+  theme('background-color', '$primaryBackgroundColor')
   font-family: 'Roboto', 'OpenSans', 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif
 
+html body.stretch
+  height: 100%
+  minWidth: 0
+  overflow: hidden
+  position: fixed
+  width: 100%
+
 html hr
   theme('border-top', '1px solid $uiBorderColor')
 
diff --git a/Packages/ohif-hanging-protocols/client/components/ruleEntryDialog/ruleEntryDialog.js b/Packages/ohif-hanging-protocols/client/components/ruleEntryDialog/ruleEntryDialog.js
index 45a7e6a9c..e641faf93 100644
--- a/Packages/ohif-hanging-protocols/client/components/ruleEntryDialog/ruleEntryDialog.js
+++ b/Packages/ohif-hanging-protocols/client/components/ruleEntryDialog/ruleEntryDialog.js
@@ -138,7 +138,7 @@ function getAbstractPriorValue(imageId) {
         return;
     }
 
-    const studies = StudyListStudies.find({
+    const studies = OHIF.studylist.collections.Studies.find({
         patientId: currentStudy.patientId,
         studyDate: {
             $lt: currentStudy.studyDate
diff --git a/Packages/ohif-lesiontracker/client/lib/studylist/openNewTabWithTimepoint.js b/Packages/ohif-lesiontracker/client/lib/studylist/openNewTabWithTimepoint.js
index 3b5900362..d020b192b 100644
--- a/Packages/ohif-lesiontracker/client/lib/studylist/openNewTabWithTimepoint.js
+++ b/Packages/ohif-lesiontracker/client/lib/studylist/openNewTabWithTimepoint.js
@@ -10,7 +10,7 @@ import { OHIF } from 'meteor/ohif:core';
 OHIF.lesiontracker.openNewTabWithTimepoint = timepointId => {
     const contentId = 'viewerTab';
 
-    const Timepoints = StudyList.timepointApi.timepoints;
+    const Timepoints = OHIF.studylist.timepointApi.timepoints;
     const timepoint = Timepoints.findOne({
         timepointId: timepointId
     });
@@ -25,10 +25,8 @@ OHIF.lesiontracker.openNewTabWithTimepoint = timepointId => {
         throw 'No studies found that are related to this timepoint';
     }
 
-    ViewerData = window.ViewerData || ViewerData;
-
-    // Update the ViewerData global object
-    ViewerData[contentId] = {
+    // Update the OHIF.viewer.data global object
+    OHIF.viewer.data = {
         contentId: contentId,
         studyInstanceUids: data.studyInstanceUids,
         timepointIds: data.timepointIds,
@@ -59,7 +57,7 @@ function getDataFromTimepoint(timepoint) {
     // Otherwise, this is a follow-up exam, so we should also find the baseline timepoint,
     // and all studies related to it. We also enforce that the Baseline should have a studyDate
     // prior to the latest studyDate in the current (Follow-up) Timepoint.
-    const Timepoints = StudyList.timepointApi.timepoints;
+    const Timepoints = OHIF.studylist.timepointApi.timepoints;
     const baseline = Timepoints.findOne({
         timepointType: 'baseline',
         patientId: timepoint.patientId,
diff --git a/Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js b/Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js
index 969d548c4..e757c9ca0 100644
--- a/Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js
+++ b/Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js
@@ -2,11 +2,11 @@ import { Meteor } from 'meteor/meteor';
 import { OHIF } from 'meteor/ohif:core';
 
 Meteor.startup(function() {
-    StudyList.callbacks.dblClickOnStudy = dblClickOnStudy;
-    StudyList.callbacks.middleClickOnStudy = dblClickOnStudy;
+    OHIF.studylist.callbacks.dblClickOnStudy = dblClickOnStudy;
+    OHIF.studylist.callbacks.middleClickOnStudy = dblClickOnStudy;
 
-    StudyList.timepointApi = new OHIF.measurements.TimepointApi();
-    StudyList.timepointApi.retrieveTimepoints();
+    OHIF.studylist.timepointApi = new OHIF.measurements.TimepointApi();
+    OHIF.studylist.timepointApi.retrieveTimepoints();
 });
 
 /**
@@ -14,7 +14,7 @@ Meteor.startup(function() {
  */
 const dblClickOnStudy = data => {
     // Find the relevant timepoint given the clicked-on study
-    const timepointApi = StudyList.timepointApi;
+    const timepointApi = OHIF.studylist.timepointApi;
     if (!timepointApi) {
         OHIF.log.warn('No timepoint api on dbl-clicked study?');
         return;
@@ -37,10 +37,8 @@ const dblClickOnStudy = data => {
 const openTab = studyInstanceUid => {
     const contentId = 'viewerTab';
 
-    ViewerData = window.ViewerData || ViewerData;
-
-    // Update the ViewerData global object
-    ViewerData[contentId] = {
+    // Update the OHIF.viewer.data global object
+    OHIF.viewer.data = {
         contentId: contentId,
         isUnassociatedStudy: true,
         studyInstanceUids: [studyInstanceUid]
diff --git a/Packages/ohif-measurements/client/components/association/associationModal/associationModal.js b/Packages/ohif-measurements/client/components/association/associationModal/associationModal.js
index 1b4109aae..3c1d872a2 100644
--- a/Packages/ohif-measurements/client/components/association/associationModal/associationModal.js
+++ b/Packages/ohif-measurements/client/components/association/associationModal/associationModal.js
@@ -11,7 +11,7 @@ Template.dialogStudyAssociation.onCreated(() => {
 
     instance.data.confirmCallback = (formData, resolve) => {
         OHIF.log.info('Saving associations');
-        const Timepoints = StudyList.timepointApi.timepoints;
+        const Timepoints = OHIF.studylist.timepointApi.timepoints;
 
         // Find the rows of the study association table
         const $tableRows = instance.$('#studyAssociationTable table tbody tr');
@@ -138,7 +138,7 @@ Template.dialogStudyAssociation.onCreated(() => {
             };
         });
 
-        StudyList.timepointApi.storeTimepoints();
+        OHIF.studylist.timepointApi.storeTimepoints();
 
         resolve();
     };
diff --git a/Packages/ohif-measurements/client/components/association/associationModal/studyAssociationTable/studyAssociationTable.js b/Packages/ohif-measurements/client/components/association/associationModal/studyAssociationTable/studyAssociationTable.js
index 141da35be..a3d4f97d3 100644
--- a/Packages/ohif-measurements/client/components/association/associationModal/studyAssociationTable/studyAssociationTable.js
+++ b/Packages/ohif-measurements/client/components/association/associationModal/studyAssociationTable/studyAssociationTable.js
@@ -52,7 +52,7 @@ function autoSelectStudies(selectedStudies) {
     // Fetch autoselected studies based on the date range
     // Note that we used MongoDB's fetch here so we have a mutable array,
     // rather than a Cursor
-    const autoselected = StudyListStudies.find({
+    const autoselected = OHIF.studylist.collections.Studies.find({
         studyDate: {
             $gte: range.earliestDate.format('YYYYMMDD'),
             $lte: range.latestDate.format('YYYYMMDD')
diff --git a/Packages/ohif-measurements/client/components/longitudinal/dropdown.js b/Packages/ohif-measurements/client/components/longitudinal/dropdown.js
index a37c90838..c940ac853 100644
--- a/Packages/ohif-measurements/client/components/longitudinal/dropdown.js
+++ b/Packages/ohif-measurements/client/components/longitudinal/dropdown.js
@@ -12,7 +12,7 @@ const getAssociationAssessment = () => {
     };
 
     // check if timepointApi is available
-    const timepointApi = StudyList.timepointApi;
+    const timepointApi = OHIF.studylist.timepointApi;
     if (timepointApi) {
         // Get a Cursor pointing to the selected Studies from the StudyList
         const selectedStudies = OHIF.studylist.getSelectedStudies();
@@ -46,10 +46,8 @@ const viewStudies = () => {
     const studyInstanceUids = selectedStudies.map(study => study.studyInstanceUid);
     const contentId = 'viewerTab';
 
-    ViewerData = window.ViewerData || ViewerData;
-
-    // Update the ViewerData global object
-    ViewerData[contentId] = {
+    // Update the OHIF.viewer.data global object
+    OHIF.viewer.data = {
         contentId: contentId,
         studyInstanceUids: studyInstanceUids
     };
@@ -77,7 +75,7 @@ const removeTimepointAssociations = event => {
         const selectedStudies = OHIF.studylist.getSelectedStudies();
 
         // Find the Timepoint that was previously referenced
-        const timepointApi = StudyList.timepointApi;
+        const timepointApi = OHIF.studylist.timepointApi;
         if (!timepointApi) {
             OHIF.log.error('Remove Study/Timepoint Association: No Timepoint API found.');
             return;
diff --git a/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListStudy/longitudinalStudyListStudy.html b/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListStudy/longitudinalStudyListStudy.html
index 6698b545d..a69d2900e 100644
--- a/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListStudy/longitudinalStudyListStudy.html
+++ b/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListStudy/longitudinalStudyListStudy.html
@@ -1,5 +1,5 @@
 <template name="longitudinalStudyListStudy">
-    <tr class="studylistStudy noselect">
+    <tr class="studylistStudy noselect {{#if this.selected}}active{{/if}}">
         <td>
             {{#if reviewerTip}}
                 <i class="fa fa-exclamation-circle reviewerTip" data-toggle="tooltip" data-placement="bottom" title="{{reviewerTip}}"></i>
diff --git a/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListStudy/longitudinalStudyListStudy.js b/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListStudy/longitudinalStudyListStudy.js
index 2584d024b..da03cfe74 100644
--- a/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListStudy/longitudinalStudyListStudy.js
+++ b/Packages/ohif-measurements/client/components/longitudinal/longitudinalStudyListStudy/longitudinalStudyListStudy.js
@@ -1,3 +1,7 @@
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+import { OHIF } from 'meteor/ohif:core';
+
 // Use Aldeed's meteor-template-extension package to replace the
 // default StudyListStudy template.
 // See https://github.com/aldeed/meteor-template-extension
@@ -9,7 +13,7 @@ Template.longitudinalStudyListStudy.replaces(defaultTemplate);
 Template[defaultTemplate].helpers({
     timepointName: function() {
         const instance = Template.instance();
-        const timepointApi = StudyList.timepointApi;
+        const timepointApi = OHIF.studylist.timepointApi;
         if (!timepointApi) {
             return;
         }
@@ -21,9 +25,10 @@ Template[defaultTemplate].helpers({
 
         return timepointApi.name(timepoint);
     },
+
     reviewerTip: function() {
         const instance = Template.instance();
-        const timepointApi = StudyList.timepointApi;
+        const timepointApi = OHIF.studylist.timepointApi;
         if (!timepointApi) {
             return;
         }
@@ -33,10 +38,7 @@ Template[defaultTemplate].helpers({
             return;
         }
 
-        var timepointReviewers = Reviewers.findOne({
-            timepointId: timepoint.timepointId
-        });
-        
+        const timepointReviewers = Reviewers.findOne({ timepointId: timepoint.timepointId });
         if (!timepointReviewers) {
             return;
         }
@@ -50,7 +52,7 @@ function getReviewerTipText(reviewers) {
         return;
     }
 
-    var newReviewers = reviewers.filter(function(reviewer) {
+    const newReviewers = reviewers.filter(function(reviewer) {
         return reviewer.userId !== Meteor.userId();
     });
 
@@ -58,7 +60,7 @@ function getReviewerTipText(reviewers) {
         return;
     }
 
-    var tipText = 'The study is being reviewed by ';
+    let tipText = 'The study is being reviewed by ';
     newReviewers.forEach(function(reviewer, index) {
         if (reviewer.userId === Meteor.userId()) {
             return;
diff --git a/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js b/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js
index aad9ba92a..4a3f43ea2 100644
--- a/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js
+++ b/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js
@@ -1,7 +1,11 @@
+import { Template } from 'meteor/templating';
+import { Session } from 'meteor/session';
+import { OHIF } from 'meteor/ohif:core';
+
 // Use Aldeed's meteor-template-extension package to replace the
 // default viewportOverlay template.
 // See https://github.com/aldeed/meteor-template-extension
-var defaultTemplate = 'viewportOverlay';
+const defaultTemplate = 'viewportOverlay';
 Template.longitudinalViewportOverlay.replaces(defaultTemplate);
 
 // Add the TimepointName helper to the default template. The
@@ -12,10 +16,8 @@ Template[defaultTemplate].helpers({
         const studyInstanceUid = instance.data.studyInstanceUid;
 
         // TODO: Find a better way to obtain the timepointApi from the viewer.js template
-        const timepointApi = StudyList.timepointApi;
-        if (!timepointApi) {
-        	return;
-        }
+        const timepointApi = OHIF.studylist.timepointApi;
+        if (!timepointApi) return;
 
         const timepoints = timepointApi.study(studyInstanceUid);
         if (!timepoints || !timepoints.length) {
@@ -31,4 +33,4 @@ Template[defaultTemplate].helpers({
         const linkedViewports = Session.get('StackImagePositionOffsetSynchronizerLinkedViewports') || [];
         return (linkedViewports.indexOf(this.viewportIndex) !== -1);
     }
-});
\ No newline at end of file
+});
diff --git a/Packages/ohif-study-list/both/index.js b/Packages/ohif-study-list/both/index.js
index 281920f01..d8fdd34ca 100644
--- a/Packages/ohif-study-list/both/index.js
+++ b/Packages/ohif-study-list/both/index.js
@@ -1,4 +1,4 @@
+import './base.js';
 import './lib';
 import './schema';
-import './base.js';
 import './collections.js';
diff --git a/Packages/ohif-study-list/client/base.js b/Packages/ohif-study-list/client/base.js
new file mode 100644
index 000000000..5efa1b71c
--- /dev/null
+++ b/Packages/ohif-study-list/client/base.js
@@ -0,0 +1,5 @@
+import { OHIF } from 'meteor/ohif:core';
+
+Object.assign(OHIF.studylist, {
+    callbacks: {}
+});
diff --git a/Packages/ohif-study-list/client/collections/index.js b/Packages/ohif-study-list/client/collections/index.js
index 8e673e096..40c37c4ad 100644
--- a/Packages/ohif-study-list/client/collections/index.js
+++ b/Packages/ohif-study-list/client/collections/index.js
@@ -1 +1,2 @@
+import './studies.js';
 import './subscriptions.js';
diff --git a/Packages/ohif-study-list/client/collections/studies.js b/Packages/ohif-study-list/client/collections/studies.js
new file mode 100644
index 000000000..832afb4a9
--- /dev/null
+++ b/Packages/ohif-study-list/client/collections/studies.js
@@ -0,0 +1,11 @@
+import { Meteor } from 'meteor/meteor';
+import { OHIF } from 'meteor/ohif:core';
+
+// Define the Studies Collection. This is a client-side only Collection which stores the list of
+// studies in the StudyList
+Meteor.startup(() => {
+    const Studies = new Meteor.Collection(null);
+    Studies._debugName = 'Studies';
+
+    OHIF.studylist.collections.Studies = Studies;
+});
diff --git a/Packages/ohif-study-list/client/components/studylist/index.js b/Packages/ohif-study-list/client/components/studylist/index.js
index 0abec511b..bbdaf66d4 100644
--- a/Packages/ohif-study-list/client/components/studylist/index.js
+++ b/Packages/ohif-study-list/client/components/studylist/index.js
@@ -1,5 +1,4 @@
 import './studylist.html';
-import './studylist.js';
 import './studylist.styl';
 
 import './studylistStudy/studylistStudy.html';
diff --git a/Packages/ohif-study-list/client/components/studylist/studylist.html b/Packages/ohif-study-list/client/components/studylist/studylist.html
index 4e51ec4c0..7aeb9767c 100644
--- a/Packages/ohif-study-list/client/components/studylist/studylist.html
+++ b/Packages/ohif-study-list/client/components/studylist/studylist.html
@@ -1,13 +1,5 @@
 <template name="studylist">
-    <div id="studylistTabs" class="tab-content">
-        <div role="tabpanel" class="tab-pane active" id="studylistTab">
-            <div class="studylistContainer">
-                {{>studylistResult (clone this)}}
-            </div>
-        </div>
-        <div role="tabpanel" class="tab-pane" id="viewerTab">
-            <div class="viewerContainer">
-            </div>
-        </div>
+    <div class="study-list-wrapper">
+        {{>studylistResult (clone this)}}
     </div>
 </template>
diff --git a/Packages/ohif-study-list/client/components/studylist/studylist.js b/Packages/ohif-study-list/client/components/studylist/studylist.js
deleted file mode 100644
index df7e47527..000000000
--- a/Packages/ohif-study-list/client/components/studylist/studylist.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Template: StudyList
- *
- * This is the main component of the StudyList package
- */
-
-// Define the ViewerData global object
-// If there is currently any Session data for this object,
-// use this to repopulate the variable
-ViewerData = Session.get('ViewerData') || {};
-
-// Define the StudyListStudies Collection
-// This is a client-side only Collection which
-// Stores the list of studies in the StudyList
-StudyListStudies = new Meteor.Collection(null);
-StudyListStudies._debugName = 'StudyListStudies';
-
-Session.setDefault('activeContentId', 'studylistTab');
-
-Template.studylist.onCreated(() => {
-    const instance = Template.instance();
-
-    if (StudyList.subscriptions) {
-        StudyList.subscriptions.forEach(subscriptionName => {
-            instance.subscribe(subscriptionName);
-        });
-    }
-});
-
-Template.studylist.onRendered(() => {
-    const instance = Template.instance();
-    if (instance.data && instance.data.studyInstanceUid) {
-        const studyInstanceUid = instance.data.studyInstanceUid;
-        openNewTab(studyInstanceUid);
-    } else {
-        // If there is a tab set as active in the Session,
-        // switch to that now.
-        console.log('studylist onRendered');
-        const contentId = Session.get('activeContentId');
-        if (contentId !== 'studylistTab' && ViewerData && ViewerData[contentId]) {
-            switchToTab(contentId);
-        }
-    }
-});
diff --git a/Packages/ohif-study-list/client/components/studylist/studylist.styl b/Packages/ohif-study-list/client/components/studylist/studylist.styl
index 8e870b9a2..b4206c6b6 100644
--- a/Packages/ohif-study-list/client/components/studylist/studylist.styl
+++ b/Packages/ohif-study-list/client/components/studylist/studylist.styl
@@ -1,34 +1,13 @@
 @import "{ohif:design}/app"
 
-body
-  theme('background-color', '$primaryBackgroundColor')
-
-#tblStudyList
-  tr
-    height: 20px
-
-#studylistTab
-  theme('background-color', '$primaryBackgroundColor')
-
-.studylistContainer
+.study-list-wrapper
   theme('background-color', '$primaryBackgroundColor')
   color: white
   margin: 2px auto 0
+  height: calc(100% - 91px)
   position: relative
   width: 100%
 
-.tab-content
-  width: 100%
-  height: calc(100% - 91px)
-
   .loadingTextDiv
     theme('color', '$textSecondaryColor')
     font-size: 30px
-
-  .tab-pane
-    width: 100%
-    height: 100%
-
-    .viewerContainer
-      height: 100%
-      width: 100%
diff --git a/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.html b/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.html
index f074731d8..03b0b4713 100644
--- a/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.html
+++ b/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.html
@@ -1,14 +1,8 @@
 <template name="studylistResult">
     <div class="studyListToolbar clearfix">
-        <div class="header pull-left">
-            Study List
-        </div>
-        <div class="studyCount pull-right">
-            {{numberOfStudies}}
-        </div>
-        <div class="pull-right">
-            {{>studylistToolbar}}
-        </div>
+        <div class="header pull-left">Study List</div>
+        <div class="studyCount pull-right">{{numberOfStudies}}</div>
+        <div class="pull-right">{{>studylistToolbar}}</div>
     </div>
     <div class="theadBackground">
     </div>
@@ -74,18 +68,18 @@
                 </tr>
             </thead>
             <tbody id="studyListData">
-            {{#each study in studies}}
-                {{>studylistStudy (clone study this)}}
-            {{/each}}
+                {{#each study in studies}}
+                    {{>studylistStudy (clone study this)}}
+                {{/each}}
             </tbody>
         </table>
 
         <!-- Pagination -->
-        {{> studylistPagination }}
+        {{>studylistPagination}}
 
         {{#if session "showLoadingText"}}
             {{>loadingText}}
-        {{ else }}
+        {{else}}
             {{#unless numberOfStudies}}
                 <div class="notFound">No matching results</div>
             {{/unless}}
diff --git a/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js b/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js
index 1772921f0..0eb7b8c1d 100644
--- a/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js
+++ b/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js
@@ -1,11 +1,16 @@
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+import { Session } from 'meteor/session';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { ReactiveDict } from 'meteor/reactive-dict';
+import { moment } from 'meteor/momentjs:moment';
 import { OHIF } from 'meteor/ohif:core';
 
 Session.setDefault('showLoadingText', true);
 
 Template.studylistResult.helpers({
     /**
-     * Returns a sorted instance of the StudyListStudies Collection
-     * by Patient name and Study Date in Ascending order.
+     * Returns a ascending sorted instance of the Studies Collection by Patient name and Study Date
      */
     studies() {
         const instance = Template.instance();
@@ -26,7 +31,7 @@ Template.studylistResult.helpers({
         const offset = rowsPerPage * currentPage;
         const limit = offset + rowsPerPage;
 
-        studies = StudyListStudies.find({}, {
+        studies = OHIF.studylist.collections.Studies.find({}, {
             sort: sortOption
         }).fetch();
 
@@ -42,7 +47,7 @@ Template.studylistResult.helpers({
     },
 
     numberOfStudies() {
-        return StudyListStudies.find().count();
+        return OHIF.studylist.collections.Studies.find().count();
     },
 
     sortingColumnsIcons() {
@@ -65,9 +70,9 @@ Template.studylistResult.helpers({
     }
 });
 
-var studyDateFrom;
-var studyDateTo;
-var filter;
+let studyDateFrom;
+let studyDateTo;
+let filter;
 
 /**
  * Transforms an input string into a search filter for
@@ -106,9 +111,6 @@ function replaceUndefinedColumnValue(text) {
     }
 }
 
-/**
-
-
 /**
  * Convert string to study date
  */
@@ -122,10 +124,10 @@ function convertStringToStudyDate(dateStr) {
 
 /**
  * Runs a search for studies matching the studylist query parameters
- * Inserts the identified studies into the StudyListStudies Collection
+ * Inserts the identified studies into the Studies Collection
  */
 function search() {
-    console.log('search()');
+    OHIF.log.info('search()');
 
     // Show loading message
     Session.set('showLoadingText', true);
@@ -138,7 +140,7 @@ function search() {
         studyDescription: getFilter($('input#studyDescription').val()),
         studyDateFrom: studyDateFrom,
         studyDateTo: studyDateTo,
-        modalitiesInStudy: $('input#modality').val() ? $('input#modality').val() : ""
+        modalitiesInStudy: $('input#modality').val() ? $('input#modality').val() : ''
     };
 
     // Make sure that modality has a reasonable value, since it is occasionally
@@ -146,10 +148,10 @@ function search() {
     const modality = replaceUndefinedColumnValue($('input#modality').val());
 
     // Clear all current studies
-    StudyListStudies.remove({});
+    OHIF.studylist.collections.Studies.remove({});
 
     Meteor.call('StudyListSearch', filter, (error, studies) => {
-        console.log('StudyListSearch');
+        OHIF.log.info('StudyListSearch');
         if (error) {
             OHIF.log.warn(error);
             return;
@@ -172,8 +174,8 @@ function search() {
                 // Convert numberOfStudyRelatedInstance string into integer
                 study.numberOfStudyRelatedInstances = !isNaN(study.numberOfStudyRelatedInstances) ? parseInt(study.numberOfStudyRelatedInstances) : undefined;
 
-                // Insert any matching studies into the StudyListStudies Collection
-                StudyListStudies.insert(study);
+                // Insert any matching studies into the Studies Collection
+                OHIF.studylist.collections.Studies.insert(study);
             }
         });
     });
@@ -181,7 +183,7 @@ function search() {
 
 const getRowsPerPage = () => sessionStorage.getItem('rowsPerPage');
 
-// Wraps ReactiveVar equalsFunc function. Whenever ReactiveVar is 
+// Wraps ReactiveVar equalsFunc function. Whenever ReactiveVar is
 // set to a new value, it will save it in the Session Storage.
 // The return is the default ReactiveVar equalsFunc if available
 // or values are === compared
@@ -200,9 +202,10 @@ Template.studylistResult.onCreated(() => {
     // Rows per page
     // Check session storage or set 25 as default
     const cachedRowsPerPage = getRowsPerPage();
-    if(!cachedRowsPerPage) {
+    if (!cachedRowsPerPage) {
         setRowsPerPage(0, 25);
     }
+
     const rowsPerPage = getRowsPerPage();
     instance.rowsPerPage = new ReactiveVar(parseInt(rowsPerPage, 10), setRowsPerPage);
 
@@ -214,8 +217,7 @@ Template.studylistResult.onCreated(() => {
     const sortOptionSession = Session.get('sortOption');
     if (sortOptionSession) {
         instance.sortingColumns.set(sortOptionSession);
-    } 
-    else {
+    } else {
         instance.sortingColumns.set({
             patientName: 1,
             studyDate: 1,
diff --git a/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.styl b/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.styl
index 9b9ff71e5..a9df2af6f 100644
--- a/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.styl
+++ b/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.styl
@@ -76,6 +76,9 @@ $bodyCellHeight = 40px
     text-align: center
 
   table#tblStudyList
+    tr
+      height: 20px
+
     thead
       white-space: nowrap
 
@@ -172,10 +175,10 @@ $bodyCellHeight = 40px
 
 @media only screen and (max-width: 1362px)
   $tablePadding = 5%
-  
+
   #studyListContainer
     padding: 0 $tablePadding
-    
+
     table#tblStudyList
       thead,
       tbody
@@ -190,10 +193,10 @@ $bodyCellHeight = 40px
 
 @media only screen and (max-width: 1161px)
   $tablePadding = 3%
-  
+
   #studyListContainer
     padding: 0 $tablePadding
-    
+
     table#tblStudyList
       thead,
       tbody
@@ -208,31 +211,31 @@ $bodyCellHeight = 40px
 
 @media only screen and (max-width: 1069px)
   $tablePaddingMediumScreen = 5px
-  
+
   .theadBackground
     height: 101px
 
   .studyListToolbar
     padding: 0 $tablePaddingMediumScreen
-    
+
   #studyListContainer
     padding: 0
 
     table#tblStudyList
       thead > tr > th
-        
+
         &:first-child
           padding-left: $tablePaddingMediumScreen
 
         &:last-child
           padding-right: $tablePaddingMediumScreen
-          
+
         input.worklist-search
           padding: 10px
-          
+
         div.sortingCell
           padding: 10px 5px
-          
+
           i
             width: auto
 
@@ -242,8 +245,8 @@ $bodyCellHeight = 40px
 
         &:last-child
           padding-right: $tablePaddingMediumScreen
-    
+
     .worklistPagination
       .row
         margin-left: 0
-        margin-right: 0
\ No newline at end of file
+        margin-right: 0
diff --git a/Packages/ohif-study-list/client/components/studylist/studylistStudy/studylistStudy.html b/Packages/ohif-study-list/client/components/studylist/studylistStudy/studylistStudy.html
index e6dbd93ab..2477d9a30 100644
--- a/Packages/ohif-study-list/client/components/studylist/studylistStudy/studylistStudy.html
+++ b/Packages/ohif-study-list/client/components/studylist/studylistStudy/studylistStudy.html
@@ -1,5 +1,5 @@
 <template name="studylistStudy">
-    <tr class="studylistStudy noselect">
+    <tr class="studylistStudy noselect {{#if this.selected}}active{{/if}}">
         <td class="patientName">
             {{formatPN patientName}}
         </td>
@@ -19,4 +19,4 @@
             {{studyDescription}}
         </td>
     </tr>
-</template>
\ No newline at end of file
+</template>
diff --git a/Packages/ohif-study-list/client/components/studylist/studylistStudy/studylistStudy.js b/Packages/ohif-study-list/client/components/studylist/studylistStudy/studylistStudy.js
index cf893a5e5..b3a74b8cc 100644
--- a/Packages/ohif-study-list/client/components/studylist/studylistStudy/studylistStudy.js
+++ b/Packages/ohif-study-list/client/components/studylist/studylistStudy/studylistStudy.js
@@ -1,100 +1,82 @@
-import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 import { Blaze } from 'meteor/blaze';
 import { OHIF } from 'meteor/ohif:core';
 
-// Maybe we should use regular StudyList collection?
-StudyListSelectedStudies = new Meteor.Collection(null);
-StudyListSelectedStudies._debugName = 'StudyListSelectedStudies';
-
-function isStudySelected(study) {
-    // Search StudyListSelectedStudies for given study and return true if found
-    let count = StudyListSelectedStudies.find({
-        studyInstanceUid: study.studyInstanceUid
-    }).count();
-    return count > 0;
-}
-
+// Clear all selected studies
 function doClearStudySelections() {
-    // Clear all selected studies
-    StudyListSelectedStudies.remove({});
-    $('tr.studylistStudy').removeClass('active');
+    OHIF.studylist.collections.Studies.update({}, {
+        $set: { selected: false }
+    }, { multi: true });
 }
 
-function doSelectRow(studyRow, data) {
-    // Insert current study into selection list if it's not there already...
-    if (!isStudySelected(data)) {
-        StudyListSelectedStudies.insert(data);
+function doSelectRow($studyRow, data) {
+    // Mark the current study as selected if it's not marked yet
+    if (!data.selected) {
+        const filter = { studyInstanceUid: data.studyInstanceUid };
+        const modifiers = { $set: { selected: true } };
+        OHIF.studylist.collections.Studies.update(filter, modifiers);
     }
-    // Make sure the study row has "active" class
-    studyRow.addClass('active');
-    // Set this as the previously selected row, so the user can
-    // use Shift to select from this point onwards
-    StudyList.previouslySelected = studyRow;
+
+    // Set it as the previously selected row, so the user can use Shift to select from this point on
+    OHIF.studylist.$lastSelectedRow = $studyRow;
 }
 
-function doSelectSingleRow(studyRow, data) {
+function doSelectSingleRow($studyRow, data) {
     // Clear all selected studies
     doClearStudySelections();
-    // ... And add selected row to selection list
-    doSelectRow(studyRow, data);
+
+    // Add selected row to selection list
+    doSelectRow($studyRow, data);
 }
 
-function doUnselectRow(studyRow, data) {
-    // Find the current studyInstanceUid in the stored list and remove it
-    StudyListSelectedStudies.remove({
-        studyInstanceUid: data.studyInstanceUid
-    });
-    studyRow.removeClass('active');
+function doUnselectRow($studyRow, data) {
+    // Find the current studyInstanceUid in the stored list and mark as unselected
+    const filter = { studyInstanceUid: data.studyInstanceUid };
+    const modifiers = { $set: { selected: false } };
+    OHIF.studylist.collections.Studies.update(filter, modifiers);
 }
 
 function handleShiftClick($studyRow, data) {
-    //OHIF.log.info('shiftKey');
-
-    let study, previous = StudyList.previouslySelected ? $(StudyList.previouslySelected) : null;
-    if (previous && previous.length > 0) {
-        study = Blaze.getData(previous.get(0));
-        if (!isStudySelected(study)) {
-            previous = void 0; // undefined
-            StudyList.previouslySelected = previous;
+    let study;
+    let $previousRow = OHIF.studylist.$lastSelectedRow;
+    if ($previousRow && $previousRow.length > 0) {
+        study = Blaze.getData($previousRow.get(0));
+        if (!study.selected) {
+            $previousRow = $(); // undefined
+            OHIF.studylist.$lastSelectedRow = $previousRow;
         }
     }
 
     // Select all rows in between these two rows
-    if (previous) {
+    if ($previousRow.length) {
         let $rowsInBetween;
-        if (previous.index() < $studyRow.index()) {
+        if ($previousRow.index() < $studyRow.index()) {
             // The previously selected row is above (lower index) the
             // currently selected row.
 
             // Fill in the rows upwards from the previously selected row
-            $rowsInBetween = previous.nextAll('tr');
-        } else if (previous.index() > $studyRow.index()) {
+            $rowsInBetween = $previousRow.nextAll('tr');
+        } else if ($previousRow.index() > $studyRow.index()) {
             // The previously selected row is below the currently
             // selected row.
 
             // Fill in the rows upwards from the previously selected row
-            $rowsInBetween = previous.prevAll('tr');
+            $rowsInBetween = $previousRow.prevAll('tr');
         } else {
-            // nothing to do since previous.index() === $studyRow.index()
+            // nothing to do since $previousRow.index() === $studyRow.index()
             // the user is shift-clicking the same row...
             return;
         }
 
         // Loop through the rows in between current and previous selected studies
-        $rowsInBetween.forEach(row => {
+        $rowsInBetween.each((index, row) => {
             const $row = $(row);
 
-            if ($row.hasClass('active')) {
-                // If we find one that is already selected, do nothing
-                return;
-            }
-
-            // Get the relevant studyInstanceUid
-            let studyInstanceUid = $row.attr('studyInstanceUid');
-
             // Retrieve the data context through Blaze
-            let data = Blaze.getData(this);
+            const data = Blaze.getData(row);
+
+            // If we find one that is already selected, do nothing
+            if (data.selected) return;
 
             // Set the current study as selected
             doSelectRow($row, data);
@@ -108,37 +90,31 @@ function handleShiftClick($studyRow, data) {
     }
 }
 
-function handleCtrlClick(studyRow, data) {
-    //OHIF.log.info('ctrlKey');
-    if (isStudySelected(data)) {
-        doUnselectRow(studyRow, data);
-    } else {
-        doSelectRow(studyRow, data);
-        OHIF.log.info('StudyList PreviouslySelected set: ' + studyRow.index());
-    }
+function handleCtrlClick($studyRow, data) {
+    const handler = data.selected ? doUnselectRow : doSelectRow;
+    handler($studyRow, data);
 }
 
-Template.studylistStudy.onRendered(function() {
-    let instance = this,
-        data = instance.data,
-        row = instance.$('tr.studylistStudy').first();
+Template.studylistStudy.onRendered(() => {
+    const instance = Template.instance();
+    const data = instance.data;
+    const $row = instance.$('tr.studylistStudy').first();
 
     // Enable HammerJS to allow touch support
-    let mc = new Hammer.Manager(row.get(0)),
-        doubleTapRecognizer = new Hammer.Tap({
-            event: 'doubletap',
-            taps: 2,
-            interval: 500,
-            threshold: 30,
-            posThreshold: 30
-        });
+    const mc = new Hammer.Manager($row.get(0));
+    const doubleTapRecognizer = new Hammer.Tap({
+        event: 'doubletap',
+        taps: 2,
+        interval: 500,
+        threshold: 30,
+        posThreshold: 30
+    });
     mc.add(doubleTapRecognizer);
 
     // Check if current row has been previously selected
-    if (isStudySelected(data)) {
-        doSelectRow(row, data);
+    if (data.selected) {
+        doSelectRow($row, data);
     }
-
 });
 
 Template.studylistStudy.events({
@@ -164,7 +140,7 @@ Template.studylistStudy.events({
             return;
         }
 
-        const middleClickOnStudy = StudyList.callbacks.middleClickOnStudy;
+        const middleClickOnStudy = OHIF.studylist.callbacks.middleClickOnStudy;
         if (middleClickOnStudy && typeof middleClickOnStudy === 'function') {
             middleClickOnStudy(instance.data);
         }
@@ -175,7 +151,7 @@ Template.studylistStudy.events({
             return;
         }
 
-        const dblClickOnStudy = StudyList.callbacks.dblClickOnStudy;
+        const dblClickOnStudy = OHIF.studylist.callbacks.dblClickOnStudy;
 
         if (dblClickOnStudy && typeof dblClickOnStudy === 'function') {
             dblClickOnStudy(instance.data);
@@ -185,7 +161,7 @@ Template.studylistStudy.events({
     'contextmenu tr.studylistStudy, press tr.studylistStudy'(event, instance) {
         const $studyRow = $(event.currentTarget);
 
-        if (!isStudySelected(instance.data)) {
+        if (!instance.data.selected) {
             doSelectSingleRow($studyRow, instance.data);
         }
 
diff --git a/Packages/ohif-study-list/client/index.js b/Packages/ohif-study-list/client/index.js
index 896d44f73..a7e89c8fd 100644
--- a/Packages/ohif-study-list/client/index.js
+++ b/Packages/ohif-study-list/client/index.js
@@ -1,3 +1,4 @@
+import './base';
 import './collections';
 import './lib';
 import './components';
diff --git a/Packages/ohif-study-list/client/lib/getSelectedStudies.js b/Packages/ohif-study-list/client/lib/getSelectedStudies.js
index 3c6092dde..65f00d483 100644
--- a/Packages/ohif-study-list/client/lib/getSelectedStudies.js
+++ b/Packages/ohif-study-list/client/lib/getSelectedStudies.js
@@ -1,7 +1,7 @@
 import { OHIF } from 'meteor/ohif:core';
 
 OHIF.studylist.getSelectedStudies = () => {
-    return StudyListSelectedStudies.find({}, {
+    return OHIF.studylist.collections.Studies.find({ selected: true }, {
         sort: {
             studyDate: 1
         }
diff --git a/Packages/ohif-study-list/client/lib/getStudyMetadata.js b/Packages/ohif-study-list/client/lib/getStudyMetadata.js
deleted file mode 100644
index f565bbae1..000000000
--- a/Packages/ohif-study-list/client/lib/getStudyMetadata.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import { OHIF } from 'meteor/ohif:core';
-import 'meteor/ohif:viewerbase';
-
-// DEPRECATED - use OHIF.studylist.retrieveStudyMetadata instead
-// Define the StudyMetaData object. This is used as a cache
-// to store study meta data information to prevent unnecessary
-// calls to the server
-var StudyMetaData = {};
-
-/**
- * Retrieves study metadata using a server call, and fires a callback
- * when completed.
- *
- * @params {string} studyInstanceUid The UID of the Study to be retrieved
- * @params {function} doneCallback The callback function to be executed when the study retrieval has finished
- * @param failCallback The callback function to be executed when the study retrieval has failed
- */
-getStudyMetadata = function(studyInstanceUid, doneCallback, failCallback) {
-    // If the StudyMetaData cache already has data related to this
-    // studyInstanceUid, then we should fire the doneCallback with this data
-    // and stop here.
-    var study = StudyMetaData[studyInstanceUid];
-    if (study) {
-        doneCallback(study);
-        return;
-    }
-
-    console.time('getStudyMetadata');
-
-    // If no study metadata is in the cache variable, we need to retrieve it from
-    // the server with a call.
-    Meteor.call('GetStudyMetadata', studyInstanceUid, function(error, study) {
-        console.timeEnd('getStudyMetadata');
-
-        if (Meteor.user && Meteor.user()) {
-            var hipaaEvent = {
-                eventType: 'viewed',
-                userId: Meteor.userId(),
-                userName: Meteor.user().profile.fullName,
-                collectionName: 'Study',
-                recordId: studyInstanceUid,
-                patientId: study.patientId,
-                patientName: study.patientName
-            };
-            HipaaLogger.logEvent(hipaaEvent);
-        }
-
-        if (error) {
-            OHIF.log.warn(error);
-            failCallback(error);
-            return;
-        }
-
-        if (!study) {
-            throw "GetStudyMetadata: No study data returned from server";
-        }
-
-        // Once we have retrieved the data, we sort the series' by series
-        // and instance number in ascending order
-        OHIF.viewerbase.sortStudy(study);
-
-        // Updates WADO-RS metaDataManager
-        OHIF.viewerbase.updateMetaDataManager(study);
-
-        // Add additional metadata to our study from the studylist
-        var studylistStudy = StudyListStudies.findOne({
-            studyInstanceUid: study.studyInstanceUid
-        });
-
-        if (!studylistStudy) {
-            // return;
-        }
-
-        $.extend(study, studylistStudy);
-
-        // Then we store this data in the cache variable
-        StudyMetaData[studyInstanceUid] = study;
-
-        // Finally, we fire the doneCallback with this study meta data
-        doneCallback(study);
-    });
-};
diff --git a/Packages/ohif-study-list/client/lib/getStudyPriors.js b/Packages/ohif-study-list/client/lib/getStudyPriors.js
index c338bcf3a..b77b79513 100644
--- a/Packages/ohif-study-list/client/lib/getStudyPriors.js
+++ b/Packages/ohif-study-list/client/lib/getStudyPriors.js
@@ -26,8 +26,8 @@ const getStudyPriors = study => {
     const patientID = study.getTagValue(PATIENT_ID); // PatientID
     const studyDate = study.getTagValue(STUDY_DATE); // StudyDate
 
-    // Find prior studies in global StudyListStudies Minimongo collection
-    const cursor = StudyListStudies.find({
+    // Find prior studies in global Studies Minimongo collection
+    const cursor = OHIF.studylist.collections.Studies.find({
         patientId: patientID,
         studyDate: {
             $lt: studyDate
diff --git a/Packages/ohif-study-list/client/lib/index.js b/Packages/ohif-study-list/client/lib/index.js
index 42842bfa9..13efcdfb9 100644
--- a/Packages/ohif-study-list/client/lib/index.js
+++ b/Packages/ohif-study-list/client/lib/index.js
@@ -3,12 +3,9 @@ import './third-party/jquery.twbsPagination.min.js';
 import './exportSelectedStudies.js';
 import './exportStudies.js';
 import './getSelectedStudies.js';
-import './getStudyMetadata.js';
-import './getStudiesMetadata.js';
 import './importStudies.js';
-import './openNewTab.js';
 import './queryStudies.js';
+import './retrieveStudiesMetadata.js';
 import './retrieveStudyMetadata.js';
 import './studylist.js';
-import './switchToTab.js';
 import './viewSeriesDetails.js';
diff --git a/Packages/ohif-study-list/client/lib/openNewTab.js b/Packages/ohif-study-list/client/lib/openNewTab.js
deleted file mode 100644
index 07f84399d..000000000
--- a/Packages/ohif-study-list/client/lib/openNewTab.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Random } from 'meteor/random';
-import { OHIF } from 'meteor/ohif:core';
-
-/**
- * Opens a new tab in the tabbed studylist environment using
- * a given study and new tab title.
- *
- * @param studyInstanceUid The UID of the Study to be opened
- */
-const openNewTab = studyInstanceUid => {
-    OHIF.log.info('openNewTab');
-
-    // Generate a unique ID to represent this tab
-    // We can't just use the Mongo entry ID because
-    // then it will change after hot-reloading.
-    const contentId = Random.id();
-
-    // Update the ViewerData global object
-    ViewerData = window.ViewerData || ViewerData;
-    ViewerData[contentId] = {
-        contentId: contentId,
-        studyInstanceUids: [studyInstanceUid]
-    };
-
-    // Switch to the new tab
-    switchToTab(contentId);
-};
diff --git a/Packages/ohif-study-list/client/lib/getStudiesMetadata.js b/Packages/ohif-study-list/client/lib/retrieveStudiesMetadata.js
similarity index 62%
rename from Packages/ohif-study-list/client/lib/getStudiesMetadata.js
rename to Packages/ohif-study-list/client/lib/retrieveStudiesMetadata.js
index f628096e0..123334fd8 100644
--- a/Packages/ohif-study-list/client/lib/getStudiesMetadata.js
+++ b/Packages/ohif-study-list/client/lib/retrieveStudiesMetadata.js
@@ -7,10 +7,9 @@ import { OHIF } from 'meteor/ohif:core';
  * and waits for all of the results to be returned.
  *
  * @param studyInstanceUids The UIDs of the Studies to be retrieved
- * @param doneCallback The callback function to be executed when the study retrieval has finished
- * @param failCallback The callback function to be executed when the study retrieval has failed
+ * @return Promise
  */
-OHIF.studylist.getStudiesMetadata = (studyInstanceUids, doneCallback, failCallback) => {
+OHIF.studylist.retrieveStudiesMetadata = (studyInstanceUids, doneCallback, failCallback) => {
     // Check to make sure studyInstanceUids were actually input
     if (!studyInstanceUids || !studyInstanceUids.length) {
         if (failCallback && typeof failCallback === 'function') {
@@ -20,8 +19,7 @@ OHIF.studylist.getStudiesMetadata = (studyInstanceUids, doneCallback, failCallba
         return;
     }
 
-    // Create an empty array to store the Promises for each metaData
-    // retrieval call
+    // Create an empty array to store the Promises for each metaData retrieval call
     const promises = [];
 
     // Loop through the array of studyInstanceUids
@@ -35,15 +33,10 @@ OHIF.studylist.getStudiesMetadata = (studyInstanceUids, doneCallback, failCallba
     });
 
     // When all of the promises are complete, this callback runs
-    Promise.all(promises).then(studies => {
-        // Pass the studies array to the doneCallback, if one exists
-        if (doneCallback && typeof doneCallback === 'function') {
-            doneCallback(studies);
-        }
-    }).catch(error => {
-        OHIF.log.warn(error);
-        if (failCallback && typeof failCallback === 'function') {
-            failCallback(error);
-        }
-    });
+    const promise = Promise.all(promises);
+
+    // Warn the error on console if some retrieval failed
+    promise.catch(error => OHIF.log.warn(error));
+
+    return promise;
 };
diff --git a/Packages/ohif-study-list/client/lib/retrieveStudyMetadata.js b/Packages/ohif-study-list/client/lib/retrieveStudyMetadata.js
index d17a867cc..23bc5d12a 100644
--- a/Packages/ohif-study-list/client/lib/retrieveStudyMetadata.js
+++ b/Packages/ohif-study-list/client/lib/retrieveStudyMetadata.js
@@ -62,13 +62,11 @@ OHIF.studylist.retrieveStudyMetadata = studyInstanceUid => {
             OHIF.viewerbase.updateMetaDataManager(study);
 
             // Add additional metadata to our study from the studylist
-            const studylistStudy = StudyListStudies.findOne({
+            const studylistStudy = OHIF.studylist.collections.Studies.findOne({
                 studyInstanceUid: study.studyInstanceUid
             });
 
-            if (!studylistStudy) {
-                // return;
-            } else {
+            if (studylistStudy) {
                 Object.assign(study, studylistStudy);
             }
 
diff --git a/Packages/ohif-study-list/client/lib/studylist.js b/Packages/ohif-study-list/client/lib/studylist.js
index a3c5966d9..92fa7f16b 100644
--- a/Packages/ohif-study-list/client/lib/studylist.js
+++ b/Packages/ohif-study-list/client/lib/studylist.js
@@ -1,3 +1,4 @@
+import { OHIF } from 'meteor/ohif:core';
 import { Viewerbase } from 'meteor/ohif:viewerbase';
 // Classes
 import { OHIFStudyMetadataSource } from './OHIFStudyMetadataSource';
@@ -11,15 +12,14 @@ StudyList = {
         getStudyPriors,
         getStudyPriorsMap
     },
-    callbacks: {},
     classes: {
         OHIFStudyMetadataSource,
         OHIFStudySummary
     }
 };
 
-StudyList.callbacks.dblClickOnStudy = dblClickOnStudy;
-StudyList.callbacks.middleClickOnStudy = dblClickOnStudy;
+OHIF.studylist.callbacks.dblClickOnStudy = dblClickOnStudy;
+OHIF.studylist.callbacks.middleClickOnStudy = dblClickOnStudy;
 
 function dblClickOnStudy(data) {
     openNewTab(data.studyInstanceUid);
diff --git a/Packages/ohif-study-list/client/lib/switchToTab.js b/Packages/ohif-study-list/client/lib/switchToTab.js
deleted file mode 100644
index 0986d3e45..000000000
--- a/Packages/ohif-study-list/client/lib/switchToTab.js
+++ /dev/null
@@ -1,153 +0,0 @@
-import { Blaze } from 'meteor/blaze';
-import { Session } from 'meteor/session';
-import { jQuery, $ } from 'meteor/jquery';
-import { Template } from 'meteor/templating';
-
-import { OHIF } from 'meteor/ohif:core';
-
-/**
- *  Switches to a new tab in the tabbed studylist container
- *  This function renders either the StudyList or the Viewer template with new data.
- *
- * @param contentId The unique ID of the tab to be switched to
- */
-switchToTab = function(contentId) {
-    if (!contentId) {
-        return;
-    }
-
-    OHIF.log.info('Switching to tab: ' + contentId);
-
-    // Clear the cornerstone tool data to sync the measurements with the measurements API
-    cornerstoneTools.globalImageIdSpecificToolStateManager = cornerstoneTools.newImageIdSpecificToolStateManager();
-
-    $('.tab-content .tab-pane').removeClass('active');
-    if (contentId !== 'studylistTab') {
-        $('.tab-content .tab-pane#viewerTab').addClass('active');
-    } else {
-        $('.tab-content .tab-pane#' + contentId).addClass('active');
-    }
-
-    // Remove any previous Viewers from the DOM
-    $('.viewerContainer').remove();
-    $('.studylistContainer').remove();
-
-    // Update the 'activeContentId' variable in Session
-    Session.set('activeContentId', contentId);
-
-    // If we are switching to the StudyList tab, reset any CSS styles
-    // that have been applied to prevent scrolling in the Viewer.
-    // Then stop here, since nothing needs to be re-rendered.
-    let container;
-    if (contentId === 'studylistTab') {
-        container = $('.tab-content').find('#studylistTab').get(0);
-
-        if (!container) {
-            return;
-        }
-
-        const studylistContainer = document.createElement('div');
-        studylistContainer.classList.add('studylistContainer');
-        container.appendChild(studylistContainer);
-
-        // Use Blaze to render the StudyListResult Template into the container
-        Blaze.render(Template.studylistResult, studylistContainer);
-
-        document.body.style.overflow = null;
-        document.body.style.height = null;
-        document.body.style.minWidth = null;
-        document.body.style.position = null;
-        return;
-    }
-
-    // Tab was closed at some point, stop here
-    ViewerData = window.ViewerData || ViewerData;
-    if (!ViewerData[contentId]) {
-        return;
-    }
-
-    container = $('.tab-content').find('#viewerTab').get(0);
-    container.innerHTML = '';
-
-    // Use Blaze to render the Loading Template into the container
-    // viewStudiesInTab will clear this container
-    Blaze.renderWithData(Template.loadingText, {}, container);
-
-    const studies = ViewerData[contentId].studies;
-
-    if (studies) {
-        // ViewerData already has the meta data (in cases when studylist is launched externally)
-        viewStudiesInTab(contentId, studies);
-    } else {
-        // Use the stored ViewerData global object to retrieve the studyInstanceUid
-        // related to this tab
-        const studyInstanceUids = ViewerData[contentId].studyInstanceUids;
-
-        // Attempt to retrieve the meta data (it might be cached)
-        OHIF.studylist.getStudiesMetadata(studyInstanceUids, function(studies) {
-            viewStudiesInTab(contentId, studies);
-        });
-    }
-};
-
-const viewStudiesInTab = (contentId, studies) => {
-    // Tab closed while study data was being retrieved, stop here
-    if (!ViewerData[contentId]) {
-        OHIF.log.warn('Tab closed while study data was being retrieved');
-        return;
-    }
-
-    // Once we have the study data, store it in a structure with
-    // any other saved data about this tab (e.g. layout structure)
-    const data = jQuery.extend({}, ViewerData[contentId]);
-    data.studies = studies;
-
-    // TODO: check if this is necessary. Since the typo bug
-    // was fixed (it was contentid instead of contentId)
-    data.contentId = contentId;
-
-    if (ViewerData[contentId].studies && ViewerData[contentId].studies.length) {
-        data.studies = ViewerData[contentId].studies;
-    }
-
-    // Add additional metadata to our study from the studylist
-    data.studies.forEach(study => {
-        const studylistStudy = StudyListStudies.findOne({
-            studyInstanceUid: study.studyInstanceUid
-        });
-
-        if (!studylistStudy) {
-            return;
-        }
-
-        $.extend(study, studylistStudy);
-    });
-
-    // Get tab content container given the contentId string
-    // If no such container exists, stop here because something is wrong
-    const container = $('.tab-content').find('#viewerTab').get(0);
-
-    // Remove the loading text template that is inside the tab container by default
-    const viewerContainer = document.createElement('div');
-    viewerContainer.classList.add('viewerContainer');
-    container.innerHTML = '';
-    container.appendChild(viewerContainer);
-
-    // Use Blaze to render the Viewer Template into the container
-    Blaze.renderWithData(Template.viewer, data, viewerContainer);
-
-    // Retrieve the DOM element of the viewer
-    const imageViewer = $('#viewer');
-
-    // If it is present in the DOM (it should be), then apply
-    // styles to prevent page scrolling and overscrolling on mobile devices
-    if (imageViewer) {
-        document.body.style.overflow = 'hidden';
-        document.body.style.height = '100%';
-        document.body.style.width = '100%';
-        document.body.style.minWidth = 0;
-
-        // Prevent overscroll on mobile devices
-        document.body.style.position = 'fixed';
-    }
-};
diff --git a/Packages/ohif-study-list/package.js b/Packages/ohif-study-list/package.js
index a854f9dae..498677e0a 100644
--- a/Packages/ohif-study-list/package.js
+++ b/Packages/ohif-study-list/package.js
@@ -54,15 +54,8 @@ Package.onUse(function(api) {
     api.export('Services', 'server');
 
     // Export StudyList helper functions for usage in Routes
-    api.export('getStudyMetadata', 'client');
-    api.export('openNewTab', 'client');
-    api.export('switchToTab', 'client');
     api.export('StudyList');
 
-    // Export the global ViewerData object
-    api.export('ViewerData', 'client');
-
     // Export the Collections
-    api.export('StudyListStudies', 'client');
     api.export('StudyListSelectedStudies', 'client');
 });
diff --git a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
index c70ecae52..4e09d8d9f 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
@@ -54,11 +54,11 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
     // This data will be saved so that the tab can be reloaded to the same state after tabs
     // are switched
     if (contentId) {
-        if (!ViewerData[contentId]) {
+        if (!OHIF.viewer.data) {
             return;
         }
 
-        ViewerData[contentId].loadedSeriesData[viewportIndex] = {};
+        OHIF.viewer.data.loadedSeriesData[viewportIndex] = {};
     }
 
     // Create shortcut to displaySet
@@ -154,7 +154,7 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
     // Additional tasks for metadata provider. If using your own
     // metadata provider, this may not be necessary.
     // updateMetadata is important, though, to update image metadata that
-    // for any reason was missing some information such as rows, columns, 
+    // for any reason was missing some information such as rows, columns,
     // sliceThickness, etc (See MetadataProvider class from ohif-cornerstone package)
     const metadataProvider = OHIF.viewer.metadataProvider;
     const isUpdateMetadataDefined = metadataProvider && typeof metadataProvider.updateMetadata === 'function';
@@ -173,7 +173,7 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
         let enabledElement;
         try {
             enabledElement = cornerstone.getEnabledElement(element);
-        } 
+        }
         catch (error) {
             OHIF.log.warn('Viewport destroyed before loaded image could be displayed');
             return;
@@ -305,15 +305,13 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
             // This lets the viewport overlay always display correct window / zoom values
             Session.set('CornerstoneImageRendered' + viewportIndex, Random.id());
 
-            // Save the current viewport into the ViewerData global variable, as well as the
-            // Meteor Session. This lets the viewport be saved/reloaded on a hot-code reload
+            // Save the current viewport into the OHIF.viewer.data global variable
             const viewport = cornerstone.getViewport(element);
             layoutManager.viewportData[viewportIndex].viewport = viewport;
-            ViewerData[contentId].loadedSeriesData[viewportIndex].viewport = viewport;
-            Session.set('ViewerData', ViewerData);
+            OHIF.viewer.data.loadedSeriesData[viewportIndex].viewport = viewport;
 
             // Check if it has onImageRendered loadAndCacheImage callback
-            if(typeof callbacks.onImageRendered === 'function') {
+            if (typeof callbacks.onImageRendered === 'function') {
                 callbacks.onImageRendered(event, eventData, viewportIndex, templateData);
             }
         };
@@ -332,7 +330,7 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
             // since this callback function is called multiple times (eg: when a tool is
             // enabled/disabled -> cornerstone[toolName].tool.enable)
 
-            if(isUpdateMetadataDefined) {
+            if (isUpdateMetadataDefined) {
                 // Update the metaData for missing fields
                 metadataProvider.updateMetadata(eventData.enabledElement.image);
             }
@@ -355,17 +353,16 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
             updateOrientationMarkers(element);
 
             // If this viewport is displaying a stack of images, save the current image
-            // index in the stack to the global ViewerData object, as well as the Meteor Session.
+            // index in the stack to the global OHIF.viewer.data object.
             const stack = cornerstoneTools.getToolState(element, 'stack');
             if (stack && stack.data.length && stack.data[0].imageIds.length > 1) {
                 const imageIdIndex = stack.data[0].imageIds.indexOf(templateData.imageId);
                 layoutManager.viewportData[viewportIndex].currentImageIdIndex = imageIdIndex;
-                ViewerData[contentId].loadedSeriesData[viewportIndex].currentImageIdIndex = imageIdIndex;
-                Session.set('ViewerData', ViewerData);
+                OHIF.viewer.data.loadedSeriesData[viewportIndex].currentImageIdIndex = imageIdIndex;
             }
 
             // Check if it has onNewImage loadAndCacheImage callback
-            if(typeof callbacks.onNewImage === 'function') {
+            if (typeof callbacks.onNewImage === 'function') {
                 callbacks.onNewImage(event, eventData, viewportIndex, templateData);
             }
         };
@@ -429,7 +426,7 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
         $element.off(allCornerstoneEvents, sendActivationTrigger);
         $element.on(allCornerstoneEvents, sendActivationTrigger);
 
-        ViewerData[contentId].loadedSeriesData = layoutManager.viewportData;
+        OHIF.viewer.data.loadedSeriesData = layoutManager.viewportData;
 
         // Check if image plane (orientation / location) data is present for the current image
         const imagePlane = cornerstoneTools.metaData.get('imagePlane', image.imageId);
diff --git a/Packages/ohif-viewerbase/client/components/viewer/studyTimepointBrowser/studyTimepointBrowser.js b/Packages/ohif-viewerbase/client/components/viewer/studyTimepointBrowser/studyTimepointBrowser.js
index 0832447af..fe03db7d3 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/studyTimepointBrowser/studyTimepointBrowser.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/studyTimepointBrowser/studyTimepointBrowser.js
@@ -38,7 +38,7 @@ Template.studyTimepointBrowser.onCreated(() => {
                 return loadedStudy;
             }
 
-            const notYetLoaded = StudyListStudies.findOne(query);
+            const notYetLoaded = OHIF.studylist.collections.Studies.findOne(query);
             if (!notYetLoaded) {
                 throw new OHIFError(`No study data available for Study: ${studyInstanceUid}`);
             }
diff --git a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
index fea829fb3..c4b6f25f2 100644
--- a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
+++ b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
@@ -2,7 +2,6 @@ import { Meteor } from 'meteor/meteor';
 import { $ } from 'meteor/jquery';
 import { OHIF } from 'meteor/ohif:core';
 import { toolManager } from './toolManager';
-import { setActiveViewport } from './setActiveViewport';
 import { switchToImageRelative } from './switchToImageRelative';
 import { switchToImageByIndex } from './switchToImageByIndex';
 import { viewportUtils } from './viewportUtils';
@@ -11,10 +10,6 @@ import { WLPresets } from './WLPresets';
 
 // TODO: add this to namespace definitions
 Meteor.startup(function() {
-    if (!OHIF.viewer) {
-        OHIF.viewer = {};
-    }
-
     OHIF.viewer.loadIndicatorDelay = 200;
     OHIF.viewer.defaultTool = 'wwwc';
     OHIF.viewer.refLinesEnabled = true;
@@ -56,149 +51,134 @@ Meteor.startup(function() {
     OHIF.viewer.hotkeys = OHIF.viewer.defaultHotkeys;
 
     OHIF.viewer.hotkeyFunctions = {
-        wwwc() {
-            toolManager.setActiveTool('wwwc');
-        },
-        zoom() {
-            toolManager.setActiveTool('zoom');
-        },
-        angle() {
-            toolManager.setActiveTool('angle');
-        },
-        dragProbe() {
-            toolManager.setActiveTool('dragProbe');
-        },
-        ellipticalRoi() {
-            toolManager.setActiveTool('ellipticalRoi');
-        },
-        magnify() {
-            toolManager.setActiveTool('magnify');
-        },
-        annotate() {
-            toolManager.setActiveTool('annotate');
-        },
-        stackScroll() {
-            toolManager.setActiveTool('stackScroll');
-        },
-        pan() {
-            toolManager.setActiveTool('pan');
-        },
-        length() {
-            toolManager.setActiveTool('length');
-        },
-        spine() {
-            toolManager.setActiveTool('spine');
-        },
-        wwwcRegion() {
-            toolManager.setActiveTool('wwwcRegion');
-        },
+        wwwc: () => toolManager.setActiveTool('wwwc'),
+        zoom: () => toolManager.setActiveTool('zoom'),
+        angle: () => toolManager.setActiveTool('angle'),
+        dragProbe: () => toolManager.setActiveTool('dragProbe'),
+        ellipticalRoi: () => toolManager.setActiveTool('ellipticalRoi'),
+        magnify: () => toolManager.setActiveTool('magnify'),
+        annotate: () => toolManager.setActiveTool('annotate'),
+        stackScroll: () => toolManager.setActiveTool('stackScroll'),
+        pan: () => toolManager.setActiveTool('pan'),
+        length: () => toolManager.setActiveTool('length'),
+        spine: () => toolManager.setActiveTool('spine'),
+        wwwcRegion: () => toolManager.setActiveTool('wwwcRegion'),
+
         zoomIn() {
             const button = document.getElementById('zoomIn');
             flashButton(button);
             viewportUtils.zoomIn();
         },
+
         zoomOut() {
             const button = document.getElementById('zoomOut');
             flashButton(button);
             viewportUtils.zoomOut();
         },
+
         zoomToFit() {
             const button = document.getElementById('zoomToFit');
             flashButton(button);
             viewportUtils.zoomToFit();
         },
-        scrollDown() {
-            const container = $('.viewportContainer.active');
-            const button = container.find('#nextImage').get(0);
 
-            if (!container.find('.imageViewerViewport').hasClass('empty')) {
+        scrollDown() {
+            const $container = $('.viewportContainer.active');
+            const button = $container.find('#nextImage').get(0);
+
+            if (!$container.find('.imageViewerViewport').hasClass('empty')) {
                 flashButton(button);
                 switchToImageRelative(1);
             }
         },
+
         scrollFirstImage() {
-            const container = $('.viewportContainer.active');
-            if (!container.find('.imageViewerViewport').hasClass('empty')) {
+            const $container = $('.viewportContainer.active');
+            if (!$container.find('.imageViewerViewport').hasClass('empty')) {
                 switchToImageByIndex(0);
             }
         },
+
         scrollLastImage() {
-            const container = $('.viewportContainer.active');
-            if (!container.find('.imageViewerViewport').hasClass('empty')) {
+            const $container = $('.viewportContainer.active');
+            if (!$container.find('.imageViewerViewport').hasClass('empty')) {
                 switchToImageByIndex(-1);
             }
         },
+
         scrollUp() {
-            const container = $('.viewportContainer.active');
-            if (!container.find('.imageViewerViewport').hasClass('empty')) {
-                const button = container.find('#prevImage').get(0);
+            const $container = $('.viewportContainer.active');
+            if (!$container.find('.imageViewerViewport').hasClass('empty')) {
+                const button = $container.find('#prevImage').get(0);
                 flashButton(button);
                 switchToImageRelative(-1);
             }
         },
-        previousDisplaySet() {
-            OHIF.viewerbase.layoutManager.moveDisplaySets(false);
-        },
-        nextDisplaySet() {
-            OHIF.viewerbase.layoutManager.moveDisplaySets(true);
-        },
-        nextPanel() {
-            panelNavigation.loadNextActivePanel();
-        },
-        previousPanel() {
-            panelNavigation.loadPreviousActivePanel();
-        },
+
+        previousDisplaySet: () => OHIF.viewerbase.layoutManager.moveDisplaySets(false),
+        nextDisplaySet: () => OHIF.viewerbase.layoutManager.moveDisplaySets(true),
+        nextPanel: () => panelNavigation.loadNextActivePanel(),
+        previousPanel: () => panelNavigation.loadPreviousActivePanel(),
+
         invert() {
             const button = document.getElementById('invert');
             flashButton(button);
             viewportUtils.invert();
         },
+
         flipV() {
             const button = document.getElementById('flipV');
             flashButton(button);
             viewportUtils.flipV();
         },
+
         flipH() {
             const button = document.getElementById('flipH');
             flashButton(button);
             viewportUtils.flipH();
         },
+
         rotateR() {
             const button = document.getElementById('rotateR');
             flashButton(button);
             viewportUtils.rotateR();
         },
+
         rotateL() {
             const button = document.getElementById('rotateL');
             flashButton(button);
             viewportUtils.rotateL();
         },
-        cinePlay() {
-            viewportUtils.toggleCinePlay();
-        },
+
+        cinePlay: () => viewportUtils.toggleCinePlay(),
+
         defaultTool() {
             const tool = toolManager.getDefaultTool();
             toolManager.setActiveTool(tool);
         },
+
         toggleOverlayTags() {
-            const dicomTags = $('.imageViewerViewportOverlay .dicomTag');
-            if (dicomTags.eq(0).css('display') === 'none') {
-                dicomTags.show();
+            const $dicomTags = $('.imageViewerViewportOverlay .dicomTag');
+            if ($dicomTags.eq(0).css('display') === 'none') {
+                $dicomTags.show();
             } else {
-                dicomTags.hide();
+                $dicomTags.hide();
             }
         },
+
         resetStack() {
             const button = document.getElementById('resetStack');
             flashButton(button);
             resetStack();
         },
+
         clearImageAnnotations() {
             const button = document.getElementById('clearImageAnnotations');
             flashButton(button);
             clearImageAnnotations();
         },
-        cineDialog () {
+
+        cineDialog() {
             /**
              * TODO: This won't work in OHIF's, since this element
              * doesn't exist
@@ -233,21 +213,18 @@ function setOHIFHotkeys(hotkeys) {
 }
 
 /**
- * Global function to merge different hotkeys configurations 
+ * Global function to merge different hotkeys configurations
  * but avoiding conflicts between different keys with same action
  * When this occurs, it will delete the action from OHIF's configuration
  * So if you want to keep all OHIF's actions, use an unused-ohif-key
  * Used for compatibility with others systems only
- * 
+ *
  * @param hotkeysActions {object} Object with actions map
  * @return {object}
  */
 function mergeHotkeys(hotkeysActions) {
     // Merge hotkeys, overriding OHIF's settings
-    let mergedHotkeys = {
-        ...OHIF.viewer.defaultHotkeys,
-        ...hotkeysActions
-    };
+    const mergedHotkeys = Object.assign({}, OHIF.viewer.defaultHotkeys, hotkeysActions);
 
     const defaultHotkeys = OHIF.viewer.defaultHotkeys;
     const hotkeysKeys = Object.keys(hotkeysActions);
@@ -258,7 +235,7 @@ function mergeHotkeys(hotkeysActions) {
             // Different action but same key:
             // Remove action from merge if is not in "hotkeysActions"
             // If it is, it's already merged so nothing to do
-            if(ohifAction !== definedAction && hotkeysActions[definedAction] === defaultHotkeys[ohifAction] && !hotkeysActions[ohifAction]) {
+            if (ohifAction !== definedAction && hotkeysActions[definedAction] === defaultHotkeys[ohifAction] && !hotkeysActions[ohifAction]) {
                 delete mergedHotkeys[ohifAction];
             }
         });
@@ -272,7 +249,7 @@ function mergeHotkeys(hotkeysActions) {
  * to give the impressiont the button was pressed.
  * This is for tools that don't keep the button "pressed"
  * all the time the tool is active.
- * 
+ *
  * @param  button DOM Element for the button to be "flashed"
  */
 function flashButton(button) {
@@ -292,16 +269,16 @@ function flashButton(button) {
  * @param  {String} task   task function name
  */
 function bindHotkey(hotkey, task) {
-    var hotkeyFunctions = OHIF.viewer.hotkeyFunctions;
+    const hotkeyFunctions = OHIF.viewer.hotkeyFunctions;
 
     // Only bind defined, non-empty HotKeys
     if (!hotkey || hotkey === '') {
         return;
     }
 
-    var fn;
+    let fn;
     if (task.indexOf('WLPreset') > -1) {
-        var presetName = task.replace('WLPreset', '');
+        const presetName = task.replace('WLPreset', '');
         fn = function() {
             WLPresets.applyWLPresetToActiveElement(presetName);
         };
@@ -319,7 +296,7 @@ function bindHotkey(hotkey, task) {
         return;
     }
 
-    var hotKeyForBinding = hotkey.toLowerCase();
+    const hotKeyForBinding = hotkey.toLowerCase();
 
     $(document).bind('keydown', hotKeyForBinding, fn);
 }
@@ -341,9 +318,7 @@ function enableHotkeys(hotkeys) {
         }
 
         if (taskHotkeys instanceof Array) {
-            taskHotkeys.forEach(function(hotkey) {
-                bindHotkey(hotkey, task);
-            });
+            taskHotkeys.forEach(hotkey => bindHotkey(hotkey, task));
         } else {
             // taskHotkeys represents a single key
             bindHotkey(taskHotkeys, task);
diff --git a/StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.js b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.js
deleted file mode 100644
index 94a580f8c..000000000
--- a/StandaloneViewer/StandaloneViewer/client/components/standaloneViewer/standaloneViewer.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// Define the ViewerData global object
-// If there is currently any Session data for this object,
-// use this to repopulate the variable
-Template.standaloneViewer.onCreated(() => {
-    ViewerData = Session.get('ViewerData') || {};
-});
\ No newline at end of file
diff --git a/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js b/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js
index 8ced1b710..603aac48b 100644
--- a/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js
+++ b/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js
@@ -2,7 +2,6 @@ import { OHIF } from 'meteor/ohif:core';
 import 'meteor/ohif:viewerbase';
 import 'meteor/ohif:metadata';
 
-OHIF.viewer = OHIF.viewer || {};
 const viewportUtils = OHIF.viewerbase.viewportUtils;
 
 OHIF.viewer.functionList = {