Don't allow recursive Preview actions

handle non-valid requests (#2984 )
Co-authored-by: Deep Tailor <deep.j.tailor@nasa.gov>
2020-04-30 11:57:32 -07:00 · 2020-04-29 15:24:12 -07:00 · 2020-04-29 14:56:07 -07:00 · 2020-04-28 16:58:58 -07:00 · 2020-04-28 13:10:29 -07:00 · 2020-04-28 13:02:23 -07:00
156 changed files with 7147 additions and 2830 deletions
--- a/copyright-notice.html
+++ b/copyright-notice.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2020, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -18,4 +18,4 @@
 licenses. See the Open Source Licenses file (LICENSES.md) included with
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
-->
+-->
--- a/copyright-notice.js
+++ b/copyright-notice.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -18,4 +18,4 @@
 * licenses. See the Open Source Licenses file (LICENSES.md) included with
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
- *****************************************************************************/
+ *****************************************************************************/
--- a/coverage/HeadlessChrome
+++ b/coverage/HeadlessChrome
@@ -1,80 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-    <title>Code coverage report for All files</title>
-    <meta charset="utf-8" />
-    <link rel="stylesheet" href="prettify.css" />
-    <link rel="stylesheet" href="base.css" />
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <style type='text/css'>
-        .coverage-summary .sorter {
-            background-image: url(sort-arrow-sprite.png);
-        }
-    </style>
-</head>
-<body>
-<div class='wrapper'>
-  <div class='pad1'>
-    <h1>
-      /
-    </h1>
-    <div class='clearfix'>
-      <div class='fl pad1y space-right2'>
-        <span class="strong">100% </span>
-        <span class="quiet">Statements</span>
-        <span class='fraction'>0/0</span>
-      </div>
-      <div class='fl pad1y space-right2'>
-        <span class="strong">100% </span>
-        <span class="quiet">Branches</span>
-        <span class='fraction'>0/0</span>
-      </div>
-      <div class='fl pad1y space-right2'>
-        <span class="strong">100% </span>
-        <span class="quiet">Functions</span>
-        <span class='fraction'>0/0</span>
-      </div>
-      <div class='fl pad1y space-right2'>
-        <span class="strong">100% </span>
-        <span class="quiet">Lines</span>
-        <span class='fraction'>0/0</span>
-      </div>
-    </div>
-  </div>
-  <div class='status-line high'></div>
-<div class="pad1">
-<table class="coverage-summary">
-<thead>
-<tr>
-   <th data-col="file" data-fmt="html" data-html="true" class="file">File</th>
-   <th data-col="pic" data-type="number" data-fmt="html" data-html="true" class="pic"></th>
-   <th data-col="statements" data-type="number" data-fmt="pct" class="pct">Statements</th>
-   <th data-col="statements_raw" data-type="number" data-fmt="html" class="abs"></th>
-   <th data-col="branches" data-type="number" data-fmt="pct" class="pct">Branches</th>
-   <th data-col="branches_raw" data-type="number" data-fmt="html" class="abs"></th>
-   <th data-col="functions" data-type="number" data-fmt="pct" class="pct">Functions</th>
-   <th data-col="functions_raw" data-type="number" data-fmt="html" class="abs"></th>
-   <th data-col="lines" data-type="number" data-fmt="pct" class="pct">Lines</th>
-   <th data-col="lines_raw" data-type="number" data-fmt="html" class="abs"></th>
-</tr>
-</thead>
-<tbody></tbody>
-</table>
-</div><div class='push'></div><!-- for sticky footer -->
-</div><!-- /wrapper -->
-<div class='footer quiet pad2 space-top1 center small'>
-  Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Dec 11 2019 13:15:10 GMT-0800 (Pacific Standard Time)
-</div>
-</div>
-<script src="prettify.js"></script>
-<script>
-window.onload = function () {
-        if (typeof prettyPrint === 'function') {
-            prettyPrint();
-        }
-};
-</script>
-<script src="sorter.js"></script>
-</body>
-</html>
--- a/coverage/HeadlessChrome
+++ b/coverage/HeadlessChrome
--- a/10.14.6)/sort-arrow-sprite.png
+++ b/10.14.6)/sort-arrow-sprite.png
--- a/coverage/HeadlessChrome
+++ b/coverage/HeadlessChrome
@@ -1,158 +0,0 @@
-var addSorting = (function () {
-    "use strict";
-    var cols,
-        currentSort = {
-            index: 0,
-            desc: false
-        };
-
-    // returns the summary table element
-    function getTable() { return document.querySelector('.coverage-summary'); }
-    // returns the thead element of the summary table
-    function getTableHeader() { return getTable().querySelector('thead tr'); }
-    // returns the tbody element of the summary table
-    function getTableBody() { return getTable().querySelector('tbody'); }
-    // returns the th element for nth column
-    function getNthColumn(n) { return getTableHeader().querySelectorAll('th')[n]; }
-
-    // loads all columns
-    function loadColumns() {
-        var colNodes = getTableHeader().querySelectorAll('th'),
-            colNode,
-            cols = [],
-            col,
-            i;
-
-        for (i = 0; i < colNodes.length; i += 1) {
-            colNode = colNodes[i];
-            col = {
-                key: colNode.getAttribute('data-col'),
-                sortable: !colNode.getAttribute('data-nosort'),
-                type: colNode.getAttribute('data-type') || 'string'
-            };
-            cols.push(col);
-            if (col.sortable) {
-                col.defaultDescSort = col.type === 'number';
-                colNode.innerHTML = colNode.innerHTML + '<span class="sorter"></span>';
-            }
-        }
-        return cols;
-    }
-    // attaches a data attribute to every tr element with an object
-    // of data values keyed by column name
-    function loadRowData(tableRow) {
-        var tableCols = tableRow.querySelectorAll('td'),
-            colNode,
-            col,
-            data = {},
-            i,
-            val;
-        for (i = 0; i < tableCols.length; i += 1) {
-            colNode = tableCols[i];
-            col = cols[i];
-            val = colNode.getAttribute('data-value');
-            if (col.type === 'number') {
-                val = Number(val);
-            }
-            data[col.key] = val;
-        }
-        return data;
-    }
-    // loads all row data
-    function loadData() {
-        var rows = getTableBody().querySelectorAll('tr'),
-            i;
-
-        for (i = 0; i < rows.length; i += 1) {
-            rows[i].data = loadRowData(rows[i]);
-        }
-    }
-    // sorts the table using the data for the ith column
-    function sortByIndex(index, desc) {
-        var key = cols[index].key,
-            sorter = function (a, b) {
-                a = a.data[key];
-                b = b.data[key];
-                return a < b ? -1 : a > b ? 1 : 0;
-            },
-            finalSorter = sorter,
-            tableBody = document.querySelector('.coverage-summary tbody'),
-            rowNodes = tableBody.querySelectorAll('tr'),
-            rows = [],
-            i;
-
-        if (desc) {
-            finalSorter = function (a, b) {
-                return -1 * sorter(a, b);
-            };
-        }
-
-        for (i = 0; i < rowNodes.length; i += 1) {
-            rows.push(rowNodes[i]);
-            tableBody.removeChild(rowNodes[i]);
-        }
-
-        rows.sort(finalSorter);
-
-        for (i = 0; i < rows.length; i += 1) {
-            tableBody.appendChild(rows[i]);
-        }
-    }
-    // removes sort indicators for current column being sorted
-    function removeSortIndicators() {
-        var col = getNthColumn(currentSort.index),
-            cls = col.className;
-
-        cls = cls.replace(/ sorted$/, '').replace(/ sorted-desc$/, '');
-        col.className = cls;
-    }
-    // adds sort indicators for current column being sorted
-    function addSortIndicators() {
-        getNthColumn(currentSort.index).className += currentSort.desc ? ' sorted-desc' : ' sorted';
-    }
-    // adds event listeners for all sorter widgets
-    function enableUI() {
-        var i,
-            el,
-            ithSorter = function ithSorter(i) {
-                var col = cols[i];
-
-                return function () {
-                    var desc = col.defaultDescSort;
-
-                    if (currentSort.index === i) {
-                        desc = !currentSort.desc;
-                    }
-                    sortByIndex(i, desc);
-                    removeSortIndicators();
-                    currentSort.index = i;
-                    currentSort.desc = desc;
-                    addSortIndicators();
-                };
-            };
-        for (i =0 ; i < cols.length; i += 1) {
-            if (cols[i].sortable) {
-                // add the click event handler on the th so users
-                // dont have to click on those tiny arrows
-                el = getNthColumn(i).querySelector('.sorter').parentElement;
-                if (el.addEventListener) {
-                    el.addEventListener('click', ithSorter(i));
-                } else {
-                    el.attachEvent('onclick', ithSorter(i));
-                }
-            }
-        }
-    }
-    // adds sorting functionality to the UI
-    return function () {
-        if (!getTable()) {
-            return;
-        }
-        cols = loadColumns();
-        loadData(cols);
-        addSortIndicators();
-        enableUI();
-    };
-})();
-
-window.addEventListener('load', addSorting);
--- a/example/generator/GeneratorMetadataProvider.js
+++ b/example/generator/GeneratorMetadataProvider.js
@@ -9,7 +9,8 @@ define([
            values: [
                {
                    key: "name",
-                    name: "Name"
+                    name: "Name",
+                    format: "string"
                },
                {
                    key: "utc",
--- a/index.html
+++ b/index.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2020, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -43,9 +43,9 @@
            openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
        );

-        openmct.install(openmct.plugins.Snow());
-        openmct.install(openmct.plugins.MyItems());
        openmct.install(openmct.plugins.LocalStorage());
+        openmct.install(openmct.plugins.Espresso());
+        openmct.install(openmct.plugins.MyItems());
        openmct.install(openmct.plugins.Generator());
        openmct.install(openmct.plugins.ExampleImagery());
        openmct.install(openmct.plugins.UTCTimeSystem());
--- a/package.json
+++ b/package.json
@@ -4,8 +4,7 @@
  "description": "The Open MCT core platform",
  "dependencies": {},
  "devDependencies": {
-    "acorn": "6.2.0",
-    "angular": "1.4.14",
+    "angular": "1.7.9",
    "angular-route": "1.4.14",
    "babel-eslint": "8.2.6",
    "comma-separated-values": "^3.6.4",
--- a/platform/framework/src/FrameworkLayer.js
+++ b/platform/framework/src/FrameworkLayer.js
@@ -87,6 +87,11 @@ define([
                bootstrapper
            );

+        // Override of angular1.6 ! hashPrefix
+        app.config(['$locationProvider', function ($locationProvider) {
+            $locationProvider.hashPrefix('');
+        }]);
+
        // Apply logging levels; this must be done now, before the
        // first log statement.
        new LogLevel(logLevel).configure(app, $log);
--- a/platform/persistence/couch/src/CouchIndicator.js
+++ b/platform/persistence/couch/src/CouchIndicator.js
@@ -33,7 +33,7 @@ define(
        var CONNECTED = {
                text: "Connected",
                glyphClass: "ok",
-                statusClass: "s-status-ok",
+                statusClass: "s-status-on",
                description: "Connected to the domain object database."
            },
            DISCONNECTED = {
--- a/platform/persistence/elastic/bundle.js
+++ b/platform/persistence/elastic/bundle.js
@@ -71,7 +71,7 @@ define([
                    },
                    {
                        "key": "ELASTIC_PATH",
-                        "value": "mct/domain_object",
+                        "value": "mct/_doc",
                        "priority": "fallback"
                    },
                    {
--- a/platform/persistence/elastic/src/ElasticIndicator.js
+++ b/platform/persistence/elastic/src/ElasticIndicator.js
@@ -32,7 +32,7 @@ define(
        var CONNECTED = {
                text: "Connected",
                glyphClass: "ok",
-                statusClass: "s-status-ok",
+                statusClass: "s-status-on",
                description: "Connected to the domain object database."
            },
            DISCONNECTED = {
--- a/platform/persistence/elastic/src/ElasticPersistenceProvider.js
+++ b/platform/persistence/elastic/src/ElasticPersistenceProvider.js
@@ -32,9 +32,9 @@ define(
        // JSLint doesn't like underscore-prefixed properties,
        // so hide them here.
        var SRC = "_source",
-            REV = "_version",
-            ID = "_id",
-            CONFLICT = 409;
+            CONFLICT = 409,
+            SEQ_NO = "_seq_no",
+            PRIMARY_TERM = "_primary_term";

        /**
         * The ElasticPersistenceProvider reads and writes JSON documents
@@ -104,7 +104,8 @@ define(
        // Get a domain object model out of ElasticSearch's response
        ElasticPersistenceProvider.prototype.getModel = function (response) {
            if (response && response[SRC]) {
-                this.revs[response[ID]] = response[REV];
+                this.revs[response[SEQ_NO]] = response[SEQ_NO];
+                this.revs[response[PRIMARY_TERM]] = response[PRIMARY_TERM];
                return response[SRC];
            } else {
                return undefined;
@@ -116,7 +117,8 @@ define(
        // indicate that the request failed.
        ElasticPersistenceProvider.prototype.checkResponse = function (response, key) {
            if (response && !response.error) {
-                this.revs[key] = response[REV];
+                this.revs[SEQ_NO] = response[SEQ_NO];
+                this.revs[PRIMARY_TERM] = response[PRIMARY_TERM];
                return response;
            } else {
                return this.handleError(response, key);
@@ -147,7 +149,7 @@ define(
            function checkUpdate(response) {
                return self.checkResponse(response, key);
            }
-            return this.put(key, value, { version: this.revs[key] })
+            return this.put(key, value)
                .then(checkUpdate);
        };

--- a/platform/persistence/elastic/test/ElasticPersistenceProviderSpec.js
+++ b/platform/persistence/elastic/test/ElasticPersistenceProviderSpec.js
@@ -85,7 +85,7 @@ define(
            it("allows object creation", function () {
                var model = { someKey: "some value" };
                mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_version": 1 }
+                    data: { "_id": "abc", "_seq_no": 1, "_primary_term": 1 }
                }));
                provider.createObject("testSpace", "abc", model).then(capture);
                expect(mockHttp).toHaveBeenCalledWith({
@@ -100,7 +100,7 @@ define(
            it("allows object models to be read back", function () {
                var model = { someKey: "some value" };
                mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_version": 1, "_source": model }
+                    data: { "_id": "abc", "_seq_no": 1, "_primary_term": 1, "_source": model }
                }));
                provider.readObject("testSpace", "abc").then(capture);
                expect(mockHttp).toHaveBeenCalledWith({
@@ -117,19 +117,19 @@ define(

                // First do a read to populate rev tags...
                mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_version": 42, "_source": {} }
+                    data: { "_id": "abc", "_source": {} }
                }));
                provider.readObject("testSpace", "abc");

                // Now perform an update
                mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_version": 43, "_source": {} }
+                    data: { "_id": "abc", "_seq_no": 1, "_source": {} }
                }));
                provider.updateObject("testSpace", "abc", model).then(capture);
                expect(mockHttp).toHaveBeenCalledWith({
                    url: "/test/db/abc",
                    method: "PUT",
-                    params: { version: 42 },
+                    params: undefined,
                    data: model
                });
                expect(capture.calls.mostRecent().args[0]).toBeTruthy();
@@ -138,13 +138,13 @@ define(
            it("allows object deletion", function () {
                // First do a read to populate rev tags...
                mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_version": 42, "_source": {} }
+                    data: { "_id": "abc", "_source": {} }
                }));
                provider.readObject("testSpace", "abc");

                // Now perform an update
                mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_version": 42, "_source": {} }
+                    data: { "_id": "abc", "_source": {} }
                }));
                provider.deleteObject("testSpace", "abc", {}).then(capture);
                expect(mockHttp).toHaveBeenCalledWith({
@@ -167,13 +167,13 @@ define(
                expect(capture).toHaveBeenCalledWith(undefined);
            });

-            it("handles rejection due to version", function () {
+            it("handles rejection due to _seq_no", function () {
                var model = { someKey: "some value" },
                    mockErrorCallback = jasmine.createSpy('error');

                // First do a read to populate rev tags...
                mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_version": 42, "_source": {} }
+                    data: { "_id": "abc", "_seq_no": 1, "_source": {} }
                }));
                provider.readObject("testSpace", "abc");

@@ -196,7 +196,7 @@ define(

                // First do a read to populate rev tags...
                mockHttp.and.returnValue(mockPromise({
-                    data: { "_id": "abc", "_version": 42, "_source": {} }
+                    data: { "_id": "abc", "_seq_no": 1, "_source": {} }
                }));
                provider.readObject("testSpace", "abc");

--- a/src/MCT.js
+++ b/src/MCT.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2019, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -265,6 +265,7 @@ define([
        this.install(this.plugins.ImportExport());
        this.install(this.plugins.WebPage());
        this.install(this.plugins.Condition());
+        this.install(this.plugins.ConditionWidget());
    }

    MCT.prototype = Object.create(EventEmitter.prototype);
--- a/src/api/telemetry/TelemetryMetadataManager.js
+++ b/src/api/telemetry/TelemetryMetadataManager.js
@@ -81,7 +81,7 @@ define([
    function TelemetryMetadataManager(metadata) {
        this.metadata = metadata;

-        this.valueMetadatas = this.metadata.values.map(applyReasonableDefaults);
+        this.valueMetadatas = this.metadata.values ? this.metadata.values.map(applyReasonableDefaults) : [];
    }

    /**
--- a/src/api/telemetry/TelemetryValueFormatter.js
+++ b/src/api/telemetry/TelemetryValueFormatter.js
@@ -81,6 +81,24 @@ define([
                return printj.sprintf(formatString, baseFormat.call(this, value));
            };
        }
+        if (valueMetadata.format === 'string') {
+            this.formatter.parse = function (value) {
+                if (value === undefined) {
+                    return '';
+                }
+                if (typeof value === 'string') {
+                    return value;
+                } else {
+                    return value.toString();
+                }
+            };
+            this.formatter.format = function (value) {
+                return value;
+            };
+            this.formatter.validate = function (value) {
+                return typeof value === 'string';
+            };
+        }
    }

    TelemetryValueFormatter.prototype.parse = function (datum) {
--- a/src/plugins/URLIndicatorPlugin/URLIndicator.js
+++ b/src/plugins/URLIndicatorPlugin/URLIndicator.js
@@ -30,7 +30,7 @@ define(
        // DISCONNECTED: HTTP failed; maybe misconfigured, disconnected.
        // PENDING: Still trying to connect, and haven't failed yet.
        var CONNECTED = {
-                statusClass: "s-status-ok"
+                statusClass: "s-status-on"
            },
            PENDING = {
                statusClass: "s-status-warning-lo"
--- a/src/plugins/URLIndicatorPlugin/URLIndicatorSpec.js
+++ b/src/plugins/URLIndicatorPlugin/URLIndicatorSpec.js
@@ -122,7 +122,7 @@ define(
                it("indicates success if connection is nominal", function () {
                    jasmine.clock().tick(pluginOptions.interval + 1);
                    ajaxOptions.success();
-                    expect(indicatorElement.classList.contains('s-status-ok')).toBe(true);
+                    expect(indicatorElement.classList.contains('s-status-on')).toBe(true);
                });

                it("indicates an error when the server cannot be reached", function () {
--- a/src/plugins/condition/Condition.js
+++ b/src/plugins/condition/Condition.js
@@ -23,13 +23,14 @@
 import EventEmitter from 'EventEmitter';
 import uuid from 'uuid';
 import TelemetryCriterion from "./criterion/TelemetryCriterion";
-import { TRIGGER } from "./utils/constants";
-import {computeCondition} from "./utils/evaluator";
+import { evaluateResults } from './utils/evaluator';
+import { getLatestTimestamp } from './utils/time';
+import AllTelemetryCriterion from "./criterion/AllTelemetryCriterion";

 /*
 * conditionConfiguration = {
 *   id: uuid,
-*   trigger: 'any'/'all',
+*   trigger: 'any'/'all'/'not','xor',
 *   criteria: [
 *       {
 *           telemetry: '',
@@ -55,24 +56,38 @@ export default class ConditionClass extends EventEmitter {
        this.conditionManager = conditionManager;
        this.id = conditionConfiguration.id;
        this.criteria = [];
-        this.criteriaResults = {};
        this.result = undefined;
-        this.latestTimestamp = {};
-
+        this.timeSystems = this.openmct.time.getAllTimeSystems();
        if (conditionConfiguration.configuration.criteria) {
            this.createCriteria(conditionConfiguration.configuration.criteria);
        }
        this.trigger = conditionConfiguration.configuration.trigger;
-        this.conditionManager.on('broadcastTelemetry', this.handleBroadcastTelemetry, this);
    }

-    handleBroadcastTelemetry(datum) {
+    getResult(datum) {
        if (!datum || !datum.id) {
            console.log('no data received');
            return;
        }
+
        this.criteria.forEach(criterion => {
-            criterion.emit(`subscription:${datum.id}`, datum);
+            if (this.isAnyOrAllTelemetry(criterion)) {
+                criterion.getResult(datum, this.conditionManager.telemetryObjects);
+            } else {
+                criterion.getResult(datum);
+            }
+        });
+
+        this.result = evaluateResults(this.criteria.map(criterion => criterion.result), this.trigger);
+    }
+
+    isAnyOrAllTelemetry(criterion) {
+        return (criterion.telemetry && (criterion.telemetry === 'all' || criterion.telemetry === 'any'));
+    }
+
+    isTelemetryUsed(id) {
+        return this.criteria.some(criterion => {
+            return this.isAnyOrAllTelemetry(criterion) || criterion.telemetryObjectIdAsString === id;
        });
    }

@@ -84,14 +99,14 @@ export default class ConditionClass extends EventEmitter {
    updateTrigger(trigger) {
        if (this.trigger !== trigger) {
            this.trigger = trigger;
-            this.handleConditionUpdated();
        }
    }

    generateCriterion(criterionConfiguration) {
        return {
-            id: uuid(),
+            id: criterionConfiguration.id || uuid(),
            telemetry: criterionConfiguration.telemetry || '',
+            telemetryObject: this.conditionManager.telemetryObjects[this.openmct.objects.makeKeyString(criterionConfiguration.telemetry)],
            operation: criterionConfiguration.operation || '',
            input: criterionConfiguration.input === undefined ? [] : criterionConfiguration.input,
            metadata: criterionConfiguration.metadata || ''
@@ -109,14 +124,24 @@ export default class ConditionClass extends EventEmitter {
        this.createCriteria(criterionConfigurations);
    }

+    updateTelemetry() {
+        this.criteria.forEach((criterion) => {
+            criterion.updateTelemetry(this.conditionManager.telemetryObjects);
+        });
+    }
+
    /**
     *  adds criterion to the condition.
     */
    addCriterion(criterionConfiguration) {
+        let criterion;
        let criterionConfigurationWithId = this.generateCriterion(criterionConfiguration || null);
-        let criterion = new TelemetryCriterion(criterionConfigurationWithId, this.openmct);
+        if (criterionConfiguration.telemetry && (criterionConfiguration.telemetry === 'any' || criterionConfiguration.telemetry === 'all')) {
+            criterion = new AllTelemetryCriterion(criterionConfigurationWithId, this.openmct);
+        } else {
+            criterion = new TelemetryCriterion(criterionConfigurationWithId, this.openmct);
+        }
        criterion.on('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
-        criterion.on('criterionResultUpdated', (obj) => this.handleCriterionResult(obj));
        if (!this.criteria) {
            this.criteria = [];
        }
@@ -145,22 +170,11 @@ export default class ConditionClass extends EventEmitter {
            const newCriterionConfiguration = this.generateCriterion(criterionConfiguration);
            let newCriterion = new TelemetryCriterion(newCriterionConfiguration, this.openmct);
            newCriterion.on('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
-            newCriterion.on('criterionResultUpdated', (obj) => this.handleCriterionResult(obj));

            let criterion = found.item;
            criterion.unsubscribe();
            criterion.off('criterionUpdated', (obj) => this.handleCriterionUpdated(obj));
-            criterion.off('criterionResultUpdated', (obj) => this.handleCriterionResult(obj));
            this.criteria.splice(found.index, 1, newCriterion);
-            if (this.criteriaResults[criterion.id] !== undefined) {
-                delete this.criteriaResults[criterion.id];
-            }
-        }
-    }
-
-    removeCriterion(id) {
-        if (this.destroyCriterion(id)) {
-            this.handleConditionUpdated();
        }
    }

@@ -168,15 +182,12 @@ export default class ConditionClass extends EventEmitter {
        let found = this.findCriterion(id);
        if (found) {
            let criterion = found.item;
-            criterion.destroy();
-            // TODO this is passing the wrong args
-            criterion.off('criterionUpdated', (result) => {
-                this.handleCriterionUpdated(id, result);
+            criterion.off('criterionUpdated', (obj) => {
+                this.handleCriterionUpdated(obj);
            });
+            criterion.destroy();
            this.criteria.splice(found.index, 1);
-            if (this.criteriaResults[criterion.id] !== undefined) {
-                delete this.criteriaResults[criterion.id];
-            }
+
            return true;
        }
        return false;
@@ -186,58 +197,40 @@ export default class ConditionClass extends EventEmitter {
        let found = this.findCriterion(criterion.id);
        if (found) {
            this.criteria[found.index] = criterion.data;
-            // TODO nothing is listening to this
-            this.emitEvent('conditionUpdated', {
-                trigger: this.trigger,
-                criteria: this.criteria
-            });
        }
    }

-    updateCriteriaResults(eventData) {
-        const id = eventData.id;
-
-        if (this.findCriterion(id)) {
-            this.criteriaResults[id] = eventData.data.result;
-        }
-    }
-
-    handleCriterionResult(eventData) {
-        this.updateCriteriaResults(eventData);
-        this.handleConditionUpdated(eventData.data);
-    }
-
    requestLADConditionResult() {
-        const criteriaResults = this.criteria
-            .map(criterion => criterion.requestLAD());
+        let latestTimestamp;
+        let criteriaResults = {};
+        const criteriaRequests = this.criteria
+            .map(criterion => criterion.requestLAD(this.conditionManager.telemetryObjects));

-        return Promise.all(criteriaResults)
+        return Promise.all(criteriaRequests)
            .then(results => {
-                results.forEach(result => {
-                    this.updateCriteriaResults(result);
-                    this.latestTimestamp = this.getLatestTimestamp(this.latestTimestamp, result.data)
+                results.forEach(resultObj => {
+                    const { id, data, data: { result } } = resultObj;
+                    if (this.findCriterion(id)) {
+                        criteriaResults[id] = !!result;
+                    }
+                    latestTimestamp = getLatestTimestamp(
+                        latestTimestamp,
+                        data,
+                        this.timeSystems,
+                        this.openmct.time.timeSystem()
+                    );
                });
-                this.evaluate();
-
                return {
                    id: this.id,
-                    data: Object.assign({}, this.latestTimestamp, { result: this.result })
-                }
+                    data: Object.assign(
+                        {},
+                        latestTimestamp,
+                        { result: evaluateResults(Object.values(criteriaResults), this.trigger) }
+                    )
+                };
            });
    }

-    getTelemetrySubscriptions() {
-        return this.criteria.map(criterion => criterion.telemetryObjectIdAsString);
-    }
-
-    handleConditionUpdated(datum) {
-        // trigger an updated event so that consumers can react accordingly
-        this.evaluate();
-        this.emitEvent('conditionResultUpdated',
-            Object.assign({}, datum, { result: this.result })
-        );
-    }
-
    getCriteria() {
        return this.criteria;
    }
@@ -251,35 +244,7 @@ export default class ConditionClass extends EventEmitter {
        return success;
    }

-    evaluate() {
-        this.result = computeCondition(this.criteriaResults, this.trigger === TRIGGER.ALL);
-    }
-
-    getLatestTimestamp(current, compare) {
-        const timestamp = Object.assign({}, current);
-
-        this.openmct.time.getAllTimeSystems().forEach(timeSystem => {
-            if (!timestamp[timeSystem.key]
-                || compare[timeSystem.key] > timestamp[timeSystem.key]
-            ) {
-                timestamp[timeSystem.key] = compare[timeSystem.key];
-            }
-        });
-        return timestamp;
-    }
-
-    emitEvent(eventName, data) {
-        this.emit(eventName, {
-            id: this.id,
-            data: data
-        });
-    }
-
    destroy() {
-        this.conditionManager.off('broadcastTelemetry', this.handleBroadcastTelemetry, this);
-        if (typeof this.stopObservingForChanges === 'function') {
-            this.stopObservingForChanges();
-        }
        this.destroyCriteria();
    }
 }
--- a/src/plugins/condition/ConditionManager.js
+++ b/src/plugins/condition/ConditionManager.js
@@ -21,6 +21,7 @@
 *****************************************************************************/

 import Condition from "./Condition";
+import { getLatestTimestamp } from './utils/time';
 import uuid from "uuid";
 import EventEmitter from 'EventEmitter';

@@ -29,18 +30,20 @@ export default class ConditionManager extends EventEmitter {
        super();
        this.openmct = openmct;
        this.conditionSetDomainObject = conditionSetDomainObject;
-        this.timeAPI = this.openmct.time;
-        this.latestTimestamp = {};
+        this.timeSystems = this.openmct.time.getAllTimeSystems();
        this.composition = this.openmct.composition.get(conditionSetDomainObject);
        this.composition.on('add', this.subscribeToTelemetry, this);
        this.composition.on('remove', this.unsubscribeFromTelemetry, this);
        this.compositionLoad = this.composition.load();
        this.subscriptions = {};
+        this.telemetryObjects = {};
+        this.testData = {conditionTestData: [], applied: false};
        this.initialize();

        this.stopObservingForChanges = this.openmct.objects.observe(this.conditionSetDomainObject, '*', (newDomainObject) => {
            this.conditionSetDomainObject = newDomainObject;
        });
+
    }

    subscribeToTelemetry(endpoint) {
@@ -49,11 +52,12 @@ export default class ConditionManager extends EventEmitter {
            console.log('subscription already exists');
            return;
        }
-
+        this.telemetryObjects[id] = Object.assign({}, endpoint, {telemetryMetaData: this.openmct.telemetry.getMetadata(endpoint).valueMetadatas});
        this.subscriptions[id] = this.openmct.telemetry.subscribe(
            endpoint,
-            this.broadcastTelemetry.bind(this, id)
+            this.telemetryReceived.bind(this, endpoint)
        );
+        this.updateConditionTelemetry();
    }

    unsubscribeFromTelemetry(endpointIdentifier) {
@@ -65,10 +69,11 @@ export default class ConditionManager extends EventEmitter {

        this.subscriptions[id]();
        delete this.subscriptions[id];
+        delete this.telemetryObjects[id];
+        this.removeConditionTelemetry();
    }

    initialize() {
-        this.conditionResults = {};
        this.conditionClassCollection = [];
        if (this.conditionSetDomainObject.configuration.conditionCollection.length) {
            this.conditionSetDomainObject.configuration.conditionCollection.forEach((conditionConfiguration, index) => {
@@ -77,6 +82,34 @@ export default class ConditionManager extends EventEmitter {
        }
    }

+    updateConditionTelemetry() {
+        this.conditionClassCollection.forEach((condition) => condition.updateTelemetry());
+    }
+
+    removeConditionTelemetry() {
+        let conditionsChanged = false;
+        this.conditionSetDomainObject.configuration.conditionCollection.forEach((conditionConfiguration) => {
+            conditionConfiguration.configuration.criteria.forEach((criterion, index) => {
+                const isAnyAllTelemetry = criterion.telemetry && (criterion.telemetry === 'any' || criterion.telemetry === 'all');
+                if (!isAnyAllTelemetry) {
+                    const found = Object.values(this.telemetryObjects).find((telemetryObject) => {
+                        return this.openmct.objects.areIdsEqual(telemetryObject.identifier, criterion.telemetry);
+                    });
+                    if (!found) {
+                        criterion.telemetry = '';
+                        criterion.metadata = '';
+                        criterion.input = [];
+                        criterion.operation = '';
+                        conditionsChanged = true;
+                    }
+                }
+            });
+        });
+        if (conditionsChanged) {
+            this.persistConditions();
+        }
+    }
+
    updateCondition(conditionConfiguration, index) {
        let condition = this.conditionClassCollection[index];
        condition.update(conditionConfiguration);
@@ -86,7 +119,6 @@ export default class ConditionManager extends EventEmitter {

    initCondition(conditionConfiguration, index) {
        let condition = new Condition(conditionConfiguration, this.openmct, this);
-        condition.on('conditionResultUpdated', this.handleConditionResult.bind(this));
        if (index !== undefined) {
            this.conditionClassCollection.splice(index + 1, 0, condition);
        } else {
@@ -113,6 +145,7 @@ export default class ConditionManager extends EventEmitter {
                    output: 'false',
                    trigger: 'all',
                    criteria: [{
+                        id: uuid(),
                        telemetry: '',
                        operation: '',
                        input: [],
@@ -131,11 +164,13 @@ export default class ConditionManager extends EventEmitter {
    }

    cloneCondition(conditionConfiguration, index) {
-        this.createAndSaveCondition(index, conditionConfiguration);
+        let clonedConfig = JSON.parse(JSON.stringify(conditionConfiguration));
+        clonedConfig.configuration.criteria.forEach((criterion) => criterion.id = uuid());
+        this.createAndSaveCondition(index, clonedConfig);
    }

    createAndSaveCondition(index, conditionConfiguration) {
-        let newCondition = this.createCondition(conditionConfiguration);
+        const newCondition = this.createCondition(conditionConfiguration);
        if (index !== undefined) {
            this.conditionSetDomainObject.configuration.conditionCollection.splice(index + 1, 0, newCondition);
        } else {
@@ -147,22 +182,16 @@ export default class ConditionManager extends EventEmitter {

    removeCondition(index) {
        let condition = this.conditionClassCollection[index];
-        condition.destroyCriteria();
-        condition.off('conditionResultUpdated', this.handleConditionResult.bind(this));
+        condition.destroy();
        this.conditionClassCollection.splice(index, 1);
        this.conditionSetDomainObject.configuration.conditionCollection.splice(index, 1);
-        if (this.conditionResults[condition.id] !== undefined) {
-            delete this.conditionResults[condition.id];
-        }
        this.persistConditions();
-        this.handleConditionResult();
    }

    findConditionById(id) {
        return this.conditionClassCollection.find(conditionClass => conditionClass.id === id);
    }

-    //this.$set(this.conditionClassCollection, reorderEvent.newIndex, oldConditions[reorderEvent.oldIndex]);
    reorderConditions(reorderPlan) {
        let oldConditions = Array.from(this.conditionSetDomainObject.configuration.conditionCollection);
        let newCollection = [];
@@ -179,7 +208,23 @@ export default class ConditionManager extends EventEmitter {
        let currentCondition = conditionCollection[conditionCollection.length-1];

        for (let i = 0; i < conditionCollection.length - 1; i++) {
-            if (this.conditionResults[conditionCollection[i].id]) {
+            const condition = this.findConditionById(conditionCollection[i].id)
+            if (condition.result) {
+                //first condition to be true wins
+                currentCondition = conditionCollection[i];
+                break;
+            }
+        }
+
+        return currentCondition;
+    }
+
+    getCurrentConditionLAD(conditionResults) {
+        const conditionCollection = this.conditionSetDomainObject.configuration.conditionCollection;
+        let currentCondition = conditionCollection[conditionCollection.length-1];
+
+        for (let i = 0; i < conditionCollection.length - 1; i++) {
+            if (conditionResults[conditionCollection[i].id]) {
                //first condition to be true wins
                currentCondition = conditionCollection[i];
                break;
@@ -188,24 +233,79 @@ export default class ConditionManager extends EventEmitter {
        return currentCondition;
    }

-    updateConditionResults(resultObj) {
-        if (!resultObj) {
+    requestLADConditionSetOutput() {
+        if (!this.conditionClassCollection.length) {
+            return Promise.resolve([]);
+        }
+
+        return this.compositionLoad.then(() => {
+            let latestTimestamp;
+            let conditionResults = {};
+            const conditionRequests = this.conditionClassCollection
+                .map(condition => condition.requestLADConditionResult());
+
+            return Promise.all(conditionRequests)
+                .then((results) => {
+                    results.forEach(resultObj => {
+                        const { id, data, data: { result } } = resultObj;
+                        if (this.findConditionById(id)) {
+                            conditionResults[id] = !!result;
+                        }
+                        latestTimestamp = getLatestTimestamp(
+                            latestTimestamp,
+                            data,
+                            this.timeSystems,
+                            this.openmct.time.timeSystem()
+                        );
+                    });
+
+                    if (!Object.values(latestTimestamp).some(timeSystem => timeSystem)) {
+                        return [];
+                    }
+
+                    const currentCondition = this.getCurrentConditionLAD(conditionResults);
+                    const currentOutput = Object.assign(
+                        {
+                            output: currentCondition.configuration.output,
+                            id: this.conditionSetDomainObject.identifier,
+                            conditionId: currentCondition.id
+                        },
+                        latestTimestamp
+                    );
+
+                    return [currentOutput];
+                });
+        });
+    }
+
+    isTelemetryUsed(endpoint) {
+        const id = this.openmct.objects.makeKeyString(endpoint.identifier);
+
+        for(const condition of this.conditionClassCollection) {
+            if (condition.isTelemetryUsed(id)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    telemetryReceived(endpoint, datum) {
+        if (!this.isTelemetryUsed(endpoint)) {
            return;
        }

-        const id = resultObj.id;
+        const normalizedDatum = this.createNormalizedDatum(datum, endpoint);
+        const timeSystemKey = this.openmct.time.timeSystem().key;
+        let timestamp = {};
+        timestamp[timeSystemKey] = normalizedDatum[timeSystemKey];

-        if (this.findConditionById(id)) {
-            this.conditionResults[id] = resultObj.data.result;
-        }
+        this.conditionClassCollection.forEach(condition => {
+            condition.getResult(normalizedDatum);
+        });

-        this.updateTimestamp(resultObj.data);
-    }
-
-    handleConditionResult(resultObj) {
-        // update conditions results and then calculate the current condition
-        this.updateConditionResults(resultObj);
        const currentCondition = this.getCurrentCondition();
+
        this.emit('conditionSetResultUpdated',
            Object.assign(
                {
@@ -213,49 +313,41 @@ export default class ConditionManager extends EventEmitter {
                    id: this.conditionSetDomainObject.identifier,
                    conditionId: currentCondition.id
                },
-                this.latestTimestamp
+                timestamp
            )
        )
    }

-    updateTimestamp(timestamp) {
-        this.timeAPI.getAllTimeSystems().forEach(timeSystem => {
-            if (!this.latestTimestamp[timeSystem.key]
-                || timestamp[timeSystem.key] > this.latestTimestamp[timeSystem.key]
-            ) {
-                this.latestTimestamp[timeSystem.key] = timestamp[timeSystem.key];
+    getTestData(metadatum) {
+        let data = undefined;
+        if (this.testData.applied) {
+            const found = this.testData.conditionTestInputs.find((testInput) => (testInput.metadata === metadatum.source));
+            if (found) {
+                data = found.value;
            }
-        });
-    }
-
-    requestLADConditionSetOutput() {
-        if (!this.conditionClassCollection.length || this.conditionClassCollection.length === 1) {
-            return Promise.resolve([]);
        }
-
-        return this.compositionLoad.then(() => {
-            const ladConditionResults = this.conditionClassCollection
-                .map(condition => condition.requestLADConditionResult());
-
-            return Promise.all(ladConditionResults)
-                .then((results) => {
-                    results.forEach(resultObj => { this.updateConditionResults(resultObj); });
-                    const currentCondition = this.getCurrentCondition();
-
-                    return Object.assign(
-                        {
-                            output: currentCondition.configuration.output,
-                            id: this.conditionSetDomainObject.identifier,
-                            conditionId: currentCondition.id
-                        },
-                        this.latestTimestamp
-                    );
-                });
-        });
+        return data;
    }

-    broadcastTelemetry(id, datum) {
-        this.emit(`broadcastTelemetry`, Object.assign({}, datum, {id: id}));
+    createNormalizedDatum(telemetryDatum, endpoint) {
+        const id = this.openmct.objects.makeKeyString(endpoint.identifier);
+        const metadata = this.openmct.telemetry.getMetadata(endpoint).valueMetadatas;
+
+        const normalizedDatum = Object.values(metadata).reduce((datum, metadatum) => {
+            const testValue = this.getTestData(metadatum);
+            const formatter = this.openmct.telemetry.getValueFormatter(metadatum);
+            datum[metadatum.key] = testValue !== undefined ?  formatter.parse(testValue) : formatter.parse(telemetryDatum[metadatum.source]);
+            return datum;
+        }, {});
+
+        normalizedDatum.id = id;
+
+        return normalizedDatum;
+    }
+
+    updateTestData(testData) {
+        this.testData = testData;
+        this.openmct.objects.mutate(this.conditionSetDomainObject, 'configuration.conditionTestData', this.testData.conditionTestInputs);
    }

    persistConditions() {
@@ -266,14 +358,13 @@ export default class ConditionManager extends EventEmitter {
        this.composition.off('add', this.subscribeToTelemetry, this);
        this.composition.off('remove', this.unsubscribeFromTelemetry, this);
        Object.values(this.subscriptions).forEach(unsubscribe => unsubscribe());
-        this.subscriptions = undefined;
+        delete this.subscriptions;

        if(this.stopObservingForChanges) {
            this.stopObservingForChanges();
        }

        this.conditionClassCollection.forEach((condition) => {
-            condition.off('conditionResultUpdated', this.handleConditionResult);
            condition.destroy();
        })
    }
--- a/src/plugins/condition/ConditionManagerSpec.js
+++ b/src/plugins/condition/ConditionManagerSpec.js
@@ -49,6 +49,7 @@ describe('ConditionManager', () => {
    };
    let mockComposition;
    let loader;
+    let mockTimeSystems;

    function mockAngularComponents() {
        let mockInjector = jasmine.createSpyObj('$injector', ['get']);
@@ -111,10 +112,16 @@ describe('ConditionManager', () => {
        openmct.objects.observe.and.returnValue(function () {});
        openmct.objects.mutate.and.returnValue(function () {});

+        mockTimeSystems = {
+            key: 'utc'
+        };
+        openmct.time = jasmine.createSpyObj('time', ['getAllTimeSystems']);
+        openmct.time.getAllTimeSystems.and.returnValue([mockTimeSystems]);
+
        conditionMgr = new ConditionManager(conditionSetDomainObject, openmct);

        conditionMgr.on('conditionSetResultUpdated', mockListener);
-        conditionMgr.on('broadcastTelemetry', mockListener);
+        conditionMgr.on('telemetryReceived', mockListener);
    });

    it('creates a conditionCollection with a default condition', function () {
--- a/src/plugins/condition/ConditionSetCompositionPolicySpec.js
+++ b/src/plugins/condition/ConditionSetCompositionPolicySpec.js
@@ -28,7 +28,6 @@ describe('ConditionSetCompositionPolicy', () => {
    let testTelemetryObject;
    let openmct = {};
    let parentDomainObject;
-    let composition;

    beforeAll(function () {
        testTelemetryObject = {
@@ -57,7 +56,6 @@ describe('ConditionSetCompositionPolicy', () => {
        openmct.telemetry = jasmine.createSpyObj('telemetry', ['isTelemetryObject']);
        policy = new ConditionSetCompositionPolicy(openmct);
        parentDomainObject = {};
-        composition = {};
    });

    it('returns true for object types that are not conditionSets', function () {
--- a/src/plugins/condition/ConditionSetMetadataProvider.js
+++ b/src/plugins/condition/ConditionSetMetadataProvider.js
@@ -54,13 +54,22 @@ export default class ConditionSetMetadataProvider {
        return {
            values: this.getDomains().concat([
                {
-                    name: 'Output',
-                    key: 'output',
-                    format: 'enum',
+                    key: "state",
+                    source: "output",
+                    name: "State",
+                    format: "enum",
                    enumerations: enumerations,
                    hints: {
                        range: 1
                    }
+                },
+                {
+                    key: "output",
+                    name: "Value",
+                    format: "string",
+                    hints: {
+                        range: 2
+                    }
                }
            ])
        };
--- a/src/plugins/condition/ConditionSetTelemetryProvider.js
+++ b/src/plugins/condition/ConditionSetTelemetryProvider.js
@@ -45,7 +45,7 @@ export default class ConditionSetTelemetryProvider {

        return conditionManager.requestLADConditionSetOutput()
            .then(latestOutput => {
-                return latestOutput ? [latestOutput] : [];
+                return latestOutput;
            });
    }

@@ -77,8 +77,10 @@ export default class ConditionSetTelemetryProvider {
     * can be called manually for views that only request but do not subscribe to data
     */
    destroyConditionManager(id) {
-        this.conditionManagerPool[id].off('conditionSetResultUpdated');
-        this.conditionManagerPool[id].destroy();
-        delete this.conditionManagerPool[id];
+        if (this.conditionManagerPool[id]) {
+            this.conditionManagerPool[id].off('conditionSetResultUpdated');
+            this.conditionManagerPool[id].destroy();
+            delete this.conditionManagerPool[id];
+        }
    }
 }
--- a/src/plugins/condition/ConditionSpec.js
+++ b/src/plugins/condition/ConditionSpec.js
@@ -25,12 +25,12 @@ import {TRIGGER} from "./utils/constants";
 import TelemetryCriterion from "./criterion/TelemetryCriterion";

 let openmct = {},
-    mockListener,
    testConditionDefinition,
    testTelemetryObject,
    conditionObj,
    conditionManager,
-    mockBroadcastTelemetry;
+    mockTelemetryReceived,
+    mockTimeSystems;

 describe("The condition", function () {

@@ -38,10 +38,9 @@ describe("The condition", function () {
        conditionManager = jasmine.createSpyObj('conditionManager',
            ['on']
        );
-        mockBroadcastTelemetry = jasmine.createSpy('listener');
-        conditionManager.on('broadcastTelemetry', mockBroadcastTelemetry);
+        mockTelemetryReceived = jasmine.createSpy('listener');
+        conditionManager.on('telemetryReceived', mockTelemetryReceived);

-        mockListener = jasmine.createSpy('listener');
        testTelemetryObject = {
            identifier:{ namespace: "", key: "test-object"},
            type: "test-object",
@@ -62,6 +61,9 @@ describe("The condition", function () {
                }]
            }
        };
+        conditionManager.telemetryObjects = {
+            "test-object": testTelemetryObject
+        };
        openmct.objects = jasmine.createSpyObj('objects', ['get', 'makeKeyString']);
        openmct.objects.get.and.returnValue(new Promise(function (resolve, reject) {
            resolve(testTelemetryObject);
@@ -71,6 +73,12 @@ describe("The condition", function () {
        openmct.telemetry.subscribe.and.returnValue(function () {});
        openmct.telemetry.getMetadata.and.returnValue(testTelemetryObject.telemetry.values);

+        mockTimeSystems = {
+            key: 'utc'
+        };
+        openmct.time = jasmine.createSpyObj('time', ['getAllTimeSystems']);
+        openmct.time.getAllTimeSystems.and.returnValue([mockTimeSystems]);
+
        testConditionDefinition = {
            id: '123-456',
            configuration: {
@@ -94,8 +102,6 @@ describe("The condition", function () {
            openmct,
            conditionManager
        );
-
-        conditionObj.on('conditionUpdated', mockListener);
    });

    it("generates criteria with the correct properties", function () {
@@ -109,7 +115,6 @@ describe("The condition", function () {
    });

    it("initializes with an id", function () {
-        console.log(conditionObj);
        expect(conditionObj.id).toBeDefined();
    });

--- a/src/plugins/condition/StyleRuleManager.js
+++ b/src/plugins/condition/StyleRuleManager.js
@@ -48,6 +48,12 @@ export default class StyleRuleManager extends EventEmitter {
            this.stopProvidingTelemetry();
        }
        this.openmct.objects.get(this.conditionSetIdentifier).then((conditionSetDomainObject) => {
+            this.openmct.telemetry.request(conditionSetDomainObject)
+                .then(output => {
+                    if (output && output.length) {
+                        this.handleConditionSetResultUpdated(output[0]);
+                    }
+                });
            this.stopProvidingTelemetry = this.openmct.telemetry.subscribe(conditionSetDomainObject, output => this.handleConditionSetResultUpdated(output));
        });
    }
@@ -58,7 +64,7 @@ export default class StyleRuleManager extends EventEmitter {
            this.destroy();
        } else {
            let isNewConditionSet = !this.conditionSetIdentifier ||
-                                    this.openmct.objects.areIdsEqual(this.conditionSetIdentifier, styleConfiguration.conditionSetIdentifier);
+                                    !this.openmct.objects.areIdsEqual(this.conditionSetIdentifier, styleConfiguration.conditionSetIdentifier);
            this.initialize(styleConfiguration);
            //Only resubscribe if the conditionSet has changed.
            if (isNewConditionSet) {
@@ -103,7 +109,7 @@ export default class StyleRuleManager extends EventEmitter {
        } else {
            if (this.currentStyle) {
                Object.keys(this.currentStyle).forEach(key => {
-                    this.currentStyle[key] = 'transparent';
+                    this.currentStyle[key] = '__no_value';
                });
            }
        }
@@ -115,6 +121,7 @@ export default class StyleRuleManager extends EventEmitter {
        if (this.stopProvidingTelemetry) {
            this.stopProvidingTelemetry();
        }
+        delete this.stopProvidingTelemetry;
        this.conditionSetIdentifier = undefined;
    }

--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -21,159 +21,167 @@
 *****************************************************************************/

 <template>
-<div v-if="isEditing"
-     class="c-condition c-condition--edit js-condition-drag-wrapper"
+<div class="c-condition-h"
+     :class="{ 'is-drag-target': draggingOver }"
+     @dragover.prevent
+     @drop.prevent="dropCondition($event, conditionIndex)"
+     @dragenter="dragEnter($event, conditionIndex)"
+     @dragleave="dragLeave($event, conditionIndex)"
 >
-    <!-- Edit view -->
-    <div class="c-condition__header">
-        <span class="c-condition__drag-grippy c-grippy c-grippy--vertical-drag"
-              title="Drag to reorder conditions"
-              :class="[{ 'is-enabled': !condition.isDefault }, { 'hide-nice': condition.isDefault }]"
-              :draggable="!condition.isDefault"
-              @dragstart="dragStart"
-              @dragstop="dragStop"
-              @dragover.stop
-        ></span>
-
-        <span class="c-condition__disclosure c-disclosure-triangle c-tree__item__view-control is-enabled"
-              :class="{ 'c-disclosure-triangle--expanded': expanded }"
-              @click="expanded = !expanded"
-        ></span>
-
-        <span class="c-condition__name">{{ condition.configuration.name }}</span>
-        <!-- TODO: description should be derived from criteria -->
-        <span class="c-condition__summary">
-            <template v-if="!canEvaluateCriteria">
-                Define criteria
-            </template>
-            <span v-else>
-                <condition-description :show-label="false"
-                                       :condition="condition"
-                />
-            </span>
-        </span>
-
-        <div class="c-condition__buttons">
-            <button v-if="!condition.isDefault"
-                    class="c-click-icon c-condition__duplicate-button icon-duplicate"
-                    title="Duplicate this condition"
-                    @click="cloneCondition"
-            ></button>
-
-            <button v-if="!condition.isDefault"
-                    class="c-click-icon c-condition__delete-button icon-trash"
-                    title="Delete this condition"
-                    @click="removeCondition"
-            ></button>
-        </div>
-    </div>
-    <div v-if="expanded"
-         class="c-condition__definition c-cdef"
+    <div class="c-condition-h__drop-target"></div>
+    <div v-if="isEditing"
+         class="c-condition c-condition--edit"
    >
-        <span class="c-cdef__separator c-row-separator"></span>
-        <span class="c-cdef__label">Condition Name</span>
-        <span class="c-cdef__controls">
-            <input v-model="condition.configuration.name"
-                   class="t-condition-input__name"
-                   type="text"
-                   @blur="persist"
-            >
-        </span>
+        <!-- Edit view -->
+        <div class="c-condition__header">
+            <span class="c-condition__drag-grippy c-grippy c-grippy--vertical-drag"
+                  title="Drag to reorder conditions"
+                  :class="[{ 'is-enabled': !condition.isDefault }, { 'hide-nice': condition.isDefault }]"
+                  :draggable="!condition.isDefault"
+                  @dragstart="dragStart"
+                  @dragend="dragEnd"
+            ></span>

-        <span class="c-cdef__label">Output</span>
-        <span class="c-cdef__controls">
-            <span class="c-cdef__control">
-                <select v-model="selectedOutputSelection"
-                        @change="setOutputValue"
-                >
-                    <option value="">- Select Output -</option>
-                    <option v-for="option in outputOptions"
-                            :key="option"
-                            :value="option"
-                    >
-                        {{ initCap(option) }}
-                    </option>
-                </select>
-            </span>
-            <span class="c-cdef__control">
-                <input v-if="selectedOutputSelection === outputOptions[2]"
-                       v-model="condition.configuration.output"
-                       class="t-condition-name-input"
-                       type="text"
-                       @blur="persist"
-                >
-            </span>
-        </span>
+            <span class="c-condition__disclosure c-disclosure-triangle c-tree__item__view-control is-enabled"
+                  :class="{ 'c-disclosure-triangle--expanded': expanded }"
+                  @click="expanded = !expanded"
+            ></span>

-        <div v-if="!condition.isDefault"
-             class="c-cdef__match-and-criteria"
+            <span class="c-condition__name">{{ condition.configuration.name }}</span>
+            <span class="c-condition__summary">
+                <template v-if="!canEvaluateCriteria">
+                    Define criteria
+                </template>
+                <span v-else>
+                    <condition-description :show-label="false"
+                                           :condition="condition"
+                    />
+                </span>
+            </span>
+
+            <div class="c-condition__buttons">
+                <button v-if="!condition.isDefault"
+                        class="c-click-icon c-condition__duplicate-button icon-duplicate"
+                        title="Duplicate this condition"
+                        @click="cloneCondition"
+                ></button>
+
+                <button v-if="!condition.isDefault"
+                        class="c-click-icon c-condition__delete-button icon-trash"
+                        title="Delete this condition"
+                        @click="removeCondition"
+                ></button>
+            </div>
+        </div>
+        <div v-if="expanded"
+             class="c-condition__definition c-cdef"
        >
            <span class="c-cdef__separator c-row-separator"></span>
-            <span class="c-cdef__label">Match</span>
+            <span class="c-cdef__label">Condition Name</span>
            <span class="c-cdef__controls">
-                <select v-model="condition.configuration.trigger"
-                        @change="persist"
+                <input v-model="condition.configuration.name"
+                       class="t-condition-input__name"
+                       type="text"
+                       @change="persist"
                >
-                    <option value="all">when all criteria are met</option>
-                    <option value="any">when any criteria are met</option>
-                </select>
            </span>

-            <template v-if="telemetry.length">
-                <div v-for="(criterion, index) in condition.configuration.criteria"
-                     :key="index"
-                     class="c-cdef__criteria"
-                >
-                    <Criterion :telemetry="telemetry"
-                               :criterion="criterion"
-                               :index="index"
-                               :trigger="condition.configuration.trigger"
-                               :is-default="condition.configuration.criteria.length === 1"
-                               @persist="persist"
-                    />
-                    <div class="c-cdef__criteria__buttons">
-                        <button class="c-click-icon c-cdef__criteria-duplicate-button icon-duplicate"
-                                title="Duplicate this criteria"
-                                @click="cloneCriterion(index)"
-                        ></button>
-                        <button v-if="!(condition.configuration.criteria.length === 1)"
-                                class="c-click-icon c-cdef__criteria-duplicate-button icon-trash"
-                                title="Delete this criteria"
-                                @click="removeCriterion(index)"
-                        ></button>
-                    </div>
-                </div>
-            </template>
-            <div class="c-cdef__separator c-row-separator"></div>
-            <div class="c-cdef__controls"
-                 :disabled="!telemetry.length"
+            <span class="c-cdef__label">Output</span>
+            <span class="c-cdef__controls">
+                <span class="c-cdef__control">
+                    <select v-model="selectedOutputSelection"
+                            @change="setOutputValue"
+                    >
+                        <option v-for="option in outputOptions"
+                                :key="option"
+                                :value="option"
+                        >
+                            {{ initCap(option) }}
+                        </option>
+                    </select>
+                </span>
+                <span class="c-cdef__control">
+                    <input v-if="selectedOutputSelection === outputOptions[2]"
+                           v-model="condition.configuration.output"
+                           class="t-condition-name-input"
+                           type="text"
+                           @change="persist"
+                    >
+                </span>
+            </span>
+
+            <div v-if="!condition.isDefault"
+                 class="c-cdef__match-and-criteria"
            >
-                <button
-                    class="c-cdef__add-criteria-button c-button c-button--labeled icon-plus"
-                    @click="addCriteria"
+                <span class="c-cdef__separator c-row-separator"></span>
+                <span class="c-cdef__label">Match</span>
+                <span class="c-cdef__controls">
+                    <select v-model="condition.configuration.trigger"
+                            @change="persist"
+                    >
+                        <option v-for="option in triggers"
+                                :key="option.value"
+                                :value="option.value"
+                        > {{ option.label }}</option>
+                    </select>
+                </span>
+
+                <template v-if="telemetry.length || condition.configuration.criteria.length">
+                    <div v-for="(criterion, index) in condition.configuration.criteria"
+                         :key="criterion.id"
+                         class="c-cdef__criteria"
+                    >
+                        <Criterion :telemetry="telemetry"
+                                   :criterion="criterion"
+                                   :index="index"
+                                   :trigger="condition.configuration.trigger"
+                                   :is-default="condition.configuration.criteria.length === 1"
+                                   @persist="persist"
+                        />
+                        <div class="c-cdef__criteria__buttons">
+                            <button class="c-click-icon c-cdef__criteria-duplicate-button icon-duplicate"
+                                    title="Duplicate this criteria"
+                                    @click="cloneCriterion(index)"
+                            ></button>
+                            <button v-if="!(condition.configuration.criteria.length === 1)"
+                                    class="c-click-icon c-cdef__criteria-duplicate-button icon-trash"
+                                    title="Delete this criteria"
+                                    @click="removeCriterion(index)"
+                            ></button>
+                        </div>
+                    </div>
+                </template>
+                <div class="c-cdef__separator c-row-separator"></div>
+                <div class="c-cdef__controls"
+                     :disabled="!telemetry.length"
                >
-                    <span class="c-button__label">Add Criteria</span>
-                </button>
+                    <button
+                        class="c-cdef__add-criteria-button c-button c-button--labeled icon-plus"
+                        @click="addCriteria"
+                    >
+                        <span class="c-button__label">Add Criteria</span>
+                    </button>
+                </div>
            </div>
        </div>
    </div>
-</div>
-<div v-else
-     class="c-condition c-condition--browse"
->
-    <!-- Browse view -->
-    <div class="c-condition__header">
-        <span class="c-condition__name">
-            {{ condition.configuration.name }}
-        </span>
-        <span class="c-condition__output">
-            Output: {{ condition.configuration.output }}
-        </span>
-    </div>
-    <div class="c-condition__summary">
-        <condition-description :show-label="false"
-                               :condition="condition"
-        />
+    <div v-else
+         class="c-condition c-condition--browse"
+    >
+        <!-- Browse view -->
+        <div class="c-condition__header">
+            <span class="c-condition__name">
+                {{ condition.configuration.name }}
+            </span>
+            <span class="c-condition__output">
+                Output: {{ condition.configuration.output }}
+            </span>
+        </div>
+        <div class="c-condition__summary">
+            <condition-description :show-label="false"
+                                   :condition="condition"
+            />
+        </div>
    </div>
 </div>
 </template>
@@ -181,6 +189,8 @@
 <script>
 import Criterion from './Criterion.vue';
 import ConditionDescription from "./ConditionDescription.vue";
+import { TRIGGER, TRIGGER_LABEL } from "@/plugins/condition/utils/constants";
+import uuid from 'uuid';

 export default {
    inject: ['openmct'],
@@ -205,6 +215,14 @@ export default {
            type: Array,
            required: true,
            default: () => []
+        },
+        isDragging: {
+            type: Boolean,
+            default: false
+        },
+        moveIndex: {
+            type: Number,
+            default: 0
        }
    },
    data() {
@@ -214,10 +232,23 @@ export default {
            trigger: 'all',
            selectedOutputSelection: '',
            outputOptions: ['false', 'true', 'string'],
-            criterionIndex: 0
+            criterionIndex: 0,
+            draggingOver: false,
+            isDefault: this.condition.isDefault
        };
    },
    computed: {
+        triggers() {
+            const keys = Object.keys(TRIGGER);
+            const triggerOptions = [];
+            keys.forEach((trigger) => {
+                triggerOptions.push({
+                    value: TRIGGER[trigger],
+                    label: TRIGGER_LABEL[TRIGGER[trigger]]
+                });
+            });
+            return triggerOptions;
+        },
        canEvaluateCriteria: function () {
            let criteria = this.condition.configuration.criteria;
            if (criteria.length) {
@@ -260,6 +291,7 @@ export default {
        },
        addCriteria() {
            const criteriaObject = {
+                id: uuid(),
                telemetry: '',
                operation: '',
                input: '',
@@ -270,11 +302,39 @@ export default {
        dragStart(e) {
            e.dataTransfer.setData('dragging', e.target); // required for FF to initiate drag
            e.dataTransfer.effectAllowed = "copyMove";
-            e.dataTransfer.setDragImage(e.target.closest('.js-condition-drag-wrapper'), 0, 0);
+            e.dataTransfer.setDragImage(e.target.closest('.c-condition-h'), 0, 0);
            this.$emit('setMoveIndex', this.conditionIndex);
        },
-        dragStop(e) {
-            e.dataTransfer.clearData();
+        dragEnd(event) {
+            this.dragStarted = false;
+            event.dataTransfer.clearData();
+            this.$emit('dragComplete');
+        },
+        dropCondition(event, targetIndex) {
+            if (!this.isDragging) { return }
+            if (targetIndex > this.moveIndex) { targetIndex-- } // for 'downward' move
+            if (this.isValidTarget(targetIndex)) {
+                this.dragElement = undefined;
+                this.draggingOver = false;
+                this.$emit('dropCondition', targetIndex);
+            }
+        },
+        dragEnter(event, targetIndex) {
+            if (!this.isDragging) { return }
+            if (targetIndex > this.moveIndex) { targetIndex-- } // for 'downward' move
+            if (this.isValidTarget(targetIndex)) {
+                this.dragElement = event.target.parentElement;
+                this.draggingOver = true;
+            }
+        },
+        dragLeave(event) {
+            if (event.target.parentElement === this.dragElement) {
+                this.draggingOver = false;
+                this.dragElement = undefined;
+            }
+        },
+        isValidTarget(targetIndex) {
+            return this.moveIndex !== targetIndex;
        },
        destroy() {
        },
@@ -289,16 +349,13 @@ export default {
        },
        removeCriterion(index) {
            this.condition.configuration.criteria.splice(index, 1);
-            this.persist()
+            this.persist();
        },
        cloneCriterion(index) {
-            const clonedCriterion = {...this.condition.configuration.criteria[index]};
+            const clonedCriterion = JSON.parse(JSON.stringify(this.condition.configuration.criteria[index]));
+            clonedCriterion.id = uuid();
            this.condition.configuration.criteria.splice(index + 1, 0, clonedCriterion);
-            this.persist()
-        },
-        hasTelemetry(identifier) {
-            // TODO: check parent condition.composition.hasTelemetry
-            return this.currentCriteria && identifier;
+            this.persist();
        },
        persist() {
            this.$emit('updateCondition', {
@@ -306,7 +363,7 @@ export default {
                index: this.conditionIndex
            });
        },
-        initCap: function (str) {
+        initCap(str) {
            return str.charAt(0).toUpperCase() + str.slice(1)
        }
    }
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -22,7 +22,6 @@

 <template>
 <section id="conditionCollection"
-         class="c-cs__conditions"
         :class="{ 'is-expanded': expanded }"
 >
    <div class="c-cs__header c-section__header">
@@ -53,28 +52,24 @@
            <span class="c-cs-button__label">Add Condition</span>
        </button>

-        <div class="c-cs__conditions-h">
-            <div v-for="(condition, index) in conditionCollection"
-                 :key="condition.id"
-                 class="c-condition-h"
-            >
-                <div v-if="isEditing"
-                     class="c-c__drag-ghost"
-                     @drop.prevent="dropCondition"
-                     @dragenter="dragEnter"
-                     @dragleave="dragLeave"
-                     @dragover.prevent
-                ></div>
-                <Condition :condition="condition"
-                           :condition-index="index"
-                           :telemetry="telemetryObjs"
-                           :is-editing="isEditing"
-                           @updateCondition="updateCondition"
-                           @removeCondition="removeCondition"
-                           @cloneCondition="cloneCondition"
-                           @setMoveIndex="setMoveIndex"
-                />
-            </div>
+        <div class="c-cs__conditions-h"
+             :class="{ 'is-active-dragging': isDragging }"
+        >
+            <Condition v-for="(condition, index) in conditionCollection"
+                       :key="condition.id"
+                       :condition="condition"
+                       :condition-index="index"
+                       :telemetry="telemetryObjs"
+                       :is-editing="isEditing"
+                       :move-index="moveIndex"
+                       :is-dragging="isDragging"
+                       @updateCondition="updateCondition"
+                       @removeCondition="removeCondition"
+                       @cloneCondition="cloneCondition"
+                       @setMoveIndex="setMoveIndex"
+                       @dragComplete="dragComplete"
+                       @dropCondition="dropCondition"
+            />
        </div>
    </div>
 </section>
@@ -90,7 +85,17 @@ export default {
        Condition
    },
    props: {
-        isEditing: Boolean
+        isEditing: Boolean,
+        testData: {
+            type: Object,
+            required: true,
+            default: () => {
+                return {
+                    applied: false,
+                    conditionTestInputs: []
+                }
+            }
+        }
    },
    data() {
        return {
@@ -99,10 +104,23 @@ export default {
            conditionResults: {},
            conditions: [],
            telemetryObjs: [],
-            moveIndex: Number,
-            isDragging: false
+            moveIndex: undefined,
+            isDragging: false,
+            defaultOutput: undefined,
+            dragCounter: 0
        };
    },
+    watch: {
+        defaultOutput(newOutput, oldOutput) {
+            this.$emit('updateDefaultOutput', newOutput);
+        },
+        testData: {
+            handler() {
+                this.updateTestData();
+            },
+            deep: true
+        }
+    },
    destroyed() {
        this.composition.off('add', this.addTelemetryObject);
        this.composition.off('remove', this.removeTelemetryObject);
@@ -123,6 +141,7 @@ export default {
        this.observeForChanges();
        this.conditionManager = new ConditionManager(this.domainObject, this.openmct);
        this.conditionManager.on('conditionSetResultUpdated', this.handleConditionSetResultUpdated);
+        this.updateDefaultCondition();
    },
    methods: {
        handleConditionSetResultUpdated(data) {
@@ -131,15 +150,19 @@ export default {
        observeForChanges() {
            this.stopObservingForChanges = this.openmct.objects.observe(this.domainObject, 'configuration.conditionCollection', (newConditionCollection) => {
                this.conditionCollection = newConditionCollection;
+                this.updateDefaultCondition();
            });
        },
+        updateDefaultCondition() {
+            const defaultCondition = this.domainObject.configuration.conditionCollection
+                .find(conditionConfiguration => conditionConfiguration.isDefault);
+            this.defaultOutput = defaultCondition.configuration.output;
+        },
        setMoveIndex(index) {
            this.moveIndex = index;
            this.isDragging = true;
        },
-        dropCondition(e) {
-            let targetIndex = Array.from(document.querySelectorAll('.c-c__drag-ghost')).indexOf(e.target);
-            if (targetIndex > this.moveIndex) { targetIndex-- } // for 'downward' move
+        dropCondition(targetIndex) {
            const oldIndexArr = Object.keys(this.conditionCollection);
            const move = function (arr, old_index, new_index) {
                while (old_index < 0) {
@@ -165,22 +188,13 @@ export default {
            }

            this.reorder(reorderPlan);
-
-            e.target.classList.remove("dragging");
+        },
+        dragComplete() {
            this.isDragging = false;
        },
-        dragEnter(e) {
-            if (!this.isDragging) { return }
-            let targetIndex = Array.from(document.querySelectorAll('.c-c__drag-ghost')).indexOf(e.target);
-            if (targetIndex > this.moveIndex) { targetIndex-- } // for 'downward' move
-            if (this.moveIndex === targetIndex) { return }
-            e.target.classList.add("dragging");
-        },
-        dragLeave(e) {
-            e.target.classList.remove("dragging");
-        },
        addTelemetryObject(domainObject) {
            this.telemetryObjs.push(domainObject);
+            this.$emit('telemetryUpdated', this.telemetryObjs);
        },
        removeTelemetryObject(identifier) {
            let index = _.findIndex(this.telemetryObjs, (obj) => {
@@ -206,6 +220,9 @@ export default {
        },
        cloneCondition(data) {
            this.conditionManager.cloneCondition(data.condition, data.index);
+        },
+        updateTestData() {
+            this.conditionManager.updateTestData(this.testData);
        }
    }
 }
--- a/src/plugins/condition/components/ConditionDescription.vue
+++ b/src/plugins/condition/components/ConditionDescription.vue
@@ -77,9 +77,22 @@ export default {
        this.getConditionDescription();
    },
    methods: {
+        getTriggerDescription(trigger) {
+            let description = '';
+            switch(trigger) {
+            case TRIGGER.ANY:
+            case TRIGGER.XOR:
+                description = 'or';
+                break;
+            case TRIGGER.ALL:
+            case TRIGGER.NOT: description = 'and';
+                break;
+            }
+            return description;
+        },
        getConditionDescription() {
            if (this.condition) {
-                this.triggerDescription = this.condition.configuration.trigger === TRIGGER.ANY ? ' or ' : ' and ';
+                this.triggerDescription =  this.getTriggerDescription(this.condition.configuration.trigger);
                this.criterionDescriptions = [];
                this.condition.configuration.criteria.forEach((criterion, index) => {
                    this.getCriterionDescription(criterion, index);
@@ -92,27 +105,45 @@ export default {
            }
        },
        getCriterionDescription(criterion, index) {
-            this.openmct.objects.get(criterion.telemetry).then((telemetryObject) => {
-                if (telemetryObject.type === 'unknown') {
-                    let description = `Unknown ${criterion.metadata} ${this.getOperatorText(criterion.operation, criterion.input)}`;
-                    this.criterionDescriptions.splice(index, 0, description);
-                } else {
-                    let metadataValue = criterion.metadata;
-                    if (criterion.metadata) {
-                        this.telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
-                        const metadataObj = this.telemetryMetadata.valueMetadatas.find((metadata) => metadata.key === criterion.metadata);
-                        if (metadataObj && metadataObj.name) {
-                            metadataValue = metadataObj.name;
+            if (!criterion.telemetry) {
+                let description = `Unknown ${criterion.metadata} ${this.getOperatorText(criterion.operation, criterion.input)}`;
+                this.criterionDescriptions.splice(index, 0, description);
+            } else if (criterion.telemetry === 'all' || criterion.telemetry === 'any') {
+                const telemetryDescription = criterion.telemetry === 'all' ? 'All telemetry' : 'Any telemetry';
+                let description = `${telemetryDescription} ${criterion.metadata} ${this.getOperatorText(criterion.operation, criterion.input)}`;
+                this.criterionDescriptions.splice(index, 0, description);
+            } else {
+                this.openmct.objects.get(criterion.telemetry).then((telemetryObject) => {
+                    if (telemetryObject.type === 'unknown') {
+                        let description = `Unknown ${criterion.metadata} ${this.getOperatorText(criterion.operation, criterion.input)}`;
+                        this.criterionDescriptions.splice(index, 0, description);
+                    } else {
+                        let metadataValue = criterion.metadata;
+                        let inputValue = criterion.input;
+                        if (criterion.metadata) {
+                            this.telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
+
+                            const metadataObj = this.telemetryMetadata.valueMetadatas.find((metadata) => metadata.key === criterion.metadata);
+                            if (metadataObj) {
+                                if (metadataObj.name) {
+                                    metadataValue = metadataObj.name;
+                                }
+                                if(metadataObj.enumerations && inputValue.length) {
+                                    if (metadataObj.enumerations[inputValue[0]] && metadataObj.enumerations[inputValue[0]].string) {
+                                        inputValue = [metadataObj.enumerations[inputValue[0]].string];
+                                    }
+                                }
+                            }
+                        }
+                        let description = `${telemetryObject.name} ${metadataValue} ${this.getOperatorText(criterion.operation, inputValue)}`;
+                        if (this.criterionDescriptions[index]) {
+                            this.criterionDescriptions[index] = description;
+                        } else {
+                            this.criterionDescriptions.splice(index, 0, description);
                        }
                    }
-                    let description = `${telemetryObject.name} ${metadataValue} ${this.getOperatorText(criterion.operation, criterion.input)}`;
-                    if (this.criterionDescriptions[index]) {
-                        this.criterionDescriptions[index] = description;
-                    } else {
-                        this.criterionDescriptions.splice(index, 0, description);
-                    }
-                }
-            });
+                });
+            }
        },
        getOperatorText(operationName, values) {
            const found = OPERATIONS.find((operation) => operation.name === operationName);
--- a/src/plugins/condition/components/ConditionError.vue
+++ b/src/plugins/condition/components/ConditionError.vue
@@ -66,14 +66,23 @@ export default {
            }
        },
        getCriterionErrors(criterion, index) {
-            this.openmct.objects.get(criterion.telemetry).then((telemetryObject) => {
-                if (telemetryObject.type === 'unknown') {
-                    this.conditionErrors.push({
-                        message: ERROR.TELEMETRY_NOT_FOUND,
-                        additionalInfo: criterion.telemetry ? `Key: ${this.openmct.objects.makeKeyString(criterion.telemetry)}` : ''
+            if (!criterion.telemetry) {
+                this.conditionErrors.push({
+                    message: ERROR.TELEMETRY_NOT_FOUND,
+                    additionalInfo: ''
+                });
+            } else {
+                if (criterion.telemetry !== 'all' && criterion.telemetry !== 'any') {
+                    this.openmct.objects.get(criterion.telemetry).then((telemetryObject) => {
+                        if (telemetryObject.type === 'unknown') {
+                            this.conditionErrors.push({
+                                message: ERROR.TELEMETRY_NOT_FOUND,
+                                additionalInfo: criterion.telemetry ? `Key: ${this.openmct.objects.makeKeyString(criterion.telemetry)}` : ''
+                            });
+                        }
                    });
                }
-            });
+            }
        }
    }
 }
--- a/src/plugins/condition/components/ConditionSet.vue
+++ b/src/plugins/condition/components/ConditionSet.vue
@@ -23,21 +23,33 @@
 <template>
 <div class="c-cs">
    <section class="c-cs__current-output c-section">
-        <div class="c-cs__header c-section__header">
-            <span class="c-cs__header-label c-section__label">Current Output</span>
-        </div>
        <div class="c-cs__content c-cs__current-output-value">
-            <template v-if="currentConditionOutput">
-                {{ currentConditionOutput }}
-            </template>
-            <template v-else>No output selected</template>
+            <span class="c-cs__current-output-value__label">Current Output</span>
+            <span class="c-cs__current-output-value__value">
+                <template v-if="currentConditionOutput">
+                    {{ currentConditionOutput }}
+                </template>
+                <template v-else>
+                    {{ defaultConditionOutput }}
+                </template>
+            </span>
        </div>
    </section>
-    <TestData :is-editing="isEditing" />
-    <ConditionCollection
-        :is-editing="isEditing"
-        @conditionSetResultUpdated="updateCurrentOutput"
-    />
+    <div class="c-cs__test-data-and-conditions-w">
+        <TestData class="c-cs__test-data"
+                  :is-editing="isEditing"
+                  :test-data="testData"
+                  :telemetry="telemetryObjs"
+                  @updateTestData="updateTestData"
+        />
+        <ConditionCollection class="c-cs__conditions"
+                             :is-editing="isEditing"
+                             :test-data="testData"
+                             @conditionSetResultUpdated="updateCurrentOutput"
+                             @updateDefaultOutput="updateDefaultOutput"
+                             @telemetryUpdated="updateTelemetry"
+        />
+    </div>
 </div>
 </template>

@@ -56,15 +68,31 @@ export default {
    },
    data() {
        return {
-            currentConditionOutput: ''
+            currentConditionOutput: '',
+            defaultConditionOutput: '',
+            telemetryObjs: [],
+            testData: {}
        }
    },
    mounted() {
        this.conditionSetIdentifier = this.openmct.objects.makeKeyString(this.domainObject.identifier);
+        this.testData = {
+            applied: false,
+            conditionTestInputs: this.domainObject.configuration.conditionTestData || []
+        };
    },
    methods: {
        updateCurrentOutput(currentConditionResult) {
            this.currentConditionOutput = currentConditionResult.output;
+        },
+        updateDefaultOutput(output) {
+            this.currentConditionOutput = output;
+        },
+        updateTelemetry(telemetryObjs) {
+            this.telemetryObjs = telemetryObjs;
+        },
+        updateTestData(testData) {
+            this.testData = testData;
        }
    }
 };
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -1,13 +1,38 @@
+/*****************************************************************************
+* Open MCT, Copyright (c) 2014-2020, United States Government
+* as represented by the Administrator of the National Aeronautics and Space
+* Administration. All rights reserved.
+*
+* Open MCT is licensed under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0.
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+* License for the specific language governing permissions and limitations
+* under the License.
+*
+* Open MCT includes source code licensed under additional open source
+* licenses. See the Open Source Licenses file (LICENSES.md) included with
+* this source code distribution or the Licensing information page available
+* at runtime from the About dialog for additional information.
+*****************************************************************************/
+
 <template>
 <div class="u-contents">
    <div class="c-cdef__separator c-row-separator"></div>
    <span class="c-cdef__label">{{ setRowLabel }}</span>
    <span class="c-cdef__controls">
        <span class="c-cdef__control">
-            <select v-model="criterion.telemetry"
+            <select ref="telemetrySelect"
+                    v-model="criterion.telemetry"
                    @change="updateMetadataOptions"
            >
                <option value="">- Select Telemetry -</option>
+                <option value="all">all telemetry</option>
+                <option value="any">any telemetry</option>
                <option v-for="telemetryOption in telemetry"
                        :key="telemetryOption.identifier.key"
                        :value="telemetryOption.identifier"
@@ -19,7 +44,8 @@
        <span v-if="criterion.telemetry"
              class="c-cdef__control"
        >
-            <select v-model="criterion.metadata"
+            <select ref="metadataSelect"
+                    v-model="criterion.metadata"
                    @change="updateOperations"
            >
                <option value="">- Select Field -</option>
@@ -35,7 +61,7 @@
              class="c-cdef__control"
        >
            <select v-model="criterion.operation"
-                    @change="updateOperationInputVisibility"
+                    @change="updateInputVisibilityAndValues"
            >
                <option value="">- Select Comparison -</option>
                <option v-for="option in filteredOps"
@@ -62,7 +88,9 @@
                <span v-if="inputCount && criterion.operation"
                      class="c-cdef__control"
                >
-                    <select v-model="criterion.input[0]">
+                    <select v-model="criterion.input[0]"
+                            @change="persist"
+                    >
                        <option v-for="option in enumerations"
                                :key="option.string"
                                :value="option.value.toString()"
@@ -104,8 +132,7 @@ export default {
    },
    data() {
        return {
-            telemetryMetadata: {},
-            telemetryMetadataOptions: {},
+            telemetryMetadataOptions: [],
            operations: OPERATIONS,
            inputCount: 0,
            rowLabel: '',
@@ -120,13 +147,13 @@ export default {
            return (this.index !== 0 ? operator : '') + 'when';
        },
        filteredOps: function () {
-            return [...this.operations.filter(op => op.appliesTo.indexOf(this.operationFormat) !== -1)];
+            return this.operations.filter(op => op.appliesTo.indexOf(this.operationFormat) !== -1);
        },
        setInputType: function () {
            let type = '';
            for (let i = 0; i < this.filteredOps.length; i++) {
                if (this.criterion.operation === this.filteredOps[i].name) {
-                    if (this.filteredOps[i].appliesTo.length === 1) {
+                    if (this.filteredOps[i].appliesTo.length) {
                        type = this.inputTypes[this.filteredOps[i].appliesTo[0]];
                    } else {
                        type = 'text'
@@ -137,70 +164,128 @@ export default {
            return type;
        }
    },
+    watch: {
+        telemetry: {
+            handler(newTelemetry, oldTelemetry) {
+                this.checkTelemetry();
+            },
+            deep: true
+        }
+    },
    mounted() {
        this.updateMetadataOptions();
    },
    methods: {
-        getOperationFormat() {
-            this.enumerations = [];
-            this.telemetryMetadata.valueMetadatas.forEach((value, index) => {
-                if (value.key === this.criterion.metadata) {
-                    let valueMetadata = this.telemetryMetadataOptions[index];
-                    if (valueMetadata.enumerations !== undefined) {
-                        this.operationFormat = 'enum';
-                        this.enumerations = valueMetadata.enumerations;
-                    } else if (valueMetadata.hints.hasOwnProperty('range')) {
-                        this.operationFormat = 'number';
-                    } else if (valueMetadata.hints.hasOwnProperty('domain')) {
-                        this.operationFormat = 'number';
-                    } else if (valueMetadata.key === 'name') {
-                        this.operationFormat = 'string';
-                    } else {
-                        this.operationFormat = 'string';
+        checkTelemetry() {
+            if(this.criterion.telemetry) {
+                if (this.criterion.telemetry === 'any' || this.criterion.telemetry === 'all') {
+                    this.updateMetadataOptions();
+                } else {
+                    if (!this.telemetry.find((telemetryObj) => this.openmct.objects.areIdsEqual(this.criterion.telemetry, telemetryObj.identifier))) {
+                        //telemetry being used was removed. So reset this criterion.
+                        this.criterion.telemetry = '';
+                        this.criterion.metadata = '';
+                        this.criterion.input = [];
+                        this.criterion.operation = '';
+                        this.persist();
                    }
                }
+            }
+        },
+        updateOperationFormat() {
+            this.enumerations = [];
+            let foundMetadata = this.telemetryMetadataOptions.find((value) => {
+                return value.key === this.criterion.metadata;
+            });
+            if (foundMetadata) {
+                if (foundMetadata.enumerations !== undefined) {
+                    this.operationFormat = 'enum';
+                    this.enumerations = foundMetadata.enumerations;
+                } else if (foundMetadata.format === 'string' || foundMetadata.format === 'number') {
+                    this.operationFormat = foundMetadata.format;
+                } else if (foundMetadata.hints.hasOwnProperty('range')) {
+                    this.operationFormat = 'number';
+                } else if (foundMetadata.hints.hasOwnProperty('domain')) {
+                    this.operationFormat = 'number';
+                } else if (foundMetadata.key === 'name') {
+                    this.operationFormat = 'string';
+                } else {
+                    this.operationFormat = 'number';
+                }
+            }
+            this.updateInputVisibilityAndValues();
+        },
+        updateMetadataOptions(ev) {
+            if (ev) {
+                this.clearDependentFields(ev.target);
+                this.persist();
+            }
+            if (this.criterion.telemetry) {
+                const telemetry = (this.criterion.telemetry === 'all' || this.criterion.telemetry === 'any') ? this.telemetry : [{
+                    identifier: this.criterion.telemetry
+                }];
+
+                let telemetryPromises = telemetry.map((telemetryObject) => this.openmct.objects.get(telemetryObject.identifier));
+                Promise.all(telemetryPromises).then(telemetryObjects => {
+                    this.telemetryMetadataOptions = [];
+                    telemetryObjects.forEach(telemetryObject => {
+                        let telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
+                        this.addMetaDataOptions(telemetryMetadata.values());
+                    });
+                    this.updateOperations();
+                });
+            }
+        },
+        addMetaDataOptions(options) {
+            if (!this.telemetryMetadataOptions) {
+                this.telemetryMetadataOptions = options;
+            }
+            options.forEach((option) => {
+                const found = this.telemetryMetadataOptions.find((metadataOption) => {
+                    return (metadataOption.key && (metadataOption.key === option.key)) && (metadataOption.name && (metadataOption.name === option.name))
+                });
+                if (!found) {
+                    this.telemetryMetadataOptions.push(option);
+                }
            });
        },
-        updateMetadataOptions(ev) {
-            if (ev) {this.clearInputs()}
-            if (this.criterion.telemetry) {
-                this.openmct.objects.get(this.criterion.telemetry).then((telemetryObject) => {
-                    this.telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
-                    this.telemetryMetadataOptions = this.telemetryMetadata.values();
-                    this.updateOperations();
-                    this.updateOperationInputVisibility();
-                });
-            } else {
-                this.criterion.metadata = '';
-            }
-        },
        updateOperations(ev) {
+            this.updateOperationFormat();
            if (ev) {
-                this.clearInputs()
+                this.clearDependentFields(ev.target);
+                this.persist();
            }
-            this.getOperationFormat();
-            this.persist();
        },
-        updateOperationInputVisibility(ev) {
+        updateInputVisibilityAndValues(ev) {
            if (ev) {
-                this.criterion.input = this.enumerations.length ? [this.enumerations[0].value.toString()] : [];
-                this.inputCount = 0;
+                this.clearDependentFields();
+                this.persist();
            }
+
            for (let i = 0; i < this.filteredOps.length; i++) {
                if (this.criterion.operation === this.filteredOps[i].name) {
                    this.inputCount = this.filteredOps[i].inputCount;
-                    if (!this.inputCount) {this.criterion.input = []}
                }
            }
-            this.persist();
+            if (!this.inputCount) {
+                this.criterion.input = [];
+            }
        },
-        clearInputs() {
-            this.criterion.operation = '';
-            this.criterion.input = [];
-            this.inputCount = 0;
-        },
-        updateMetadataSelection() {
-            this.updateOperationInputVisibility();
+        clearDependentFields(el) {
+            if (el === this.$refs.telemetrySelect) {
+                this.criterion.metadata = '';
+            } else if (el === this.$refs.metadataSelect) {
+                if (!this.filteredOps.find(operation => operation.name === this.criterion.operation)) {
+                    this.criterion.operation = '';
+                    this.criterion.input = this.enumerations.length ? [this.enumerations[0].value.toString()] : [];
+                    this.inputCount = 0;
+                }
+            } else {
+                if (this.enumerations.length && !this.criterion.input.length) {
+                    this.criterion.input = [this.enumerations[0].value.toString()];
+                }
+                this.inputCount = 0;
+            }
        },
        persist() {
            this.$emit('persist', this.criterion);
--- a/src/plugins/condition/components/TestData.vue
+++ b/src/plugins/condition/components/TestData.vue
@@ -23,7 +23,6 @@
 <template>
 <section v-show="isEditing"
         id="test-data"
-         class="c-cs__test-data"
         :class="{ 'is-expanded': expanded }"
 >
    <div class="c-cs__header c-section__header">
@@ -37,36 +36,85 @@
    <div v-if="expanded"
         class="c-cs__content"
    >
-        <label class="c-toggle-switch">
-            <input
-                type="checkbox"
-                :checked="isApplied"
-                @change="applyTestData"
+        <div class="c-cs__test-data__controls c-cdef__controls"
+             :disabled="!telemetry.length"
+        >
+            <label class="c-toggle-switch">
+                <input
+                    type="checkbox"
+                    :checked="isApplied"
+                    @change="applyTestData"
+                >
+                <span class="c-toggle-switch__slider"></span>
+                <span class="c-toggle-switch__label">Apply Test Data</span>
+            </label>
+        </div>
+        <div class="c-cs-tests">
+            <span v-for="(testInput, tIndex) in testInputs"
+                  :key="tIndex"
+                  class="c-test-datum c-cs-test"
            >
-            <span class="c-toggle-switch__slider"></span>
-            <span class="c-toggle-switch__label">Apply Test Data</span>
-        </label>
-        <div class="c-cs-test-h">
-            <div v-for="n in 5"
-                 :key="n"
-                 class="c-test-datum"
-            >
-                <span class="c-test-datum__label">Set</span>
-                <div class="c-test-datum__controls">
-                    <select>
-                        <option>- Select Input -</option>
-                    </select>
-                </div>
-                <div class="c-test-datum__buttons">
+                <span class="c-cs-test__label">Set</span>
+                <span class="c-cs-test__controls">
+                    <span class="c-cdef__control">
+                        <select v-model="testInput.telemetry"
+                                @change="updateMetadata(testInput)"
+                        >
+                            <option value="">- Select Telemetry -</option>
+                            <option v-for="(telemetryOption, index) in telemetry"
+                                    :key="index"
+                                    :value="telemetryOption.identifier"
+                            >
+                                {{ telemetryOption.name }}
+                            </option>
+                        </select>
+                    </span>
+                    <span v-if="testInput.telemetry"
+                          class="c-cdef__control"
+                    >
+                        <select v-model="testInput.metadata"
+                                @change="updateTestData"
+                        >
+                            <option value="">- Select Field -</option>
+                            <option v-for="(option, index) in telemetryMetadataOptions[getId(testInput.telemetry)]"
+                                    :key="index"
+                                    :value="option.key"
+                            >
+                                {{ option.name }}
+                            </option>
+                        </select>
+                    </span>
+                    <span v-if="testInput.metadata"
+                          class="c-cdef__control__inputs"
+                    >
+                        <input v-model="testInput.value"
+                               placeholder="Enter test input"
+                               type="text"
+                               class="c-cdef__control__input"
+                               @change="updateTestData"
+                        >
+                    </span>
+                </span>
+                <div class="c-cs-test__buttons">
                    <button class="c-click-icon c-test-data__duplicate-button icon-duplicate"
-                            title="Duplicate this test data value"
+                            title="Duplicate this test datum"
+                            @click="addTestInput(testInput)"
                    ></button>
                    <button class="c-click-icon c-test-data__delete-button icon-trash"
-                            title="Delete this test data value"
+                            title="Delete this test datum"
+                            @click="removeTestInput(tIndex)"
                    ></button>
                </div>
-            </div>
+            </span>
        </div>
+        <button
+            v-show="isEditing"
+            id="addTestDatum"
+            class="c-button c-button--major icon-plus labeled"
+            @click="addTestInput"
+        >
+            <span class="c-cs-button__label">Add Test Datum</span>
+        </button>
    </div>
 </section>
 </template>
@@ -75,17 +123,113 @@
 export default {
    inject: ['openmct'],
    props: {
-        isEditing: Boolean
+        isEditing: Boolean,
+        telemetry: {
+            type: Array,
+            required: true,
+            default: () => []
+        },
+        testData: {
+            type: Object,
+            required: true,
+            default: () => {
+                return {
+                    applied: false,
+                    conditionTestInputs: []
+                }
+            }
+        }
    },
    data() {
        return {
            expanded: true,
-            isApplied: true
+            isApplied: false,
+            testInputs: [],
+            telemetryMetadataOptions: {}
        };
    },
+    watch: {
+        isEditing(editing) {
+            if (!editing) {
+                this.resetApplied();
+            }
+        },
+        telemetry: {
+            handler() {
+                this.initializeMetadata();
+            },
+            deep: true
+        },
+        testData: {
+            handler() {
+                this.initialize();
+            },
+            deep: true
+        }
+    },
+    beforeDestroy() {
+        this.resetApplied();
+    },
+    mounted() {
+        this.initialize();
+        this.initializeMetadata();
+    },
    methods: {
-        applyTestData(ev) {
-            this.$emit('change', ev.target.checked);
+        applyTestData() {
+            this.isApplied = !this.isApplied;
+            this.updateTestData();
+        },
+        initialize() {
+            if (this.testData && this.testData.conditionTestInputs) {
+                this.testInputs = this.testData.conditionTestInputs;
+            }
+            if (!this.testInputs.length) {
+                this.addTestInput();
+            }
+        },
+        initializeMetadata() {
+            this.telemetry.forEach((telemetryObject) => {
+                const id = this.openmct.objects.makeKeyString(telemetryObject.identifier);
+                let telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
+                this.telemetryMetadataOptions[id] = telemetryMetadata.values().slice();
+            });
+        },
+        addTestInput(testInput) {
+            this.testInputs.push(Object.assign({
+                telemetry: '',
+                metadata: '',
+                input: ''
+            }, testInput));
+        },
+        removeTestInput(index) {
+            this.testInputs.splice(index, 1);
+            this.updateTestData();
+        },
+        getId(identifier) {
+            if (identifier) {
+                return this.openmct.objects.makeKeyString(identifier);
+            }
+            return [];
+        },
+        updateMetadata(testInput) {
+            if (testInput.telemetry) {
+                const id = this.openmct.objects.makeKeyString(testInput.telemetry);
+                if(this.telemetryMetadataOptions[id]) {
+                    return;
+                }
+                let telemetryMetadata = this.openmct.telemetry.getMetadata(testInput);
+                this.telemetryMetadataOptions[id] = telemetryMetadata.values().slice();
+            }
+        },
+        resetApplied() {
+            this.isApplied = false;
+            this.updateTestData();
+        },
+        updateTestData() {
+            this.$emit('updateTestData', {
+                applied: this.isApplied,
+                conditionTestInputs: this.testInputs
+            });
        }
    }
 }
--- a/src/plugins/condition/components/condition-set.scss
+++ b/src/plugins/condition/components/condition-set.scss
@@ -1,89 +0,0 @@
-.c-cs {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    overflow: hidden;
-
-    &__content {
-        display: flex;
-        flex-direction: column;
-        flex: 1 1 auto;
-        overflow: hidden;
-
-        > * {
-            flex: 0 0 auto;
-            overflow: hidden;
-            + * {
-                margin-top: $interiorMarginSm;
-            }
-        }
-
-        .c-button {
-            align-self: start;
-        }
-    }
-
-    .is-editing & {
-        // Add some space to kick away from blue editing border indication
-        padding: $interiorMargin;
-    }
-
-    section {
-        display: flex;
-        flex-direction: column;
-        overflow: hidden;
-    }
-
-    &__conditions-h {
-        display: flex;
-        flex-direction: column;
-        flex: 1 1 auto;
-        overflow: auto;
-        padding-right: $interiorMarginSm;
-
-        > * + * {
-            margin-top: $interiorMarginSm;
-        }
-    }
-
-    &__conditions {
-        > * + * {
-            margin-top: $interiorMarginSm;
-        }
-    }
-
-    .hint {
-        padding: $interiorMarginSm;
-    }
-
-    /************************** SPECIFIC ITEMS */
-    &__current-output-value {
-        font-size: 1.25em;
-        padding: $interiorMargin;
-    }
-}
-
-/***************************** TEST DATA */
-.c-cs-test-h {
-    flex: 1 1 auto;
-    overflow: auto;
-    padding-right: $interiorMarginSm;
-
-    > * + * {
-        margin-top: $interiorMarginSm;
-    }
-}
-
-.c-test-datum {
-    > * {
-        flex: 0 0 auto;
-        + * {
-            margin-left: $interiorMargin;
-        }
-    }
-    &__controls {
-        flex: 1 1 auto;
-    }
-
-}
-
--- a/src/plugins/condition/components/condition.scss
+++ b/src/plugins/condition/components/condition.scss
@@ -1,120 +0,0 @@
-.c-condition,
-.c-test-datum {
-    @include discreteItem();
-    display: flex;
-    padding: $interiorMargin;
-
-    &--edit {
-        line-height: 160%; // For layout when inputs wrap, like in criteria
-    }
-}
-
-.c-condition {
-    flex-direction: column;
-    min-width: 400px;
-
-    > * + * {
-        margin-top: $interiorMarginSm;
-    }
-    &--browse {
-        .c-condition__summary {
-            border-top: 1px solid $colorInteriorBorder;
-            padding-top: $interiorMargin;
-        }
-    }
-
-    /***************************** HEADER */
-    &__header {
-        $h: 22px;
-        display: flex;
-        align-items: start;
-        align-content: stretch;
-        overflow: hidden;
-        min-height: $h;
-        line-height: $h;
-
-        > * {
-            flex: 0 0 auto;
-            + * {
-                margin-left: $interiorMarginSm;
-            }
-        }
-    }
-
-    &__drag-grippy {
-        transform: translateY(50%);
-    }
-
-    &__name {
-        font-weight: bold;
-        align-self: baseline; // Fixes bold line-height offset problem
-    }
-
-    &__output,
-    &__summary {
-        flex: 1 1 auto;
-    }
-}
-
-/***************************** CONDITION DEFINITION, EDITING */
-.c-cdef {
-    display: grid;
-    grid-row-gap: $interiorMarginSm;
-    grid-column-gap: $interiorMargin;
-    grid-auto-columns: min-content 1fr max-content;
-    align-items: start;
-    min-width: 150px;
-    margin-left: 29px;
-    overflow: hidden;
-
-    &__criteria,
-    &__match-and-criteria {
-        display: contents;
-    }
-
-    &__label {
-        grid-column: 1;
-        text-align: right;
-        white-space: nowrap;
-    }
-
-    &__separator {
-        grid-column: 1 / span 3;
-    }
-
-    &__controls {
-        display: flex;
-        flex-wrap: wrap;
-        align-items: flex-start;
-        //line-height: 200%;
-        grid-column: 2;
-
-        > * > * {
-            margin-right: $interiorMarginSm;
-        }
-    }
-
-    &__buttons {
-        grid-column: 3;
-    }
-}
-
-.c-c__drag-ghost {
-    width: 100%;
-    min-height: $interiorMarginSm;
-
-    //&:before {
-    //    @include test();
-    //    content: '';
-    //    display: block;
-    //    z-index: 2;
-    //}
-
-    &.dragging {
-        min-height: 5em;
-        //border: solid 1px blue;
-        background-color: lightblue;
-        border-radius: 2px;
-    }
-
-}
--- a/src/plugins/condition/components/conditionals.scss
+++ b/src/plugins/condition/components/conditionals.scss
@@ -0,0 +1,311 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/***************************** DRAGGING */
+.is-active-dragging {
+    .c-condition-h__drop-target {
+        height: 3px;
+        margin-bottom: $interiorMarginSm;
+    }
+}
+
+.c-condition-h {
+    &__drop-target {
+        border-radius: $controlCr;
+        height: 0;
+        min-height: 0;
+        transition: background-color, height;
+        transition-duration: 150ms;
+    }
+
+    &.is-drag-target {
+        .c-condition > * {
+            pointer-events: none; // Keeps the JS drop handler from being intercepted by internal elements
+        }
+
+        .c-condition-h__drop-target {
+            background-color: rgba($colorKey, 0.7);
+        }
+    }
+}
+
+.c-cs {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+
+    /************************** CONDITION SET LAYOUT */
+    &__current-output {
+        flex: 0 0 auto;
+    }
+
+    &__test-data-and-conditions-w {
+        display: flex;
+        flex-direction: column;
+        flex: 1 1 auto;
+        height: 100%;
+        overflow: hidden;
+    }
+
+    &__test-data,
+    &__conditions {
+        flex: 0 0 auto;
+        overflow: hidden;
+    }
+
+    &__test-data {
+        flex: 0 0 auto;
+        max-height: 50%;
+
+        &.is-expanded {
+            margin-bottom: $interiorMargin * 4;
+        }
+    }
+
+    &__conditions {
+        flex: 1 1 auto;
+
+        > * + * {
+            margin-top: $interiorMarginSm;
+        }
+    }
+
+    &__content {
+        display: flex;
+        flex-direction: column;
+        flex: 0 1 auto;
+        overflow: hidden;
+
+        > * {
+            flex: 0 0 auto;
+            overflow: hidden;
+            + * {
+                margin-top: $interiorMarginSm;
+            }
+        }
+
+        .c-button {
+            align-self: start;
+        }
+    }
+
+    .is-editing & {
+        // Add some space to kick away from blue editing border indication
+        padding: $interiorMargin;
+    }
+
+    section {
+        display: flex;
+        flex-direction: column;
+        overflow: hidden;
+    }
+
+    &__conditions-h {
+        display: flex;
+        flex-direction: column;
+        flex: 1 1 auto;
+        overflow: auto;
+        padding-right: $interiorMarginSm;
+
+        > * + * {
+            margin-top: $interiorMarginSm;
+        }
+    }
+
+    .hint {
+        padding: $interiorMarginSm;
+    }
+
+    /************************** SPECIFIC ITEMS */
+    &__current-output-value {
+        flex-direction: row;
+        align-items: baseline;
+        padding: 0 $interiorMargin $interiorMarginLg $interiorMargin;
+
+        > * {
+            padding: $interiorMargin 0; // Must do this to align label and value
+        }
+
+        &__label {
+            color: $colorInspectorSectionHeaderFg;
+            opacity: 0.9;
+            text-transform: uppercase;
+        }
+
+        &__value {
+            $p: $interiorMargin * 3;
+            font-size: 1.25em;
+            margin-left: $interiorMargin;
+            padding-left: $p;
+            padding-right: $p;
+            background: rgba(black, 0.2);
+            border-radius: 5px;
+        }
+    }
+}
+
+/***************************** CONDITIONS AND TEST DATUM ELEMENTS */
+.c-condition,
+.c-test-datum {
+    @include discreteItem();
+    display: flex;
+    padding: $interiorMargin;
+    line-height: 170%; // Aligns text with controls like selects
+}
+
+.c-cdef,
+.c-cs-test {
+    &__controls {
+        display: flex;
+        flex: 1 1 auto;
+        flex-wrap: wrap;
+
+        > * > * {
+            margin-right: $interiorMarginSm;
+        }
+    }
+
+    &__buttons {
+        white-space: nowrap;
+    }
+}
+
+.c-condition {
+    flex-direction: column;
+    min-width: 400px;
+
+    > * + * {
+        margin-top: $interiorMarginSm;
+    }
+    &--browse {
+        .c-condition__summary {
+            border-top: 1px solid $colorInteriorBorder;
+            padding-top: $interiorMargin;
+        }
+    }
+
+    /***************************** HEADER */
+    &__header {
+        $h: 22px;
+        display: flex;
+        align-items: start;
+        align-content: stretch;
+        overflow: hidden;
+        min-height: $h;
+        line-height: $h;
+
+        > * {
+            flex: 0 0 auto;
+            + * {
+                margin-left: $interiorMarginSm;
+            }
+        }
+    }
+
+    &__drag-grippy {
+        transform: translateY(50%);
+    }
+
+    &__name {
+        font-weight: bold;
+        align-self: baseline; // Fixes bold line-height offset problem
+    }
+
+    &__output,
+    &__summary {
+        flex: 1 1 auto;
+    }
+}
+
+/***************************** CONDITION DEFINITION, EDITING */
+.c-cdef {
+    display: grid;
+    grid-row-gap: $interiorMarginSm;
+    grid-column-gap: $interiorMargin;
+    grid-auto-columns: min-content 1fr max-content;
+    align-items: start;
+    min-width: 150px;
+    margin-left: 29px;
+    overflow: hidden;
+
+    &__criteria,
+    &__match-and-criteria {
+        display: contents;
+    }
+
+    &__label {
+        grid-column: 1;
+        text-align: right;
+        white-space: nowrap;
+    }
+
+    &__separator {
+        grid-column: 1 / span 3;
+    }
+
+    &__controls {
+        align-items: flex-start;
+        grid-column: 2;
+
+        > * > * {
+            margin-right: $interiorMarginSm;
+        }
+    }
+
+    &__buttons {
+        grid-column: 3;
+    }
+}
+
+.c-c__drag-ghost {
+    width: 100%;
+    min-height: $interiorMarginSm;
+
+    &.dragging {
+        min-height: 5em;
+        background-color: lightblue;
+        border-radius: 2px;
+    }
+}
+
+/***************************** TEST DATA */
+.c-cs__test-data {
+    &__controls {
+        flex: 0 0 auto;
+    }
+}
+
+.c-cs-tests {
+    flex: 0 1 auto;
+    overflow: auto;
+    padding-right: $interiorMarginSm;
+
+    > * + * {
+        margin-top: $interiorMarginSm;
+    }
+}
+
+.c-cs-test {
+    > * + * {
+        margin-left: $interiorMargin;
+    }
+}
--- a/src/plugins/condition/components/inspector/ConditionSetDialogTreeItem.vue
+++ b/src/plugins/condition/components/inspector/ConditionSetDialogTreeItem.vue
@@ -1,3 +1,25 @@
+/*****************************************************************************
+* Open MCT, Copyright (c) 2014-2020, United States Government
+* as represented by the Administrator of the National Aeronautics and Space
+* Administration. All rights reserved.
+*
+* Open MCT is licensed under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0.
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+* License for the specific language governing permissions and limitations
+* under the License.
+*
+* Open MCT includes source code licensed under additional open source
+* licenses. See the Open Source Licenses file (LICENSES.md) included with
+* this source code distribution or the Licensing information page available
+* at runtime from the About dialog for additional information.
+*****************************************************************************/
+
 <template>
 <li class="c-tree__item-h">
    <div
--- a/src/plugins/condition/components/inspector/ConditionSetSelectorDialog.vue
+++ b/src/plugins/condition/components/inspector/ConditionSetSelectorDialog.vue
@@ -1,3 +1,25 @@
+/*****************************************************************************
+* Open MCT, Copyright (c) 2014-2020, United States Government
+* as represented by the Administrator of the National Aeronautics and Space
+* Administration. All rights reserved.
+*
+* Open MCT is licensed under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0.
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+* License for the specific language governing permissions and limitations
+* under the License.
+*
+* Open MCT includes source code licensed under additional open source
+* licenses. See the Open Source Licenses file (LICENSES.md) included with
+* this source code distribution or the Licensing information page available
+* at runtime from the About dialog for additional information.
+*****************************************************************************/
+
 <template>
 <div class="u-contents">
    <div class="c-overlay__top-bar">
--- a/src/plugins/condition/components/inspector/ConditionalStylesView.vue
+++ b/src/plugins/condition/components/inspector/ConditionalStylesView.vue
@@ -105,6 +105,7 @@ import ConditionDescription from "@/plugins/condition/components/ConditionDescri
 import ConditionError from "@/plugins/condition/components/ConditionError.vue";
 import Vue from 'vue';
 import PreviewAction from "@/ui/preview/PreviewAction.js";
+import {getApplicableStylesForItem} from "@/plugins/condition/utils/styleUtils";

 export default {
    name: 'ConditionalStylesView',
@@ -115,24 +116,8 @@ export default {
    },
    inject: [
        'openmct',
-        'domainObject'
+        'selection'
    ],
-    props: {
-        itemId: {
-            type: String,
-            default: ''
-        },
-        initialStyles: {
-            type: Object,
-            default() {
-                return undefined;
-            }
-        },
-        canHide: {
-            type: Boolean,
-            default: false
-        }
-    },
    data() {
        return {
            conditionalStyles: [],
@@ -145,9 +130,11 @@ export default {
        }
    },
    destroyed() {
-        this.openmct.editor.off('isEditing', this.setEditState);
+        this.removeListeners();
    },
    mounted() {
+        this.itemId = '';
+        this.getDomainObjectFromSelection();
        this.previewAction = new PreviewAction(this.openmct);
        if (this.domainObject.configuration && this.domainObject.configuration.objectStyles) {
            let objectStyles = this.itemId ? this.domainObject.configuration.objectStyles[this.itemId] : this.domainObject.configuration.objectStyles;
@@ -162,6 +149,49 @@ export default {
        this.openmct.editor.on('isEditing', this.setEditState);
    },
    methods: {
+        isItemType(type, item) {
+            return item && (item.type === type);
+        },
+        getDomainObjectFromSelection() {
+            let layoutItem;
+            let domainObject;
+
+            if (this.selection[0].length > 1) {
+                //If there are more than 1 items in the this.selection[0] list, the first one could either be a sub domain object OR a layout drawing control.
+                //The second item in the this.selection[0] list is the container object (usually a layout)
+                layoutItem = this.selection[0][0].context.layoutItem;
+                const item = this.selection[0][0].context.item;
+                this.canHide = true;
+                if (item &&
+                    (!layoutItem || (this.isItemType('subobject-view', layoutItem)))) {
+                    domainObject = item;
+                } else {
+                    domainObject = this.selection[0][1].context.item;
+                    if (layoutItem) {
+                        this.itemId = layoutItem.id;
+                    }
+                }
+            } else {
+                domainObject = this.selection[0][0].context.item;
+            }
+            this.domainObject = domainObject;
+            this.initialStyles = getApplicableStylesForItem(domainObject, layoutItem);
+            this.$nextTick(() => {
+                this.removeListeners();
+                if (this.domainObject) {
+                    this.stopObserving = this.openmct.objects.observe(this.domainObject, '*', newDomainObject => this.domainObject = newDomainObject);
+                    this.stopObservingItems = this.openmct.objects.observe(this.domainObject, 'configuration.items', this.updateDomainObjectItemStyles);
+                }
+            });
+        },
+        removeListeners() {
+            if (this.stopObserving) {
+                this.stopObserving();
+            }
+            if (this.stopObservingItems) {
+                this.stopObservingItems();
+            }
+        },
        initialize(conditionSetDomainObject) {
            //If there are new conditions in the conditionSet we need to set those styles to default
            this.conditionSetDomainObject = conditionSetDomainObject;
@@ -258,30 +288,70 @@ export default {

            this.persist(domainObjectStyles);
        },
+        updateDomainObjectItemStyles(newItems) {
+            //check that all items that have been styles still exist. Otherwise delete those styles
+            let domainObjectStyles =  (this.domainObject.configuration && this.domainObject.configuration.objectStyles) || {};
+            let itemsToRemove = [];
+            let keys = Object.keys(domainObjectStyles);
+            keys.forEach((key) => {
+                if ((key !== 'styles') &&
+                    (key !== 'staticStyle') &&
+                    (key !== 'conditionSetIdentifier')) {
+                    if (!(newItems.find(item => item.id === key))) {
+                        itemsToRemove.push(key);
+                    }
+                }
+            });
+            if (itemsToRemove.length) {
+                this.removeItemStyles(itemsToRemove, domainObjectStyles);
+            }
+        },
+        removeItemStyles(itemIds, domainObjectStyles) {
+            itemIds.forEach(itemId => {
+                if (domainObjectStyles[itemId]) {
+                    domainObjectStyles[itemId] = undefined;
+                    delete domainObjectStyles[this.itemId];
+                }
+            });
+            if (_.isEmpty(domainObjectStyles)) {
+                domainObjectStyles = undefined;
+            }
+            this.persist(domainObjectStyles);
+        },
        initializeConditionalStyles() {
            if (!this.conditions) {
                this.conditions = {};
            }
+            let conditionalStyles = [];
            this.conditionSetDomainObject.configuration.conditionCollection.forEach((conditionConfiguration, index) => {
                this.conditions[conditionConfiguration.id] = conditionConfiguration;
                let foundStyle = this.findStyleByConditionId(conditionConfiguration.id);
                if (foundStyle) {
                    foundStyle.style = Object.assign((this.canHide ? { isStyleInvisible: '' } : {}), this.initialStyles, foundStyle.style);
+                    conditionalStyles.push(foundStyle);
                } else {
-                    this.conditionalStyles.splice(index, 0, {
+                    conditionalStyles.splice(index, 0, {
                        conditionId: conditionConfiguration.id,
                        style: Object.assign((this.canHide ? { isStyleInvisible: '' } : {}), this.initialStyles)
                    });
                }
            });
+            //we're doing this so that we remove styles for any conditions that have been removed from the condition set
+            this.conditionalStyles = conditionalStyles;
            this.conditionsLoaded = true;
            this.persist(this.getDomainObjectConditionalStyle());
        },
        initializeStaticStyle(objectStyles) {
            let staticStyle = objectStyles && objectStyles.staticStyle;
-            this.staticStyle = staticStyle || {
-                style: Object.assign({}, this.initialStyles)
-            };
+            if (staticStyle) {
+                this.staticStyle = {
+                    style: Object.assign({}, this.initialStyles, staticStyle.style)
+                };
+            } else {
+                this.staticStyle = {
+                    style: Object.assign({}, this.initialStyles)
+                };
+            }
        },
        findStyleByConditionId(id) {
            return this.conditionalStyles.find(conditionalStyle => conditionalStyle.conditionId === id);
--- a/src/plugins/condition/components/inspector/MultiSelectStylesView.vue
+++ b/src/plugins/condition/components/inspector/MultiSelectStylesView.vue
@@ -0,0 +1,269 @@
+/*****************************************************************************
+* Open MCT, Copyright (c) 2014-2020, United States Government
+* as represented by the Administrator of the National Aeronautics and Space
+* Administration. All rights reserved.
+*
+* Open MCT is licensed under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0.
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+* License for the specific language governing permissions and limitations
+* under the License.
+*
+* Open MCT includes source code licensed under additional open source
+* licenses. See the Open Source Licenses file (LICENSES.md) included with
+* this source code distribution or the Licensing information page available
+* at runtime from the About dialog for additional information.
+*****************************************************************************/
+
+<template>
+<div class="c-inspector__styles c-inspect-styles">
+    <div class="c-inspect-styles__header">
+        Object Style
+    </div>
+    <div class="c-inspect-styles__content">
+        <div v-if="isStaticAndConditionalStyles"
+             class="c-inspect-styles__mixed-static-and-conditional u-alert u-alert--block u-alert--with-icon"
+        >
+            Your selection includes one or more items that use Conditional Styling. Applying a static style below will replace any Conditional Styling with the new choice.
+        </div>
+        <div v-if="staticStyle"
+             class="c-inspect-styles__style"
+        >
+            <style-editor class="c-inspect-styles__editor"
+                          :style-item="staticStyle"
+                          :is-editing="isEditing"
+                          :mixed-styles="mixedStyles"
+                          @persist="updateStaticStyle"
+            />
+        </div>
+    </div>
+</div>
+</template>
+
+<script>
+
+import StyleEditor from "./StyleEditor.vue";
+import PreviewAction from "@/ui/preview/PreviewAction.js";
+import { getApplicableStylesForItem, getConsolidatedStyleValues, getConditionalStyleForItem } from "@/plugins/condition/utils/styleUtils";
+
+export default {
+    name: 'MultiSelectStylesView',
+    components: {
+        StyleEditor
+    },
+    inject: [
+        'openmct',
+        'selection'
+    ],
+    data() {
+        return {
+            staticStyle: undefined,
+            isEditing: this.openmct.editor.isEditing(),
+            mixedStyles: [],
+            isStaticAndConditionalStyles: false
+        }
+    },
+    destroyed() {
+        this.removeListeners();
+    },
+    mounted() {
+        this.items = [];
+        this.previewAction = new PreviewAction(this.openmct);
+        this.getObjectsAndItemsFromSelection();
+        this.initializeStaticStyle();
+        this.openmct.editor.on('isEditing', this.setEditState);
+    },
+    methods: {
+        isItemType(type, item) {
+            return item && (item.type === type);
+        },
+        hasConditionalStyles(domainObject, id) {
+            return getConditionalStyleForItem(domainObject, id) !== undefined;
+        },
+        getObjectsAndItemsFromSelection() {
+            let domainObject;
+            let subObjects = [];
+
+            //multiple selection
+            let itemInitialStyles = [];
+            let itemStyle;
+            this.selection.forEach((selectionItem) => {
+                const item = selectionItem[0].context.item;
+                const layoutItem = selectionItem[0].context.layoutItem;
+                if (item && this.isItemType('subobject-view', layoutItem)) {
+                    subObjects.push(item);
+                    itemStyle = getApplicableStylesForItem(item);
+                    if (!this.isStaticAndConditionalStyles) {
+                        this.isStaticAndConditionalStyles = this.hasConditionalStyles(item);
+                    }
+                } else {
+                    domainObject = selectionItem[1].context.item;
+                    itemStyle = getApplicableStylesForItem(domainObject, layoutItem || item);
+                    this.items.push({
+                        id: layoutItem.id,
+                        applicableStyles: itemStyle
+                    });
+                    if (!this.isStaticAndConditionalStyles) {
+                        this.isStaticAndConditionalStyles = this.hasConditionalStyles(domainObject, layoutItem.id);
+                    }
+                }
+                itemInitialStyles.push(itemStyle);
+            });
+            const {styles, mixedStyles} = getConsolidatedStyleValues(itemInitialStyles);
+            this.initialStyles = styles;
+            this.mixedStyles = mixedStyles;
+
+            this.domainObject = domainObject;
+            this.removeListeners();
+            if (this.domainObject) {
+                this.stopObserving = this.openmct.objects.observe(this.domainObject, '*', newDomainObject => this.domainObject = newDomainObject);
+                this.stopObservingItems = this.openmct.objects.observe(this.domainObject, 'configuration.items', this.updateDomainObjectItemStyles);
+            }
+
+            subObjects.forEach(this.registerListener);
+        },
+        updateDomainObjectItemStyles(newItems) {
+            //check that all items that have been styles still exist. Otherwise delete those styles
+            let keys = Object.keys(this.domainObject.configuration.objectStyles || {});
+            keys.forEach((key) => {
+                if ((key !== 'styles') &&
+                    (key !== 'staticStyle') &&
+                    (key !== 'conditionSetIdentifier')) {
+                    if (!(newItems.find(item => item.id === key))) {
+                        this.removeItemStyles(key);
+                    }
+                }
+            });
+        },
+        registerListener(domainObject) {
+            let id = this.openmct.objects.makeKeyString(domainObject.identifier);
+
+            if (!this.domainObjectsById) {
+                this.domainObjectsById = {};
+            }
+
+            if (!this.domainObjectsById[id]) {
+                this.domainObjectsById[id] = domainObject;
+                this.observeObject(domainObject, id);
+            }
+        },
+        observeObject(domainObject, id) {
+            let unobserveObject = this.openmct.objects.observe(domainObject, '*', function (newObject) {
+                this.domainObjectsById[id] = JSON.parse(JSON.stringify(newObject));
+            }.bind(this));
+            this.unObserveObjects.push(unobserveObject);
+        },
+        removeListeners() {
+            if (this.stopObserving) {
+                this.stopObserving();
+            }
+            if (this.stopObservingItems) {
+                this.stopObservingItems();
+            }
+            if (this.unObserveObjects) {
+                this.unObserveObjects.forEach((unObserveObject) => {
+                    unObserveObject();
+                });
+            }
+            this.unObserveObjects = [];
+        },
+        removeItemStyles(itemId) {
+            let domainObjectStyles =  (this.domainObject.configuration && this.domainObject.configuration.objectStyles) || {};
+            if (itemId && domainObjectStyles[itemId]) {
+                domainObjectStyles[itemId] = undefined;
+                delete domainObjectStyles[this.itemId];
+
+                if (_.isEmpty(domainObjectStyles)) {
+                    domainObjectStyles = undefined;
+                }
+                this.persist(this.domainObject, domainObjectStyles);
+            }
+        },
+        removeConditionalStyles(domainObjectStyles, itemId) {
+            if (itemId) {
+                domainObjectStyles[itemId].conditionSetIdentifier = undefined;
+                delete domainObjectStyles[itemId].conditionSetIdentifier;
+                domainObjectStyles[itemId].styles = undefined;
+                delete domainObjectStyles[itemId].styles;
+            } else {
+                domainObjectStyles.conditionSetIdentifier = undefined;
+                delete domainObjectStyles.conditionSetIdentifier;
+                domainObjectStyles.styles = undefined;
+                delete domainObjectStyles.styles;
+            }
+        },
+        setEditState(isEditing) {
+            this.isEditing = isEditing;
+        },
+        initializeStaticStyle() {
+            this.staticStyle = {
+                style: Object.assign({}, this.initialStyles)
+            };
+        },
+        updateStaticStyle(staticStyle, property) {
+            //update the static style for each of the layoutItems as well as each sub object item
+            this.staticStyle = staticStyle;
+            this.persist(this.domainObject, this.getDomainObjectStyle(this.domainObject, property, this.items));
+            if (this.domainObjectsById) {
+                const keys = Object.keys(this.domainObjectsById);
+                keys.forEach(key => {
+                    let domainObject = this.domainObjectsById[key];
+                    this.persist(domainObject, this.getDomainObjectStyle(domainObject, property));
+                });
+            }
+            this.isStaticAndConditionalStyles = false;
+            let foundIndex = this.mixedStyles.indexOf(property);
+            if (foundIndex > -1) {
+                this.mixedStyles.splice(foundIndex, 1);
+            }
+        },
+        getDomainObjectStyle(domainObject, property, items) {
+            let domainObjectStyles =  (domainObject.configuration && domainObject.configuration.objectStyles) || {};
+
+            if (items) {
+                items.forEach(item => {
+                    let itemStaticStyle = {};
+                    if (domainObjectStyles[item.id] && domainObjectStyles[item.id].staticStyle) {
+                        itemStaticStyle = domainObjectStyles[item.id].staticStyle.style;
+                    }
+                    Object.keys(item.applicableStyles).forEach(key => {
+                        if (property === key) {
+                            itemStaticStyle[key] = this.staticStyle.style[key];
+                        }
+                    });
+                    if (this.isStaticAndConditionalStyles) {
+                        this.removeConditionalStyles(domainObjectStyles, item.id);
+                    }
+                    if (_.isEmpty(itemStaticStyle)) {
+                        itemStaticStyle = undefined;
+                        domainObjectStyles[item.id] = undefined;
+                    } else {
+                        domainObjectStyles[item.id] = Object.assign({}, { staticStyle: { style: itemStaticStyle } });
+                    }
+                });
+            } else {
+                if (!domainObjectStyles.staticStyle) {
+                    domainObjectStyles.staticStyle = {
+                        style: {}
+                    }
+                }
+                if (this.isStaticAndConditionalStyles) {
+                    this.removeConditionalStyles(domainObjectStyles);
+                }
+                domainObjectStyles.staticStyle.style[property] = this.staticStyle.style[property];
+            }
+
+            return domainObjectStyles;
+        },
+
+        persist(domainObject, style) {
+            this.openmct.objects.mutate(domainObject, 'configuration.objectStyles', style);
+        }
+    }
+}
+</script>
--- a/src/plugins/condition/components/inspector/StyleEditor.vue
+++ b/src/plugins/condition/components/inspector/StyleEditor.vue
@@ -22,38 +22,41 @@

 <template>
 <div class="c-style">
-    <span class="c-style-thumb"
-          :class="{ 'is-style-invisible': styleItem.style.isStyleInvisible }"
-          :style="[styleItem.style.imageUrl ? { backgroundImage:'url(' + styleItem.style.imageUrl + ')'} : styleItem.style ]"
+    <span :class="[
+              { 'is-style-invisible': styleItem.style.isStyleInvisible },
+              { 'c-style-thumb--mixed': mixedStyles.indexOf('backgroundColor') > -1 }
+          ]"
+          :style="[styleItem.style.imageUrl ? { backgroundImage:'url(' + styleItem.style.imageUrl + ')'} : itemStyle ]"
+          class="c-style-thumb"
    >
        <span class="c-style-thumb__text"
-              :class="{ 'hide-nice': !styleItem.style.color }"
+              :class="{ 'hide-nice': !hasProperty(styleItem.style.color) }"
        >
            ABC
        </span>
    </span>
    <span class="c-toolbar">
-        <toolbar-color-picker v-if="styleItem.style.border"
+        <toolbar-color-picker v-if="hasProperty(styleItem.style.border)"
                              class="c-style__toolbar-button--border-color u-menu-to--center"
                              :options="borderColorOption"
                              @change="updateStyleValue"
        />
-        <toolbar-color-picker v-if="styleItem.style.backgroundColor"
+        <toolbar-color-picker v-if="hasProperty(styleItem.style.backgroundColor)"
                              class="c-style__toolbar-button--background-color u-menu-to--center"
                              :options="backgroundColorOption"
                              @change="updateStyleValue"
        />
-        <toolbar-color-picker v-if="styleItem.style.color"
+        <toolbar-color-picker v-if="hasProperty(styleItem.style.color)"
                              class="c-style__toolbar-button--color u-menu-to--center"
                              :options="colorOption"
                              @change="updateStyleValue"
        />
-        <toolbar-button v-if="styleItem.style.imageUrl !== undefined"
+        <toolbar-button v-if="hasProperty(styleItem.style.imageUrl)"
                        class="c-style__toolbar-button--image-url"
                        :options="imageUrlOption"
                        @change="updateStyleValue"
        />
-        <toolbar-toggle-button v-if="styleItem.style.isStyleInvisible !== undefined"
+        <toolbar-toggle-button v-if="hasProperty(styleItem.style.isStyleInvisible)"
                               class="c-style__toolbar-button--toggle-visible"
                               :options="isStyleInvisibleOption"
                               @change="updateStyleValue"
@@ -68,6 +71,7 @@ import ToolbarColorPicker from "@/ui/toolbar/components/toolbar-color-picker.vue
 import ToolbarButton from "@/ui/toolbar/components/toolbar-button.vue";
 import ToolbarToggleButton from "@/ui/toolbar/components/toolbar-toggle-button.vue";
 import {STYLE_CONSTANTS} from "@/plugins/condition/utils/constants";
+import {getStylesWithoutNoneValue} from "@/plugins/condition/utils/styleUtils";

 export default {
    name: 'StyleEditor',
@@ -83,37 +87,52 @@ export default {
        isEditing: {
            type: Boolean
        },
+        mixedStyles: {
+            type: Array,
+            default() {
+                return [];
+            }
+        },
        styleItem: {
            type: Object,
            required: true
        }
    },
    computed: {
+        itemStyle() {
+            return getStylesWithoutNoneValue(this.styleItem.style);
+        },
        borderColorOption() {
+            let value = this.styleItem.style.border.replace('1px solid ', '');
            return {
                icon: 'icon-line-horz',
                title: STYLE_CONSTANTS.borderColorTitle,
-                value: this.styleItem.style.border.replace('1px solid ', ''),
+                value: this.normalizeValueForSwatch(value),
                property: 'border',
-                isEditing: this.isEditing
+                isEditing: this.isEditing,
+                nonSpecific: this.mixedStyles.indexOf('border') > -1
            }
        },
        backgroundColorOption() {
+            let value = this.styleItem.style.backgroundColor;
            return {
                icon: 'icon-paint-bucket',
                title: STYLE_CONSTANTS.backgroundColorTitle,
-                value: this.styleItem.style.backgroundColor,
+                value: this.normalizeValueForSwatch(value),
                property: 'backgroundColor',
-                isEditing: this.isEditing
+                isEditing: this.isEditing,
+                nonSpecific: this.mixedStyles.indexOf('backgroundColor') > -1
            }
        },
        colorOption() {
+            let value = this.styleItem.style.color;
            return {
                icon: 'icon-font',
                title: STYLE_CONSTANTS.textColorTitle,
-                value: this.styleItem.style.color,
+                value: this.normalizeValueForSwatch(value),
                property: 'color',
-                isEditing: this.isEditing
+                isEditing: this.isEditing,
+                nonSpecific: this.mixedStyles.indexOf('color') > -1
            }
        },
        imageUrlOption() {
@@ -138,7 +157,8 @@ export default {
                property: 'imageUrl',
                formKeys: ['url'],
                value: {url: this.styleItem.style.imageUrl},
-                isEditing: this.isEditing
+                isEditing: this.isEditing,
+                nonSpecific: this.mixedStyles.indexOf('imageUrl') > -1
            }
        },
        isStyleInvisibleOption() {
@@ -163,7 +183,23 @@ export default {
        }
    },
    methods: {
+        hasProperty(property) {
+            return property !== undefined;
+        },
+        normalizeValueForSwatch(value) {
+            if (value && value.indexOf('__no_value') > -1) {
+                return value.replace('__no_value', 'transparent');
+            }
+            return value;
+        },
+        normalizeValueForStyle(value) {
+            if (value && value === 'transparent') {
+                return '__no_value';
+            }
+            return value;
+        },
        updateStyleValue(value, item) {
+            value = this.normalizeValueForStyle(value);
            if (item.property === 'border') {
                value = '1px solid ' + value;
            }
@@ -172,7 +208,7 @@ export default {
            } else {
                this.styleItem.style[item.property] = value;
            }
-            this.$emit('persist', this.styleItem);
+            this.$emit('persist', this.styleItem, item.property);
        }
    }
 }
--- a/src/plugins/condition/components/inspector/conditional-styles.scss
+++ b/src/plugins/condition/components/inspector/conditional-styles.scss
@@ -1,3 +1,25 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
 /********************************************* INSPECTOR STYLES TAB */
 .c-inspect-styles {
    > * + * {
--- a/src/plugins/condition/criterion/AllTelemetryCriterion.js
+++ b/src/plugins/condition/criterion/AllTelemetryCriterion.js
@@ -0,0 +1,166 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+import TelemetryCriterion from './TelemetryCriterion';
+import { evaluateResults } from "../utils/evaluator";
+import { getLatestTimestamp } from '../utils/time';
+
+export default class AllTelemetryCriterion extends TelemetryCriterion {
+
+    /**
+     * Subscribes/Unsubscribes to telemetry and emits the result
+     * of operations performed on the telemetry data returned and a given input value.
+     * @constructor
+     * @param telemetryDomainObjectDefinition {id: uuid, operation: enum, input: Array, metadata: string, key: {domainObject.identifier} }
+     * @param openmct
+     */
+    constructor(telemetryDomainObjectDefinition, openmct) {
+        super(telemetryDomainObjectDefinition, openmct);
+    }
+
+    initialize() {
+        this.telemetryObjects = { ...this.telemetryDomainObjectDefinition.telemetryObjects };
+        this.telemetryDataCache = {};
+    }
+
+    isValid() {
+        return (this.telemetry === 'any' || this.telemetry === 'all') && this.metadata && this.operation;
+    }
+
+    updateTelemetry(telemetryObjects) {
+        this.telemetryObjects = { ...telemetryObjects };
+        this.removeTelemetryDataCache();
+    }
+
+    removeTelemetryDataCache() {
+        const telemetryCacheIds = Object.keys(this.telemetryDataCache);
+        Object.values(this.telemetryObjects).forEach(telemetryObject => {
+            const id = this.openmct.objects.makeKeyString(telemetryObject.identifier);
+            const foundIndex = telemetryCacheIds.indexOf(id);
+            if (foundIndex > -1) {
+                telemetryCacheIds.splice(foundIndex, 1);
+            }
+        });
+        telemetryCacheIds.forEach(id => {
+            delete (this.telemetryDataCache[id]);
+        });
+    }
+
+    formatData(data, telemetryObjects) {
+        if (data) {
+            this.telemetryDataCache[data.id] = this.computeResult(data);
+        }
+
+        let keys = Object.keys(telemetryObjects);
+        keys.forEach((key) => {
+            let telemetryObject = telemetryObjects[key];
+            const id = this.openmct.objects.makeKeyString(telemetryObject.identifier);
+            if (this.telemetryDataCache[id] === undefined) {
+                this.telemetryDataCache[id] = false;
+            }
+        });
+
+        const datum = {
+            result: evaluateResults(Object.values(this.telemetryDataCache), this.telemetry)
+        };
+
+        if (data) {
+            this.openmct.time.getAllTimeSystems().forEach(timeSystem => {
+                datum[timeSystem.key] = data[timeSystem.key]
+            });
+        }
+        return datum;
+    }
+
+    getResult(data, telemetryObjects) {
+        const validatedData = this.isValid() ? data : {};
+
+        if (validatedData) {
+            this.telemetryDataCache[validatedData.id] = this.computeResult(validatedData);
+        }
+
+        Object.values(telemetryObjects).forEach(telemetryObject => {
+            const id = this.openmct.objects.makeKeyString(telemetryObject.identifier);
+            if (this.telemetryDataCache[id] === undefined) {
+                this.telemetryDataCache[id] = false;
+            }
+        });
+
+        this.result = evaluateResults(Object.values(this.telemetryDataCache), this.telemetry);
+    }
+
+    requestLAD(telemetryObjects) {
+        const options = {
+            strategy: 'latest',
+            size: 1
+        };
+
+        if (!this.isValid()) {
+            return this.formatData({}, telemetryObjects);
+        }
+
+        let keys = Object.keys(Object.assign({}, telemetryObjects));
+        const telemetryRequests = keys
+            .map(key => this.openmct.telemetry.request(
+                telemetryObjects[key],
+                options
+            ));
+
+        let telemetryDataCache = {};
+        return Promise.all(telemetryRequests)
+            .then(telemetryRequestsResults => {
+                let latestTimestamp;
+                const timeSystems = this.openmct.time.getAllTimeSystems();
+                const timeSystem = this.openmct.time.timeSystem();
+
+                telemetryRequestsResults.forEach((results, index) => {
+                    const latestDatum = results.length ? results[results.length - 1] : {};
+                    const datumId = keys[index];
+                    const normalizedDatum = this.createNormalizedDatum(latestDatum, telemetryObjects[datumId]);
+
+                    telemetryDataCache[datumId] = this.computeResult(normalizedDatum);
+
+                    latestTimestamp = getLatestTimestamp(
+                        latestTimestamp,
+                        normalizedDatum,
+                        timeSystems,
+                        timeSystem
+                    );
+                });
+
+                const datum = {
+                    result: evaluateResults(Object.values(telemetryDataCache), this.telemetry),
+                    ...latestTimestamp
+                };
+
+                return {
+                    id: this.id,
+                    data: datum
+                };
+            });
+    }
+
+    destroy() {
+        delete this.telemetryObjects;
+        delete this.telemetryDataCache;
+    }
+}
--- a/src/plugins/condition/criterion/TelemetryCriterion.js
+++ b/src/plugins/condition/criterion/TelemetryCriterion.js
@@ -21,7 +21,7 @@
 *****************************************************************************/

 import EventEmitter from 'EventEmitter';
-import {OPERATIONS} from '../utils/operations';
+import { OPERATIONS } from '../utils/operations';

 export default class TelemetryCriterion extends EventEmitter {

@@ -36,52 +36,89 @@ export default class TelemetryCriterion extends EventEmitter {
        super();

        this.openmct = openmct;
-        this.objectAPI = this.openmct.objects;
-        this.telemetryAPI = this.openmct.telemetry;
-        this.timeAPI = this.openmct.time;
+        this.telemetryDomainObjectDefinition = telemetryDomainObjectDefinition;
        this.id = telemetryDomainObjectDefinition.id;
        this.telemetry = telemetryDomainObjectDefinition.telemetry;
        this.operation = telemetryDomainObjectDefinition.operation;
        this.input = telemetryDomainObjectDefinition.input;
        this.metadata = telemetryDomainObjectDefinition.metadata;
-        this.telemetryObjectIdAsString = undefined;
-        this.objectAPI.get(this.objectAPI.makeKeyString(this.telemetry)).then((obj) => this.initialize(obj));
-    }
+        this.result = undefined;

-    initialize(obj) {
-        this.telemetryObject = obj;
-        this.telemetryMetaData = this.openmct.telemetry.getMetadata(obj).valueMetadatas;
-        this.telemetryObjectIdAsString = this.objectAPI.makeKeyString(this.telemetry);
-        this.on(`subscription:${this.telemetryObjectIdAsString}`, this.handleSubscription);
+        this.initialize();
        this.emitEvent('criterionUpdated', this);
    }

-    formatData(data) {
-        const normalizedDatum = this.createNormalizedDatum(data);
-        const datum = {
-            result: this.computeResult(normalizedDatum)
-        }
+    initialize() {
+        this.telemetryObject = this.telemetryDomainObjectDefinition.telemetryObject;
+        this.telemetryObjectIdAsString = this.openmct.objects.makeKeyString(this.telemetryDomainObjectDefinition.telemetry);
+    }

-        if (normalizedDatum) {
-            // TODO check back to see if we should format times here
-            this.timeAPI.getAllTimeSystems().forEach(timeSystem => {
-                datum[timeSystem.key] = normalizedDatum[timeSystem.key]
+    isValid() {
+        return this.telemetryObject && this.metadata && this.operation;
+    }
+
+    updateTelemetry(telemetryObjects) {
+        this.telemetryObject = telemetryObjects[this.telemetryObjectIdAsString];
+    }
+
+    createNormalizedDatum(telemetryDatum, endpoint) {
+        const id = this.openmct.objects.makeKeyString(endpoint.identifier);
+        const metadata = this.openmct.telemetry.getMetadata(endpoint).valueMetadatas;
+
+        const normalizedDatum = Object.values(metadata).reduce((datum, metadatum) => {
+            const formatter = this.openmct.telemetry.getValueFormatter(metadatum);
+            datum[metadatum.key] = formatter.parse(telemetryDatum[metadatum.source]);
+            return datum;
+        }, {});
+
+        normalizedDatum.id = id;
+
+        return normalizedDatum;
+    }
+
+    formatData(data) {
+        const datum = {
+            result: this.computeResult(data)
+        };
+
+        if (data) {
+            this.openmct.time.getAllTimeSystems().forEach(timeSystem => {
+                datum[timeSystem.key] = data[timeSystem.key]
            });
        }
        return datum;
    }

-    handleSubscription(data) {
-        if(this.isValid()) {
-            this.emitEvent('criterionResultUpdated', this.formatData(data));
-        }
+    getResult(data) {
+        const validatedData = this.isValid() ? data : {};
+        this.result = this.computeResult(validatedData);
    }

-    createNormalizedDatum(telemetryDatum) {
-        return Object.values(this.telemetryMetaData).reduce((normalizedDatum, metadatum) => {
-            normalizedDatum[metadatum.key] = telemetryDatum[metadatum.source];
-            return normalizedDatum;
-        }, {});
+    requestLAD() {
+        const options = {
+            strategy: 'latest',
+            size: 1
+        };
+
+        if (!this.isValid()) {
+            return {
+                id: this.id,
+                data: this.formatData({})
+            };
+        }
+
+        return this.openmct.telemetry.request(
+            this.telemetryObject,
+            options
+        ).then(results => {
+            const latestDatum = results.length ? results[results.length - 1] : {};
+            const normalizedDatum = this.createNormalizedDatum(latestDatum, this.telemetryObject);
+
+            return {
+                id: this.id,
+                data: this.formatData(normalizedDatum)
+            };
+        });
    }

    findOperation(operation) {
@@ -103,7 +140,7 @@ export default class TelemetryCriterion extends EventEmitter {
                this.input.forEach(input => params.push(input));
            }
            if (typeof comparator === 'function') {
-                result = comparator(params);
+                result = !!comparator(params);
            }
        }
        return result;
@@ -116,39 +153,9 @@ export default class TelemetryCriterion extends EventEmitter {
        });
    }

-    isValid() {
-        return this.telemetryObject && this.metadata && this.operation;
-    }
-
-    requestLAD(options) {
-        options = Object.assign({},
-            options,
-            {
-                strategy: 'latest',
-                size: 1
-            }
-        );
-
-        if (!this.isValid()) {
-            return this.formatData({});
-        }
-
-        return this.telemetryAPI.request(
-            this.telemetryObject,
-            options
-        ).then(results => {
-            const latestDatum = results.length ? results[results.length - 1] : {};
-            return {
-                id: this.id,
-                data: this.formatData(latestDatum)
-            };
-        });
-    }

    destroy() {
-        this.off(`subscription:${this.telemetryObjectIdAsString}`, this.handleSubscription);
-        this.emitEvent('criterionRemoved');
-        delete this.telemetryObjectIdAsString;
        delete this.telemetryObject;
+        delete this.telemetryObjectIdAsString;
    }
 }
--- a/src/plugins/condition/criterion/TelemetryCriterionSpec.js
+++ b/src/plugins/condition/criterion/TelemetryCriterionSpec.js
@@ -24,7 +24,6 @@ import TelemetryCriterion from "./TelemetryCriterion";

 let openmct = {},
    mockListener,
-    mockListener2,
    testCriterionDefinition,
    testTelemetryObject,
    telemetryCriterion;
@@ -55,18 +54,20 @@ describe("The telemetry criterion", function () {
                    key: "testSource",
                    source: "value",
                    name: "Test",
-                    format: "enum"
+                    format: "string"
                }]
            }
        };
        openmct.objects = jasmine.createSpyObj('objects', ['get', 'makeKeyString']);
-        openmct.objects.get.and.returnValue(new Promise(function (resolve, reject) {
-            resolve(testTelemetryObject);
-        }));
        openmct.objects.makeKeyString.and.returnValue(testTelemetryObject.identifier.key);
-        openmct.telemetry = jasmine.createSpyObj('telemetry', ['isTelemetryObject', "subscribe", "getMetadata"]);
+        openmct.telemetry = jasmine.createSpyObj('telemetry', ['isTelemetryObject', "subscribe", "getMetadata", "getValueFormatter"]);
        openmct.telemetry.isTelemetryObject.and.returnValue(true);
        openmct.telemetry.subscribe.and.returnValue(function () {});
+        openmct.telemetry.getValueFormatter.and.returnValue({
+            parse: function (value) {
+                return value;
+            }
+        });
        openmct.telemetry.getMetadata.and.returnValue(testTelemetryObject.telemetry);

        openmct.time = jasmine.createSpyObj('timeAPI',
@@ -79,14 +80,13 @@ describe("The telemetry criterion", function () {
        testCriterionDefinition = {
            id: 'test-criterion-id',
            telemetry: openmct.objects.makeKeyString(testTelemetryObject.identifier),
-            operation: 'lessThan',
-            metadata: 'sin'
+            operation: 'textContains',
+            metadata: 'value',
+            input: ['Hell'],
+            telemetryObject: testTelemetryObject
        };

        mockListener = jasmine.createSpy('listener');
-        mockListener2 = jasmine.createSpy('updatedListener', (data) => {
-            console.log(data);
-        });

        telemetryCriterion = new TelemetryCriterion(
            testCriterionDefinition,
@@ -94,23 +94,28 @@ describe("The telemetry criterion", function () {
        );

        telemetryCriterion.on('criterionResultUpdated', mockListener);
-        telemetryCriterion.on('criterionUpdated', mockListener2);

    });

    it("initializes with a telemetry objectId as string", function () {
-        telemetryCriterion.initialize(testTelemetryObject);
        expect(telemetryCriterion.telemetryObjectIdAsString).toEqual(testTelemetryObject.identifier.key);
-        expect(mockListener2).toHaveBeenCalled();
    });

-    it("updates and emits event on new data from telemetry providers", function () {
-        telemetryCriterion.initialize(testTelemetryObject);
-        spyOn(telemetryCriterion, 'emitEvent').and.callThrough();
-        telemetryCriterion.handleSubscription({
+    it("returns a result on new data from relevant telemetry providers", function () {
+        telemetryCriterion.getResult({
            value: 'Hello',
-            utc: 'Hi'
+            utc: 'Hi',
+            id: testTelemetryObject.identifier.key
        });
-        expect(telemetryCriterion.emitEvent).toHaveBeenCalled();
+        expect(telemetryCriterion.result).toBeTrue();
    });
+
+    // it("does not return a result on new data from irrelavant telemetry providers", function () {
+    //     telemetryCriterion.getResult({
+    //         value: 'Hello',
+    //         utc: 'Hi',
+    //         id: '1234'
+    //     });
+    //     expect(telemetryCriterion.result).toBeFalse();
+    // });
 });
--- a/src/plugins/condition/plugin.js
+++ b/src/plugins/condition/plugin.js
@@ -33,17 +33,18 @@ export default function ConditionPlugin() {
        openmct.types.addType('conditionSet', {
            name: 'Condition Set',
            key: 'conditionSet',
-            description: 'A set of one or more conditions based on user-specified criteria.',
+            description: 'Monitor and evaluate telemetry values in real-time with a wide variety of criteria. Use to control the styling of many objects in Open MCT.',
            creatable: true,
            cssClass: 'icon-conditional',
            initialize: function (domainObject) {
                domainObject.configuration = {
+                    conditionTestData: [],
                    conditionCollection: [{
                        isDefault: true,
                        id: uuid(),
                        configuration: {
                            name: 'Default',
-                            output: 'false',
+                            output: 'Default',
                            trigger: 'all',
                            criteria: []
                        },
--- a/src/plugins/condition/utils/constants.js
+++ b/src/plugins/condition/utils/constants.js
@@ -1,6 +1,37 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
 export const TRIGGER = {
    ANY: 'any',
-    ALL: 'all'
+    ALL: 'all',
+    NOT: 'not',
+    XOR: 'xor'
+};
+
+export const TRIGGER_LABEL = {
+    'any': 'when any criteria are met',
+    'all': 'when all criteria are met',
+    'not': 'when no criteria are met',
+    'xor': 'when only one criteria is met'
 };

 export const STYLE_CONSTANTS = {
--- a/src/plugins/condition/utils/evaluator.js
+++ b/src/plugins/condition/utils/evaluator.js
@@ -1,16 +1,68 @@
-export const computeCondition = (resultMap, allMustBeTrue) => {
-    let result = false;
-    for (let key in resultMap) {
-        if (resultMap.hasOwnProperty(key)) {
-            result = resultMap[key];
-            if (allMustBeTrue && !result) {
-                //If we want all conditions to be true, then even one negative result should break.
-                break;
-            } else if (!allMustBeTrue && result) {
-                //If we want at least one condition to be true, then even one positive result should break.
-                break;
-            }
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+import { TRIGGER } from "./constants";
+
+export const evaluateResults = (results, trigger) => {
+    if (trigger && trigger === TRIGGER.XOR) {
+        return matchExact(results, 1);
+    } else if (trigger && trigger === TRIGGER.NOT) {
+        return matchExact(results, 0);
+    } else if (trigger && trigger === TRIGGER.ALL) {
+        return matchAll(results);
+    } else {
+        return matchAny(results);
+    }
+}
+
+function matchAll(results) {
+    for (const result of results) {
+        if (!result) {
+            return false;
        }
    }
-    return result;
-};
+
+    return true;
+}
+
+function matchAny(results) {
+    for (const result of results) {
+        if (result) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+function matchExact(results, target) {
+    let matches = 0;
+    for (const result of results) {
+        if (result) {
+            matches++;
+        }
+        if (matches > target) {
+            return false;
+        }
+    }
+
+    return matches === target;
+}
--- a/src/plugins/condition/utils/evaluatorSpec.js
+++ b/src/plugins/condition/utils/evaluatorSpec.js
@@ -0,0 +1,204 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+import { evaluateResults } from './evaluator';
+import { TRIGGER } from './constants';
+
+describe('evaluate results', () => {
+    // const allTrue = [true, true, true, true, true];
+    // const oneTrue = [false, false, false, false, true];
+    // const multipleTrue = [false, true, false, true, false];
+    // const noneTrue = [false, false, false, false, false];
+    // const allTrueWithUndefined = [true, true, true, undefined, true];
+    // const oneTrueWithUndefined = [undefined, undefined, undefined, undefined, true];
+    // const multipleTrueWithUndefined = [true, undefined, true, undefined, true];
+    // const allUndefined = [undefined, undefined, undefined, undefined, undefined];
+    // const singleTrue = [true];
+    // const singleFalse = [false];
+    // const singleUndefined = [undefined];
+    // const empty = [];
+
+    const tests = [
+        {
+            name: 'allTrue',
+            values: [true, true, true, true, true],
+            any: true,
+            all: true,
+            not: false,
+            xor: false
+        }, {
+            name: 'oneTrue',
+            values: [false, false, false, false, true],
+            any: true,
+            all: false,
+            not: false,
+            xor: true
+        }, {
+            name: 'multipleTrue',
+            values: [false, true, false, true, false],
+            any: true,
+            all: false,
+            not: false,
+            xor: false
+        }, {
+            name: 'noneTrue',
+            values: [false, false, false, false, false],
+            any: false,
+            all: false,
+            not: true,
+            xor: false
+        }, {
+            name: 'allTrueWithUndefined',
+            values: [true, true, true, undefined, true],
+            any: true,
+            all: false,
+            not: false,
+            xor: false
+        }, {
+            name: 'oneTrueWithUndefined',
+            values: [undefined, undefined, undefined, undefined, true],
+            any: true,
+            all: false,
+            not: false,
+            xor: true
+        }, {
+            name: 'multipleTrueWithUndefined',
+            values: [true, undefined, true, undefined, true],
+            any: true,
+            all: false,
+            not: false,
+            xor: false
+        }, {
+            name: 'allUndefined',
+            values: [undefined, undefined, undefined, undefined, undefined],
+            any: false,
+            all: false,
+            not: true,
+            xor: false
+        }, {
+            name: 'singleTrue',
+            values: [true],
+            any: true,
+            all: true,
+            not: false,
+            xor: true
+        }, {
+            name: 'singleFalse',
+            values: [false],
+            any: false,
+            all: false,
+            not: true,
+            xor: false
+        }, {
+            name: 'singleUndefined',
+            values: [undefined],
+            any: false,
+            all: false,
+            not: true,
+            xor: false
+        }
+        // , {
+        //     name: 'empty',
+        //     values: [],
+        //     any: false,
+        //     all: false,
+        //     not: true,
+        //     xor: false
+        // }
+    ];
+
+    describe(`based on trigger ${TRIGGER.ANY}`, () => {
+        it('should evaluate to expected result', () => {
+            tests.forEach(test => {
+                const result = evaluateResults(test.values, TRIGGER.ANY);
+                expect(result).toEqual(test[TRIGGER.ANY])
+            });
+        });
+    });
+
+    describe(`based on trigger ${TRIGGER.ALL}`, () => {
+        it('should evaluate to expected result', () => {
+            tests.forEach(test => {
+                const result = evaluateResults(test.values, TRIGGER.ALL);
+                expect(result).toEqual(test[TRIGGER.ALL])
+            });
+        });
+    });
+
+    describe(`based on trigger ${TRIGGER.NOT}`, () => {
+        it('should evaluate to expected result', () => {
+            tests.forEach(test => {
+                const result = evaluateResults(test.values, TRIGGER.NOT);
+                expect(result).toEqual(test[TRIGGER.NOT])
+            });
+        });
+    });
+
+    describe(`based on trigger ${TRIGGER.XOR}`, () => {
+        it('should evaluate to expected result', () => {
+            tests.forEach(test => {
+                const result = evaluateResults(test.values, TRIGGER.XOR);
+                expect(result).toEqual(test[TRIGGER.XOR])
+            });
+        });
+    });
+
+    // it('should evaluate to true if trigger is NOT', () => {
+    //     const results = {
+    //         result: false,
+    //         result1: false,
+    //         result2: false
+    //     };
+    //     const result = computeConditionByLimit(results, 0);
+    //     expect(result).toBeTrue();
+    // });
+
+    // it('should evaluate to false if trigger is NOT', () => {
+    //     const results = {
+    //         result: true,
+    //         result1: false,
+    //         result2: false
+    //     };
+    //     const result = computeConditionByLimit(results, 0);
+    //     expect(result).toBeFalse();
+    // });
+
+    // it('should evaluate to true if trigger is XOR', () => {
+    //     const results = {
+    //         result: false,
+    //         result1: true,
+    //         result2: false
+    //     };
+    //     const result = computeConditionByLimit(results, 1);
+    //     expect(result).toBeTrue();
+    // });
+
+    // it('should evaluate to false if trigger is XOR', () => {
+    //     const results = {
+    //         result: false,
+    //         result1: true,
+    //         result2: true
+    //     };
+    //     const result = computeConditionByLimit(results, 1);
+    //     expect(result).toBeFalse();
+    // });
+});
--- a/src/plugins/condition/utils/operations.js
+++ b/src/plugins/condition/utils/operations.js
@@ -1,98 +1,144 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+import _ from 'lodash';
+
+const convertToNumbers = (input) => {
+    let numberInputs = [];
+    input.forEach(inputValue => numberInputs.push(Number(inputValue)));
+    return numberInputs;
+};
+
+const convertToStrings = (input) => {
+    let stringInputs = [];
+    input.forEach(inputValue => stringInputs.push(inputValue !== undefined ? inputValue.toString() : ''));
+    return stringInputs;
+};
+
+const joinValues = (values, length) => {
+    return values.slice(0, length).join(', ');
+};
+
 export const OPERATIONS = [
    {
        name: 'equalTo',
        operation: function (input) {
-            return input[0] === input[1];
+            return Number(input[0]) === Number(input[1]);
        },
        text: 'is equal to',
        appliesTo: ['number'],
        inputCount: 1,
        getDescription: function (values) {
-            return ' is ' + values.join(', ');
+            return ' is ' + joinValues(values, 1);
        }
    },
    {
        name: 'notEqualTo',
        operation: function (input) {
-            return input[0] !== input[1];
+            return Number(input[0]) !== Number(input[1]);
        },
        text: 'is not equal to',
        appliesTo: ['number'],
        inputCount: 1,
        getDescription: function (values) {
-            return ' is not ' + values.join(', ');
+            return ' is not ' + joinValues(values, 1);
        }
    },
    {
        name: 'greaterThan',
        operation: function (input) {
-            return input[0] > input[1];
+            return Number(input[0]) > Number(input[1]);
        },
        text: 'is greater than',
        appliesTo: ['number'],
        inputCount: 1,
        getDescription: function (values) {
-            return ' > ' + values.join(', ');
+            return ' > ' + joinValues(values, 1);
        }
    },
    {
        name: 'lessThan',
        operation: function (input) {
-            return input[0] < input[1];
+            return Number(input[0]) < Number(input[1]);
        },
        text: 'is less than',
        appliesTo: ['number'],
        inputCount: 1,
        getDescription: function (values) {
-            return ' < ' + values.join(', ');
+            return ' < ' + joinValues(values, 1);
        }
    },
    {
        name: 'greaterThanOrEq',
        operation: function (input) {
-            return input[0] >= input[1];
+            return Number(input[0]) >= Number(input[1]);
        },
        text: 'is greater than or equal to',
        appliesTo: ['number'],
        inputCount: 1,
        getDescription: function (values) {
-            return ' >= ' + values.join(', ');
+            return ' >= ' + joinValues(values, 1);
        }
    },
    {
        name: 'lessThanOrEq',
        operation: function (input) {
-            return input[0] <= input[1];
+            return Number(input[0]) <= Number(input[1]);
        },
        text: 'is less than or equal to',
        appliesTo: ['number'],
        inputCount: 1,
        getDescription: function (values) {
-            return ' <= ' + values.join(', ');
+            return ' <= ' + joinValues(values, 1);
        }
    },
    {
        name: 'between',
        operation: function (input) {
-            return input[0] > input[1] && input[0] < input[2];
+            let numberInputs = convertToNumbers(input);
+            let larger = Math.max(...numberInputs.slice(1,3));
+            let smaller = Math.min(...numberInputs.slice(1,3));
+            return (numberInputs[0] > smaller) && (numberInputs[0] < larger);
        },
        text: 'is between',
        appliesTo: ['number'],
        inputCount: 2,
        getDescription: function (values) {
-            return ' is between ' + values.join(', ') + ' and ' + values[1];
+            return ' is between ' + values[0] + ' and ' + values[1];
        }
    },
    {
        name: 'notBetween',
        operation: function (input) {
-            return input[0] < input[1] || input[0] > input[2];
+            let numberInputs = convertToNumbers(input);
+            let larger = Math.max(...numberInputs.slice(1,3));
+            let smaller = Math.min(...numberInputs.slice(1,3));
+            return (numberInputs[0] < smaller) || (numberInputs[0] > larger);
        },
        text: 'is not between',
        appliesTo: ['number'],
        inputCount: 2,
        getDescription: function (values) {
-            return ' is not between ' + values.join(', ') + ' and ' + values[1];
+            return ' is not between ' + values[0] + ' and ' + values[1];
        }
    },
    {
@@ -104,7 +150,7 @@ export const OPERATIONS = [
        appliesTo: ['string'],
        inputCount: 1,
        getDescription: function (values) {
-            return ' contains ' + values.join(', ');
+            return ' contains ' + joinValues(values, 1);
        }
    },
    {
@@ -116,7 +162,7 @@ export const OPERATIONS = [
        appliesTo: ['string'],
        inputCount: 1,
        getDescription: function (values) {
-            return ' does not contain ' + values.join(', ');
+            return ' does not contain ' + joinValues(values, 1);
        }
    },
    {
@@ -128,7 +174,7 @@ export const OPERATIONS = [
        appliesTo: ['string'],
        inputCount: 1,
        getDescription: function (values) {
-            return ' starts with ' + values.join(', ');
+            return ' starts with ' + joinValues(values, 1);
        }
    },
    {
@@ -140,7 +186,7 @@ export const OPERATIONS = [
        appliesTo: ['string'],
        inputCount: 1,
        getDescription: function (values) {
-            return ' ends with ' + values.join(', ');
+            return ' ends with ' + joinValues(values, 1);
        }
    },
    {
@@ -152,7 +198,7 @@ export const OPERATIONS = [
        appliesTo: ['string'],
        inputCount: 1,
        getDescription: function (values) {
-            return ' is exactly ' + values.join(', ');
+            return ' is exactly ' + joinValues(values, 1);
        }
    },
    {
@@ -182,25 +228,62 @@ export const OPERATIONS = [
    {
        name: 'enumValueIs',
        operation: function (input) {
-            return input[0] === input[1];
+            let stringInputs = convertToStrings(input);
+            return stringInputs[0] === stringInputs[1];
        },
        text: 'is',
        appliesTo: ['enum'],
        inputCount: 1,
        getDescription: function (values) {
-            return ' is ' + values.join(', ');
+            return ' is ' + joinValues(values, 1);
        }
    },
    {
        name: 'enumValueIsNot',
        operation: function (input) {
-            return input[0] !== input[1];
+            let stringInputs = convertToStrings(input);
+            return stringInputs[0] !== stringInputs[1];
        },
        text: 'is not',
        appliesTo: ['enum'],
        inputCount: 1,
        getDescription: function (values) {
-            return ' is not ' + values.join(', ');
+            return ' is not ' + joinValues(values, 1);
+        }
+    },
+    {
+        name: 'valueIs',
+        operation: function (input) {
+            const lhsValue = input[0] !== undefined ? input[0].toString() : '';
+            if (input[1]) {
+                const values = input[1].split(',');
+                return values.find((value) => lhsValue === _.trim(value.toString()));
+            }
+            return false;
+        },
+        text: 'is one of',
+        appliesTo: ["string", "number"],
+        inputCount: 1,
+        getDescription: function (values) {
+            return ' is one of ' + values[0];
+        }
+    },
+    {
+        name: 'valueIsNot',
+        operation: function (input) {
+            const lhsValue = input[0] !== undefined ? input[0].toString() : '';
+            if (input[1]) {
+                const values = input[1].split(',');
+                const found = values.find((value) => lhsValue === _.trim(value.toString()));
+                return !found;
+            }
+            return false;
+        },
+        text: 'is not one of',
+        appliesTo: ["string", "number"],
+        inputCount: 1,
+        getDescription: function (values) {
+            return ' is not one of ' + values[0];
        }
    }
 ];
--- a/src/plugins/condition/utils/operationsSpec.js
+++ b/src/plugins/condition/utils/operationsSpec.js
@@ -0,0 +1,142 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+import { OPERATIONS } from "./operations";
+let isOneOfOperation = OPERATIONS.find((operation) => operation.name === 'valueIs');
+let isNotOneOfOperation = OPERATIONS.find((operation) => operation.name === 'valueIsNot');
+let isBetween = OPERATIONS.find((operation) => operation.name === 'between');
+let isNotBetween = OPERATIONS.find((operation) => operation.name === 'notBetween');
+let enumIsOperation = OPERATIONS.find((operation) => operation.name === 'enumValueIs');
+let enumIsNotOperation = OPERATIONS.find((operation) => operation.name === 'enumValueIsNot');
+
+describe('operations', function () {
+
+    it('should evaluate isOneOf to true for number inputs', () => {
+        const inputs = [45, "5,6,45,8"];
+        expect(!!isOneOfOperation.operation(inputs)).toBeTrue();
+    });
+
+    it('should evaluate isOneOf to true for string inputs', () => {
+        const inputs = ["45", " 45, 645, 4,8 "];
+        expect(!!isOneOfOperation.operation(inputs)).toBeTrue();
+    });
+
+    it('should evaluate isNotOneOf to true for number inputs', () => {
+        const inputs = [45, "5,6,4,8"];
+        expect(!!isNotOneOfOperation.operation(inputs)).toBeTrue();
+    });
+
+    it('should evaluate isNotOneOf to true for string inputs', () => {
+        const inputs = ["45", " 5,645, 4,8 "];
+        expect(!!isNotOneOfOperation.operation(inputs)).toBeTrue();
+    });
+
+    it('should evaluate isOneOf to false for number inputs', () => {
+        const inputs = [4, "5, 6, 7, 8"];
+        expect(!!isOneOfOperation.operation(inputs)).toBeFalse();
+    });
+
+    it('should evaluate isOneOf to false for string inputs', () => {
+        const inputs = ["4", "5,645 ,7,8"];
+        expect(!!isOneOfOperation.operation(inputs)).toBeFalse();
+    });
+
+    it('should evaluate isNotOneOf to false for number inputs', () => {
+        const inputs = [4, "5,4, 7,8"];
+        expect(!!isNotOneOfOperation.operation(inputs)).toBeFalse();
+    });
+
+    it('should evaluate isNotOneOf to false for string inputs', () => {
+        const inputs = ["4", "5,46,4,8"];
+        expect(!!isNotOneOfOperation.operation(inputs)).toBeFalse();
+    });
+
+    it('should evaluate isBetween to true', () => {
+        const inputs = ["4", "3", "89"];
+        expect(!!isBetween.operation(inputs)).toBeTrue();
+    });
+
+    it('should evaluate isNotBetween to true', () => {
+        const inputs = ["45", "100", "89"];
+        expect(!!isNotBetween.operation(inputs)).toBeTrue();
+    });
+
+    it('should evaluate isBetween to false', () => {
+        const inputs = ["4", "100", "89"];
+        expect(!!isBetween.operation(inputs)).toBeFalse();
+    });
+
+    it('should evaluate isNotBetween to false', () => {
+        const inputs = ["45", "30", "50"];
+        expect(!!isNotBetween.operation(inputs)).toBeFalse();
+    });
+
+    it('should evaluate enumValueIs to true for number inputs', () => {
+        const inputs = [1, "1"];
+        expect(!!enumIsOperation.operation(inputs)).toBeTrue();
+    });
+
+    it('should evaluate enumValueIs to true for string inputs', () => {
+        const inputs = ["45", "45"];
+        expect(!!enumIsOperation.operation(inputs)).toBeTrue();
+    });
+
+    it('should evaluate enumValueIsNot to true for number inputs', () => {
+        const inputs = [45, "46"];
+        expect(!!enumIsNotOperation.operation(inputs)).toBeTrue();
+    });
+
+    it('should evaluate enumValueIsNot to true for string inputs', () => {
+        const inputs = ["45", "46"];
+        expect(!!enumIsNotOperation.operation(inputs)).toBeTrue();
+    });
+
+    it('should evaluate enumValueIs to false for number inputs', () => {
+        const inputs = [1, "2"];
+        expect(!!enumIsOperation.operation(inputs)).toBeFalse();
+    });
+
+    it('should evaluate enumValueIs to false for string inputs', () => {
+        const inputs = ["45", "46"];
+        expect(!!enumIsOperation.operation(inputs)).toBeFalse();
+    });
+
+    it('should evaluate enumValueIsNot to false for number inputs', () => {
+        const inputs = [45, "45"];
+        expect(!!enumIsNotOperation.operation(inputs)).toBeFalse();
+    });
+
+    it('should evaluate enumValueIsNot to false for string inputs', () => {
+        const inputs = ["45", "45"];
+        expect(!!enumIsNotOperation.operation(inputs)).toBeFalse();
+    });
+
+    it('should evaluate enumValueIs to false for undefined input', () => {
+        const inputs = [undefined, "45"];
+        expect(!!enumIsOperation.operation(inputs)).toBeFalse();
+    });
+
+    it('should evaluate enumValueIsNot to true for undefined input', () => {
+        const inputs = [undefined, "45"];
+        expect(!!enumIsNotOperation.operation(inputs)).toBeTrue();
+    });
+});
--- a/src/plugins/condition/utils/styleUtils.js
+++ b/src/plugins/condition/utils/styleUtils.js
@@ -1,23 +1,172 @@
-export const getStyleProp = (key, defaultValue) => {
-    let styleProp = undefined;
-    switch(key) {
-    case 'fill': styleProp = {
-        backgroundColor: defaultValue || 'transparent'
-    };
-        break;
-    case 'stroke': styleProp = {
-        border: '1px solid ' + (defaultValue || 'transparent')
-    };
-        break;
-    case 'color': styleProp = {
-        color: defaultValue || 'transparent'
-    };
-        break;
-    case 'url': styleProp = {
-        imageUrl: defaultValue || 'transparent'
-    };
-        break;
-    }
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+const NONE_VALUE = '__no_value';

-    return styleProp;
+const styleProps = {
+    backgroundColor: {
+        svgProperty: 'fill',
+        noneValue: NONE_VALUE,
+        applicableForType: type => {
+            return !type ? true : (type === 'text-view' ||
+                                      type === 'telemetry-view' ||
+                                      type === 'box-view' ||
+                                      type === 'subobject-view');
+        }
+    },
+    border: {
+        svgProperty: 'stroke',
+        noneValue: NONE_VALUE,
+        applicableForType: type => {
+            return !type ? true : (type === 'text-view' ||
+                                            type === 'telemetry-view' ||
+                                            type === 'box-view' ||
+                                            type === 'image-view' ||
+                                            type === 'line-view'||
+                                            type === 'subobject-view');
+        }
+    },
+    color: {
+        svgProperty: 'color',
+        noneValue: NONE_VALUE,
+        applicableForType: type => {
+            return !type ? true : (type === 'text-view' ||
+                                    type === 'telemetry-view'||
+                                    type === 'subobject-view');
+        }
+    },
+    imageUrl: {
+        svgProperty: 'url',
+        noneValue: '',
+        applicableForType: type => {
+            return !type ? false : type === 'image-view';
+        }
+    }
+};
+
+const aggregateStyleValues = (accumulator, currentStyle) => {
+    const styleKeys = Object.keys(currentStyle);
+    const properties = Object.keys(styleProps);
+    properties.forEach((property) => {
+        if (!accumulator[property]) {
+            accumulator[property] = [];
+        }
+        const found = styleKeys.find(key => key === property);
+        if (found) {
+            accumulator[property].push(currentStyle[found]);
+        }
+    });
+    return accumulator;
+};
+
+// Returns a union of styles used by multiple items.
+// Styles that are common to all items but don't have the same value are added to the mixedStyles list
+export const getConsolidatedStyleValues = (multipleItemStyles) => {
+    let aggregatedStyleValues = multipleItemStyles.reduce(aggregateStyleValues, {});
+
+    let styleValues = {};
+    let mixedStyles = [];
+    const properties = Object.keys(styleProps);
+    properties.forEach((property) => {
+        const values = aggregatedStyleValues[property];
+        if (values.length) {
+            if (values.every(value => value === values[0])) {
+                styleValues[property] = values[0];
+            } else {
+                styleValues[property] = '';
+                mixedStyles.push(property);
+            }
+        }
+    });
+    return {
+        styles: styleValues,
+        mixedStyles
+    };
+};
+
+const getStaticStyleForItem = (domainObject, id) => {
+    let domainObjectStyles = domainObject && domainObject.configuration && domainObject.configuration.objectStyles;
+    if (domainObjectStyles) {
+        if (id) {
+            if(domainObjectStyles[id] && domainObjectStyles[id].staticStyle) {
+                return domainObjectStyles[id].staticStyle.style;
+            }
+        } else if (domainObjectStyles.staticStyle) {
+            return domainObjectStyles.staticStyle.style;
+        }
+    }
+};
+
+export const getConditionalStyleForItem = (domainObject, id) => {
+    let domainObjectStyles = domainObject && domainObject.configuration && domainObject.configuration.objectStyles;
+    if (domainObjectStyles) {
+        if (id) {
+            if (domainObjectStyles[id] && domainObjectStyles[id].conditionSetIdentifier) {
+                return domainObjectStyles[id].styles;
+            }
+        } else if (domainObjectStyles.staticStyle) {
+            return domainObjectStyles.styles;
+        }
+    }
+};
+
+//Returns either existing static styles or uses SVG defaults if available
+export const getApplicableStylesForItem = (domainObject, item) => {
+    const type = item && item.type;
+    const id = item && item.id;
+    let style = {};
+
+    let staticStyle = getStaticStyleForItem(domainObject, id);
+
+    const properties = Object.keys(styleProps);
+    properties.forEach(property => {
+        const styleProp = styleProps[property];
+        if (styleProp.applicableForType(type)) {
+            let defaultValue;
+            if (staticStyle) {
+                defaultValue = staticStyle[property];
+            } else if (item) {
+                defaultValue = item[styleProp.svgProperty];
+            }
+            style[property] = defaultValue === undefined ? styleProp.noneValue : defaultValue;
+        }
+    });
+
+    return style;
+};
+
+export const getStylesWithoutNoneValue = (style) => {
+    if (_.isEmpty(style) || !style) {
+        return;
+    }
+    let styleObj = {};
+    const keys = Object.keys(style);
+    keys.forEach(key => {
+        if ((typeof style[key] === 'string')) {
+            if (style[key].indexOf('__no_value') > -1) {
+                style[key] = '';
+            } else {
+                styleObj[key] = style[key];
+            }
+        }
+    });
+    return styleObj;
 };
--- a/src/plugins/condition/utils/time.js
+++ b/src/plugins/condition/utils/time.js
@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+export const getLatestTimestamp = (
+    currentTimestamp,
+    compareTimestamp,
+    timeSystems,
+    currentTimeSystem
+) => {
+    let latest = { ...currentTimestamp };
+    const compare = { ...compareTimestamp };
+    const key = currentTimeSystem.key;
+
+    if (!latest || !latest[key]) {
+        latest = updateLatestTimeStamp(compare, timeSystems)
+    }
+
+    if (compare[key] > latest[key]) {
+        latest = updateLatestTimeStamp(compare, timeSystems)
+    }
+
+    return latest;
+}
+
+function updateLatestTimeStamp(timestamp, timeSystems) {
+    let latest = {};
+
+    timeSystems.forEach(timeSystem => {
+        latest[timeSystem.key] = timestamp[timeSystem.key];
+    });
+
+    return latest;
+}
--- a/src/plugins/conditionWidget/ConditionWidgetViewProvider.js
+++ b/src/plugins/conditionWidget/ConditionWidgetViewProvider.js
@@ -0,0 +1,64 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+import ConditionWidgetComponent from './components/ConditionWidget.vue';
+import Vue from 'vue';
+
+export default function ConditionWidget(openmct) {
+    return {
+        key: 'conditionWidget',
+        name: 'Condition Widget',
+        cssClass: 'icon-condition-widget',
+        canView: function (domainObject) {
+            return domainObject.type === 'conditionWidget';
+        },
+        canEdit: function (domainObject) {
+            return domainObject.type === 'conditionWidget';
+        },
+        view: function (domainObject) {
+            let component;
+
+            return {
+                show: function (element) {
+                    component =  new Vue({
+                        el: element,
+                        components: {
+                            ConditionWidgetComponent: ConditionWidgetComponent
+                        },
+                        provide: {
+                            openmct,
+                            domainObject
+                        },
+                        template: '<condition-widget-component></condition-widget-component>'
+                    });
+                },
+                destroy: function (element) {
+                    component.$destroy();
+                    component = undefined;
+                }
+            };
+        },
+        priority: function () {
+            return 1;
+        }
+    };
+}
--- a/src/plugins/conditionWidget/components/ConditionWidget.vue
+++ b/src/plugins/conditionWidget/components/ConditionWidget.vue
@@ -0,0 +1,61 @@
+/*****************************************************************************
+* Open MCT, Copyright (c) 2014-2020, United States Government
+* as represented by the Administrator of the National Aeronautics and Space
+* Administration. All rights reserved.
+*
+* Open MCT is licensed under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0.
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+* License for the specific language governing permissions and limitations
+* under the License.
+*
+* Open MCT includes source code licensed under additional open source
+* licenses. See the Open Source Licenses file (LICENSES.md) included with
+* this source code distribution or the Licensing information page available
+* at runtime from the About dialog for additional information.
+*****************************************************************************/
+
+<template>
+<component :is="urlDefined ? 'a' : 'span'"
+           class="c-condition-widget"
+           :href="urlDefined ? internalDomainObject.url : null"
+>
+    <div class="c-condition-widget__label">
+        {{ internalDomainObject.label }}
+    </div>
+</component>
+</template>
+
+<script>
+export default {
+    inject: ['openmct', 'domainObject'],
+    data: function () {
+        return {
+            internalDomainObject: this.domainObject
+        }
+    },
+    computed: {
+        urlDefined() {
+            return this.internalDomainObject.url && this.internalDomainObject.url.length > 0;
+        }
+    },
+    mounted() {
+        this.unlisten = this.openmct.objects.observe(this.internalDomainObject, '*', this.updateInternalDomainObject);
+    },
+    beforeDestroy() {
+        if (this.unlisten) {
+            this.unlisten();
+        }
+    },
+    methods: {
+        updateInternalDomainObject(domainObject) {
+            this.internalDomainObject = domainObject;
+        }
+    }
+}
+</script>
--- a/src/plugins/conditionWidget/components/condition-widget.scss
+++ b/src/plugins/conditionWidget/components/condition-widget.scss
@@ -0,0 +1,60 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+.c-condition-widget {
+    $shdwSize: 3px;
+    @include userSelectNone();
+    background-color: rgba($colorBodyFg, 0.1); // Give a little presence if the user hasn't defined a fill color
+    border-radius: $basicCr;
+    border: 1px solid transparent;
+    display: inline-block;
+    padding: $interiorMarginLg $interiorMarginLg * 2;
+}
+
+a.c-condition-widget {
+    // Widget is conditionally made into a <a> when URL property has been defined
+    cursor: pointer !important;
+    pointer-events: inherit;
+}
+
+// Make Condition Widget expand when in a hidden frame Layout context
+// For both static and Flexible Layouts
+.c-so-view--no-frame > .c-so-view__object-view > .c-condition-widget {
+    @include abs();
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0;
+}
+
+// Add some margin when a Condition Widget is in a Flexible Layout
+.c-fl .c-so-view--no-frame .c-condition-widget {
+    @include abs(1px);
+}
+
+// When the widget is in the main view, center it in the space
+.l-shell__main-container > .c-condition-widget {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+}
--- a/src/plugins/conditionWidget/plugin.js
+++ b/src/plugins/conditionWidget/plugin.js
@@ -0,0 +1,58 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+import ConditionWidgetViewProvider from './ConditionWidgetViewProvider.js';
+
+export default function plugin() {
+    return function install(openmct) {
+        openmct.objectViews.addProvider(new ConditionWidgetViewProvider(openmct));
+
+        openmct.types.addType('conditionWidget', {
+            name: "Condition Widget",
+            description: "A button that can be used on its own, or dynamically styled with a Condition Set.",
+            creatable: true,
+            cssClass: 'icon-condition-widget',
+            initialize(domainObject) {
+                domainObject.label = 'Condition Widget';
+            },
+            form: [
+                {
+                    "key": "label",
+                    "name": "Label",
+                    "control": "textfield",
+                    property: [
+                        "label"
+                    ],
+                    "required": true,
+                    "cssClass": "l-input"
+                },
+                {
+                    "key": "url",
+                    "name": "URL",
+                    "control": "textfield",
+                    "required": false,
+                    "cssClass": "l-input-lg"
+                }
+            ]
+        });
+    };
+}
--- a/src/plugins/displayLayout/DisplayLayoutToolbar.js
+++ b/src/plugins/displayLayout/DisplayLayoutToolbar.js
@@ -347,22 +347,6 @@ define(['lodash'], function (_) {
                    };
                }

-                function getURLButton(selectedParent, selection) {
-                    return {
-                        control: "button",
-                        domainObject: selectedParent,
-                        applicableSelectedItems: selection.filter(selectionPath => {
-                            return selectionPath[0].context.layoutItem.type === 'image-view';
-                        }),
-                        property: function (selectionPath) {
-                            return getPath(selectionPath);
-                        },
-                        icon: "icon-image",
-                        title: "Edit image properties",
-                        dialog: DIALOG_FORM.image
-                    };
-                }
-
                function getTextButton(selectedParent, selection) {
                    return {
                        control: "button",
@@ -464,6 +448,10 @@ define(['lodash'], function (_) {
                    let selectedParent = selectionPath[1].context.item;
                    let layoutItem = selectionPath[0].context.layoutItem;

+                    if (!layoutItem) {
+                        return;
+                    }
+
                    if (layoutItem.type === 'subobject-view') {
                        if (toolbar['add-menu'].length === 0 && selectionPath[0].context.item.type === 'layout') {
                            toolbar['add-menu'] = [getAddButton(selectedObjects, selectionPath)];
@@ -551,9 +539,6 @@ define(['lodash'], function (_) {
                                getWidthInput(selectedParent, selectedObjects)
                            ];
                        }
-                        if (toolbar.url.length === 0) {
-                            toolbar.url = [getURLButton(selectedParent, selectedObjects)];
-                        }
                        if (toolbar.remove.length === 0) {
                            toolbar.remove = [getRemoveButton(selectedParent, selectionPath, selectedObjects)];
                        }
--- a/src/plugins/displayLayout/components/AlphanumericFormatView.vue
+++ b/src/plugins/displayLayout/components/AlphanumericFormatView.vue
@@ -85,7 +85,13 @@ export default {
                return;
            }

-            let format = selection[0][0].context.layoutItem.format;
+            let layoutItem = selection[0][0].context.layoutItem;
+
+            if (!layoutItem) {
+                return;
+            }
+
+            let format = layoutItem.format;
            this.nonMixedFormat = selection.every(selectionPath => {
                return selectionPath[0].context.layoutItem.format === format;
            });
--- a/src/plugins/displayLayout/components/BoxView.vue
+++ b/src/plugins/displayLayout/components/BoxView.vue
@@ -37,13 +37,13 @@

 <script>
 import LayoutFrame from './LayoutFrame.vue'
-import conditionalStylesMixin from '../mixins/objectlStyles-mixin';
+import conditionalStylesMixin from '../mixins/objectStyles-mixin';

 export default {
    makeDefinition() {
        return {
            fill: '#717171',
-            stroke: 'transparent',
+            stroke: '',
            x: 1,
            y: 1,
            width: 10,
@@ -74,13 +74,14 @@ export default {
    },
    computed: {
        style() {
-            return Object.assign({
-                backgroundColor: this.item.fill,
-                border: '1px solid ' + this.item.stroke
-            }, this.itemStyle);
-        },
-        styleClass() {
-            return this.itemStyle && this.itemStyle.isStyleInvisible;
+            if (this.itemStyle) {
+                return this.itemStyle;
+            } else {
+                return {
+                    backgroundColor: this.item.fill,
+                    border: this.item.stroke ? '1px solid ' + this.item.stroke : ''
+                };
+            }
        }
    },
    watch: {
--- a/src/plugins/displayLayout/components/ImageView.vue
+++ b/src/plugins/displayLayout/components/ImageView.vue
@@ -37,7 +37,7 @@

 <script>
 import LayoutFrame from './LayoutFrame.vue'
-import conditionalStylesMixin from "../mixins/objectlStyles-mixin";
+import conditionalStylesMixin from "../mixins/objectStyles-mixin";

 export default {
    makeDefinition(openmct, gridSize, element) {
@@ -74,13 +74,18 @@ export default {
    },
    computed: {
        style() {
+            let backgroundImage = 'url(' + this.item.url + ')';
+            let border = '1px solid ' + this.item.stroke;
+            if (this.itemStyle) {
+                if (this.itemStyle.imageUrl !== undefined) {
+                    backgroundImage = 'url(' + this.itemStyle.imageUrl + ')';
+                }
+                border = this.itemStyle.border;
+            }
            return {
-                backgroundImage: this.itemStyle ? ('url(' + this.itemStyle.imageUrl + ')') : 'url(' + this.item.url + ')',
-                border: (this.itemStyle && this.itemStyle.border) ? this.itemStyle.border : ('1px solid ' + this.item.stroke)
+                backgroundImage,
+                border
            };
-        },
-        styleClass() {
-            return this.itemStyle && this.itemStyle.isStyleInvisible;
        }
    },
    watch: {
--- a/src/plugins/displayLayout/components/LineView.vue
+++ b/src/plugins/displayLayout/components/LineView.vue
@@ -61,7 +61,7 @@

 <script>

-import conditionalStylesMixin from "../mixins/objectlStyles-mixin";
+import conditionalStylesMixin from "../mixins/objectStyles-mixin";

 const START_HANDLE_QUADRANTS = {
    1: 'c-frame-edit__handle--sw',
@@ -127,8 +127,11 @@ export default {
            return {x, y, x2, y2};
        },
        stroke() {
-            if (this.itemStyle && this.itemStyle.border) {
-                return this.itemStyle.border.replace('1px solid ', '');
+            if (this.itemStyle) {
+                if (this.itemStyle.border) {
+                    return this.itemStyle.border.replace('1px solid ', '');
+                }
+                return '';
            } else {
                return this.item.stroke;
            }
@@ -146,9 +149,6 @@ export default {
                height: `${height}px`
            };
        },
-        styleClass() {
-            return this.itemStyle && this.itemStyle.isStyleInvisible;
-        },
        startHandleClass() {
            return START_HANDLE_QUADRANTS[this.vectorQuadrant];
        },
--- a/src/plugins/displayLayout/components/SubobjectView.vue
+++ b/src/plugins/displayLayout/components/SubobjectView.vue
@@ -45,7 +45,7 @@ import LayoutFrame from './LayoutFrame.vue'
 const MINIMUM_FRAME_SIZE = [320, 180],
    DEFAULT_DIMENSIONS = [10, 10],
    DEFAULT_POSITION = [1, 1],
-    DEFAULT_HIDDEN_FRAME_TYPES = ['hyperlink', 'summary-widget'];
+    DEFAULT_HIDDEN_FRAME_TYPES = ['hyperlink', 'summary-widget', 'conditionWidget'];

 function getDefaultDimensions(gridSize) {
    return MINIMUM_FRAME_SIZE.map((min, index) => {
--- a/src/plugins/displayLayout/components/TelemetryView.vue
+++ b/src/plugins/displayLayout/components/TelemetryView.vue
@@ -30,14 +30,13 @@
    <div
        v-if="domainObject"
        class="c-telemetry-view"
+        :class="styleClass"
        :style="styleObject"
        @contextmenu.prevent="showContextMenu"
    >
        <div
            v-if="showLabel"
            class="c-telemetry-view__label"
-            :class="[styleClass]"
-            :style="objectStyle"
        >
            <div class="c-telemetry-view__label-text">
                {{ domainObject.name }}
@@ -48,8 +47,7 @@
            v-if="showValue"
            :title="fieldName"
            class="c-telemetry-view__value"
-            :class="[telemetryClass, !telemetryClass && styleClass]"
-            :style="!telemetryClass && objectStyle"
+            :class="[telemetryClass]"
        >
            <div class="c-telemetry-view__value-text">
                {{ telemetryValue }}
@@ -62,7 +60,7 @@
 <script>
 import LayoutFrame from './LayoutFrame.vue'
 import printj from 'printj'
-import StyleRuleManager from "../../condition/StyleRuleManager";
+import conditionalStylesMixin from "../mixins/objectStyles-mixin";

 const DEFAULT_TELEMETRY_DIMENSIONS = [10, 5],
    DEFAULT_POSITION = [1, 1],
@@ -81,8 +79,8 @@ export default {
            height: DEFAULT_TELEMETRY_DIMENSIONS[1],
            displayMode: 'all',
            value: metadata.getDefaultDisplayValue(),
-            stroke: "transparent",
-            fill: "transparent",
+            stroke: "",
+            fill: "",
            color: "",
            size: "13px"
        };
@@ -91,6 +89,7 @@ export default {
    components: {
        LayoutFrame
    },
+    mixins: [conditionalStylesMixin],
    props: {
        item: {
            type: Object,
@@ -113,8 +112,7 @@ export default {
            datum: undefined,
            formats: undefined,
            domainObject: undefined,
-            currentObjectPath: undefined,
-            objectStyle: ''
+            currentObjectPath: undefined
        }
    },
    computed: {
@@ -127,15 +125,10 @@ export default {
            return displayMode === 'all' || displayMode === 'value';
        },
        styleObject() {
-            return {
-                backgroundColor: this.item.fill,
-                borderColor: this.item.stroke,
-                color: this.item.color,
+            return Object.assign({}, {
                fontSize: this.item.size
-            }
-        },
-        styleClass() {
-            return this.objectStyle && this.objectStyle.isStyleInvisible;
+            }, this.itemStyle);
+
        },
        fieldName() {
            return this.valueMetadata && this.valueMetadata.name;
@@ -190,15 +183,6 @@ export default {
            this.removeSelectable();
        }

-        if (this.unlistenStyles) {
-            this.unlistenStyles();
-        }
-
-        if (this.styleRuleManager) {
-            this.styleRuleManager.destroy();
-            delete this.styleRuleManager;
-        }
-
        this.openmct.time.off("bounds", this.refreshData);
    },
    methods: {
@@ -241,7 +225,6 @@ export default {
        },
        setObject(domainObject) {
            this.domainObject = domainObject;
-            this.initObjectStyles();
            this.keyString = this.openmct.objects.makeKeyString(domainObject.identifier);
            this.metadata = this.openmct.telemetry.getMetadata(this.domainObject);
            this.limitEvaluator = this.openmct.telemetry.limitEvaluator(this.domainObject);
@@ -266,28 +249,6 @@ export default {
        },
        showContextMenu(event) {
            this.openmct.contextMenu._showContextMenuForObjectPath(this.currentObjectPath, event.x, event.y, CONTEXT_MENU_ACTIONS);
-        },
-        initObjectStyles() {
-            this.styleRuleManager = new StyleRuleManager(this.domainObject.configuration.objectStyles, this.openmct, this.updateStyle.bind(this));
-
-            if (this.unlistenStyles) {
-                this.unlistenStyles();
-            }
-            this.unlistenStyles = this.openmct.objects.observe(this.domainObject, 'configuration.objectStyles', (newObjectStyle) => {
-                //Updating object styles in the inspector view will trigger this so that the changes are reflected immediately
-                this.styleRuleManager.updateObjectStyleConfig(newObjectStyle);
-            });
-        },
-        updateStyle(styleObj) {
-            let keys = Object.keys(styleObj);
-            keys.forEach(key => {
-                if ((typeof styleObj[key] === 'string') && (styleObj[key].indexOf('transparent') > -1)) {
-                    if (styleObj[key]) {
-                        styleObj[key] = '';
-                    }
-                }
-            });
-            this.objectStyle = styleObj;
        }
    }
 }
--- a/src/plugins/displayLayout/components/TextView.vue
+++ b/src/plugins/displayLayout/components/TextView.vue
@@ -32,20 +32,20 @@
        :class="[styleClass]"
        :style="style"
    >
-        {{ item.text }}
+        <div class="c-text-view__text">{{ item.text }}</div>
    </div>
 </layout-frame>
 </template>

 <script>
 import LayoutFrame from './LayoutFrame.vue'
-import conditionalStylesMixin from "../mixins/objectlStyles-mixin";
+import conditionalStylesMixin from "../mixins/objectStyles-mixin";

 export default {
    makeDefinition(openmct, gridSize, element) {
        return {
-            fill: 'transparent',
-            stroke: 'transparent',
+            fill: '',
+            stroke: '',
            size: '13px',
            color: '',
            x: 1,
@@ -80,14 +80,8 @@ export default {
    computed: {
        style() {
            return Object.assign({
-                backgroundColor: this.item.fill,
-                border: '1px solid ' + this.item.stroke,
-                color: this.item.color,
                fontSize: this.item.size
            }, this.itemStyle);
-        },
-        styleClass() {
-            return this.itemStyle && this.itemStyle.isStyleInvisible;
        }
    },
    watch: {
--- a/src/plugins/displayLayout/components/layout-frame.scss
+++ b/src/plugins/displayLayout/components/layout-frame.scss
@@ -16,6 +16,8 @@
 .is-editing {
    /******************* STYLES FOR C-FRAME WHILE EDITING */
    .c-frame {
+        border: 1px solid rgba($editFrameColorHov, 0.3);
+
        &:not([s-selected]) {
            &:hover {
                border: $editFrameBorderHov;
--- a/src/plugins/displayLayout/components/text-view.scss
+++ b/src/plugins/displayLayout/components/text-view.scss
@@ -1,6 +1,8 @@
 .c-text-view {
    display: flex;
-    align-items: stretch;
+    align-items: center; // Vertically center text
+    overflow: hidden;
+    padding: $interiorMargin;

    .c-frame & {
        @include abs();
--- a/src/plugins/displayLayout/mixins/objectStyles-mixin.js
+++ b/src/plugins/displayLayout/mixins/objectStyles-mixin.js
@@ -0,0 +1,78 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+import StyleRuleManager from "@/plugins/condition/StyleRuleManager";
+import {getStylesWithoutNoneValue} from "@/plugins/condition/utils/styleUtils";
+
+export default {
+    inject: ['openmct'],
+    data() {
+        return {
+            itemStyle: undefined,
+            styleClass: ''
+        }
+    },
+    mounted() {
+        this.parentDomainObject = this.$parent.domainObject;
+        this.itemId = this.item.id;
+        this.objectStyle = this.getObjectStyleForItem(this.parentDomainObject.configuration.objectStyles);
+        this.initObjectStyles();
+    },
+    destroyed() {
+        if (this.stopListeningObjectStyles) {
+            this.stopListeningObjectStyles();
+        }
+    },
+    methods: {
+        getObjectStyleForItem(objectStyle) {
+            if (objectStyle) {
+                return objectStyle[this.itemId] ? Object.assign({}, objectStyle[this.itemId]) : undefined;
+            } else {
+                return undefined;
+            }
+        },
+        initObjectStyles() {
+            if (!this.styleRuleManager) {
+                this.styleRuleManager = new StyleRuleManager(this.objectStyle, this.openmct, this.updateStyle.bind(this));
+            } else {
+                this.styleRuleManager.updateObjectStyleConfig(this.objectStyle);
+            }
+
+            if (this.stopListeningObjectStyles) {
+                this.stopListeningObjectStyles();
+            }
+
+            this.stopListeningObjectStyles = this.openmct.objects.observe(this.parentDomainObject, 'configuration.objectStyles', (newObjectStyle) => {
+                //Updating object styles in the inspector view will trigger this so that the changes are reflected immediately
+                let newItemObjectStyle = this.getObjectStyleForItem(newObjectStyle);
+                if (this.objectStyle !== newItemObjectStyle) {
+                    this.objectStyle = newItemObjectStyle;
+                    this.styleRuleManager.updateObjectStyleConfig(this.objectStyle);
+                }
+            });
+        },
+        updateStyle(style) {
+            this.itemStyle = getStylesWithoutNoneValue(style);
+            this.styleClass = this.itemStyle && this.itemStyle.isStyleInvisible;
+        }
+    }
+};
--- a/src/plugins/displayLayout/mixins/objectlStyles-mixin.js
+++ b/src/plugins/displayLayout/mixins/objectlStyles-mixin.js
@@ -1,59 +0,0 @@
-import StyleRuleManager from "@/plugins/condition/StyleRuleManager";
-
-export default {
-    inject: ['openmct'],
-    data() {
-        return {
-            itemStyle: this.itemStyle
-        }
-    },
-    mounted() {
-        this.domainObject = this.$parent.domainObject;
-        this.itemId = this.item.id;
-        this.objectStyle = this.getObjectStyleForItem(this.domainObject.configuration.objectStyles);
-        this.initObjectStyles();
-    },
-    destroyed() {
-        if (this.stopListeningObjectStyles) {
-            this.stopListeningObjectStyles();
-        }
-    },
-    methods: {
-        getObjectStyleForItem(objectStyle) {
-            if (objectStyle) {
-                return objectStyle[this.itemId] ? Object.assign({}, objectStyle[this.itemId]) : undefined;
-            } else {
-                return undefined;
-            }
-        },
-        initObjectStyles() {
-            if (!this.styleRuleManager) {
-                this.styleRuleManager = new StyleRuleManager(this.objectStyle, this.openmct, this.updateStyle.bind(this));
-            } else {
-                this.styleRuleManager.updateObjectStyleConfig(this.objectStyle);
-            }
-
-            if (this.stopListeningObjectStyles) {
-                this.stopListeningObjectStyles();
-            }
-
-            this.stopListeningObjectStyles = this.openmct.objects.observe(this.domainObject, 'configuration.objectStyles', (newObjectStyle) => {
-                //Updating object styles in the inspector view will trigger this so that the changes are reflected immediately
-                let newItemObjectStyle = this.getObjectStyleForItem(newObjectStyle);
-                if (this.objectStyle !== newItemObjectStyle) {
-                    this.objectStyle = newItemObjectStyle;
-                    this.styleRuleManager.updateObjectStyleConfig(this.objectStyle);
-                }
-            });
-        },
-        updateStyle(style) {
-            this.itemStyle = style;
-            let keys = Object.keys(this.itemStyle);
-            keys.forEach((key) => {
-                if ((typeof this.itemStyle[key] === 'string') && (this.itemStyle[key].indexOf('transparent') > -1)) {
-                    delete this.itemStyle[key];
-                }
-            });
-        }
-    }
-};
--- a/src/plugins/flexibleLayout/components/flexible-layout.scss
+++ b/src/plugins/flexibleLayout/components/flexible-layout.scss
@@ -313,8 +313,4 @@
            margin: 0;
        }
    }
-
-    .c-object-view {
-        display: contents;
-    }
 }
--- a/src/plugins/imagery/ImageryViewProvider.js
+++ b/src/plugins/imagery/ImageryViewProvider.js
@@ -26,6 +26,7 @@ export default function ImageryViewProvider(openmct) {
            return {
                show: function (element) {
                    component = new Vue({
+                        el: element,
                        components: {
                            ImageryViewLayout
                        },
@@ -33,7 +34,6 @@ export default function ImageryViewProvider(openmct) {
                            openmct,
                            domainObject
                        },
-                        el: element,
                        template: '<imagery-view-layout ref="ImageryLayout"></imagery-view-layout>'
                    });
                },
--- a/src/plugins/notebook/components/menu-items.vue
+++ b/src/plugins/notebook/components/menu-items.vue
@@ -0,0 +1,21 @@
+<template>
+<div class="c-menu">
+    <ul>
+        <li
+            v-for="(item, index) in popupMenuItems"
+            :key="index"
+            :class="item.cssClass"
+            :title="item.name"
+            @click="item.callback"
+        >
+            {{ item.name }}
+        </li>
+    </ul>
+</div>
+</template>
+
+<script>
+export default {
+    inject: ['popupMenuItems']
+}
+</script>
--- a/src/plugins/notebook/components/notebook-embed.vue
+++ b/src/plugins/notebook/components/notebook-embed.vue
@@ -0,0 +1,239 @@
+<template>
+<div class="c-snapshot c-ne__embed">
+    <div v-if="embed.snapshot"
+         class="c-ne__embed__snap-thumb"
+         @click="openSnapshot()"
+    >
+        <img :src="embed.snapshot.src">
+    </div>
+    <div class="c-ne__embed__info">
+        <div class="c-ne__embed__name">
+            <a class="c-ne__embed__link"
+               :class="embed.cssClass"
+               @click="changeLocation"
+            >{{ embed.name }}</a>
+            <PopupMenu :popup-menu-items="popupMenuItems" />
+        </div>
+        <div v-if="embed.snapshot"
+             class="c-ne__embed__time"
+        >
+            {{ formatTime(embed.createdOn, 'YYYY-MM-DD HH:mm:ss') }}
+        </div>
+    </div>
+</div>
+</template>
+
+<script>
+import Moment from 'moment';
+import PopupMenu from './popup-menu.vue';
+import PreviewAction from '../../../ui/preview/PreviewAction';
+import Painterro from 'painterro';
+import RemoveDialog from '../utils/removeDialog';
+import SnapshotTemplate from './snapshot-template.html';
+import Vue from 'vue';
+
+export default {
+    inject: ['openmct'],
+    components: {
+        PopupMenu
+    },
+    props: {
+        embed: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        removeActionString: {
+            type: String,
+            default() {
+                return 'Remove This Embed';
+            }
+        }
+    },
+    data() {
+        return {
+            popupMenuItems: []
+        }
+    },
+    watch: {
+    },
+    mounted() {
+        this.addPopupMenuItems();
+    },
+    methods: {
+        addPopupMenuItems() {
+            const removeEmbed = {
+                cssClass: 'icon-trash',
+                name: this.removeActionString,
+                callback: this.getRemoveDialog.bind(this)
+            }
+            const preview = {
+                cssClass: 'icon-eye-open',
+                name: 'Preview',
+                callback: this.previewEmbed.bind(this)
+            }
+
+            this.popupMenuItems = [removeEmbed, preview];
+        },
+        annotateSnapshot() {
+            const self = this;
+
+            let save = false;
+            let painterroInstance = {};
+            const annotateVue = new Vue({
+                template: '<div id="snap-annotation"></div>'
+            });
+
+            let annotateOverlay = self.openmct.overlays.overlay({
+                element: annotateVue.$mount().$el,
+                size: 'large',
+                dismissable: false,
+                buttons: [
+                    {
+                        label: 'Cancel',
+                        callback: function () {
+                            save = false;
+                            painterroInstance.save();
+                            annotateOverlay.dismiss();
+                        }
+                    },
+                    {
+                        label: 'Save',
+                        callback: function () {
+
+                            save = true;
+                            painterroInstance.save();
+                            annotateOverlay.dismiss();
+                        }
+                    }
+                ],
+                onDestroy: function () {
+                    annotateVue.$destroy(true);
+                }
+            });
+
+            painterroInstance = Painterro({
+                id: 'snap-annotation',
+                activeColor: '#ff0000',
+                activeColorAlpha: 1.0,
+                activeFillColor: '#fff',
+                activeFillColorAlpha: 0.0,
+                backgroundFillColor: '#000',
+                backgroundFillColorAlpha: 0.0,
+                defaultFontSize: 16,
+                defaultLineWidth: 2,
+                defaultTool: 'ellipse',
+                hiddenTools: ['save', 'open', 'close', 'eraser', 'pixelize', 'rotate', 'settings', 'resize'],
+                translation: {
+                    name: 'en',
+                    strings: {
+                        lineColor: 'Line',
+                        fillColor: 'Fill',
+                        lineWidth: 'Size',
+                        textColor: 'Color',
+                        fontSize: 'Size',
+                        fontStyle: 'Style'
+                    }
+                },
+                saveHandler: function (image, done) {
+                    if (save) {
+                        const url = image.asBlob();
+                        const reader = new window.FileReader();
+                        reader.readAsDataURL(url);
+                        reader.onloadend = function () {
+                            const snapshot = reader.result;
+                            const snapshotObject = {
+                                src: snapshot,
+                                type: url.type,
+                                size: url.size,
+                                modified: Date.now()
+                            };
+
+                            self.embed.snapshot = snapshotObject;
+                            self.updateEmbed(self.embed);
+                        };
+                    } else {
+                        console.log('You cancelled the annotation!!!');
+                    }
+
+                    done(true);
+                }
+            }).show(this.embed.snapshot.src);
+        },
+        changeLocation() {
+            this.openmct.time.stopClock();
+            this.openmct.time.bounds({
+                start: this.embed.bounds.start,
+                end: this.embed.bounds.end
+            });
+
+            const link = this.embed.historicLink;
+            if (!link) {
+                return;
+            }
+
+            window.location.href = link;
+            const message = 'Time bounds changed to fixed timespan mode';
+            this.openmct.notifications.alert(message);
+        },
+        formatTime(unixTime, timeFormat) {
+            return Moment.utc(unixTime).format(timeFormat);
+        },
+        getRemoveDialog() {
+            const options = {
+                name: this.removeActionString,
+                callback: this.removeEmbed.bind(this)
+            }
+            const removeDialog = new RemoveDialog(this.openmct, options);
+            removeDialog.show();
+        },
+        openSnapshot() {
+            const self = this;
+            const snapshot = new Vue({
+                data: () => {
+                    return {
+                        embed: self.embed
+                    };
+                },
+                methods: {
+                    formatTime: self.formatTime,
+                    annotateSnapshot: self.annotateSnapshot
+                },
+                template: SnapshotTemplate
+            });
+
+            const snapshotOverlay = this.openmct.overlays.overlay({
+                element: snapshot.$mount().$el,
+                onDestroy: () => { snapshot.$destroy(true) },
+                size: 'large',
+                dismissable: true,
+                buttons: [
+                    {
+                        label: 'Done',
+                        emphasis: true,
+                        callback: () => {
+                            snapshotOverlay.dismiss();
+                        }
+                    }
+                ]
+            });
+        },
+        previewEmbed() {
+            const self = this;
+            const previewAction = new PreviewAction(self.openmct);
+            previewAction.invoke(JSON.parse(self.embed.objectPath));
+        },
+        removeEmbed(success) {
+            if (!success) {
+                return;
+            }
+
+            this.$emit('removeEmbed', this.embed.id);
+        },
+        updateEmbed(embed) {
+            this.$emit('updateEmbed', embed);
+        }
+    }
+}
+</script>
--- a/src/plugins/notebook/components/notebook-entry.vue
+++ b/src/plugins/notebook/components/notebook-entry.vue
@@ -0,0 +1,316 @@
+<template>
+<div class="c-notebook__entry c-ne has-local-controls"
+     @dragover="dragover"
+     @drop.capture="dropCapture"
+     @drop.prevent="dropOnEntry(entry.id, $event)"
+>
+    <div class="c-ne__time-and-content">
+        <div class="c-ne__time">
+            <span>{{ formatTime(entry.createdOn, 'YYYY-MM-DD') }}</span>
+            <span>{{ formatTime(entry.createdOn, 'HH:mm:ss') }}</span>
+        </div>
+        <div class="c-ne__content">
+            <div :id="entry.id"
+                 class="c-ne__text"
+                 :class="{'c-input-inline' : !readOnly }"
+                 :contenteditable="!readOnly"
+                 :style="!entry.text.length ? defaultEntryStyle : ''"
+                 @blur="textBlur($event, entry.id)"
+                 @focus="textFocus($event, entry.id)"
+            >{{ entry.text.length ? entry.text : defaultText }}</div>
+            <div class="c-snapshots c-ne__embeds">
+                <NotebookEmbed v-for="embed in entry.embeds"
+                               :key="embed.id"
+                               :embed="embed"
+                               :entry="entry"
+                               @removeEmbed="removeEmbed"
+                               @updateEmbed="updateEmbed"
+                />
+            </div>
+        </div>
+    </div>
+    <div v-if="!readOnly"
+         class="c-ne__local-controls--hidden"
+    >
+        <button class="c-icon-button c-icon-button--major icon-trash"
+                title="Delete this entry"
+                @click="deleteEntry"
+        >
+        </button>
+    </div>
+    <div v-if="readOnly"
+         class="c-ne__section-and-page"
+    >
+        <a class="c-click-link"
+           @click="navigateToSection()"
+        >
+            {{ result.section.name }}
+        </a>
+        <span class="icon-arrow-right"></span>
+        <a class="c-click-link"
+           @click="navigateToPage()"
+        >
+            {{ result.page.name }}
+        </a>
+    </div>
+</div>
+</template>
+
+<script>
+import NotebookEmbed from './notebook-embed.vue';
+import { createNewEmbed, getEntryPosById, getNotebookEntries } from '../utils/notebook-entries';
+import Moment from 'moment';
+
+export default {
+    inject: ['openmct', 'snapshotContainer'],
+    components: {
+        NotebookEmbed
+    },
+    props: {
+        domainObject: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        entry: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        result: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        selectedPage: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        selectedSection: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        readOnly: {
+            type: Boolean,
+            default() {
+                return true;
+            }
+        }
+    },
+    data() {
+        return {
+            currentEntryValue: '',
+            defaultEntryStyle: {
+                fontStyle: 'italic',
+                color: '#6e6e6e'
+            },
+            defaultText: 'add description'
+        }
+    },
+    watch: {
+        entry() {
+        },
+        readOnly(readOnly) {
+        },
+        selectedSection(selectedSection) {
+        },
+        selectedPage(selectedSection) {
+        }
+    },
+    mounted() {
+        this.updateEntries = this.updateEntries.bind(this);
+    },
+    beforeDestory() {
+    },
+    methods: {
+        deleteEntry() {
+            const self = this;
+            if (!self.domainObject || !self.selectedSection || !self.selectedPage || !self.entry.id) {
+                return;
+            }
+
+            const entryPosById = this.entryPosById(this.entry.id);
+            if (entryPosById === -1) {
+                return;
+            }
+
+            const dialog = this.openmct.overlays.dialog({
+                iconClass: 'alert',
+                message: 'This action will permanently delete this entry. Do you wish to continue?',
+                buttons: [
+                    {
+                        label: "Ok",
+                        emphasis: true,
+                        callback: () => {
+                            const entries = getNotebookEntries(self.domainObject, self.selectedSection, self.selectedPage);
+                            entries.splice(entryPosById, 1);
+                            this.updateEntries(entries);
+                            dialog.dismiss();
+                        }
+                    },
+                    {
+                        label: "Cancel",
+                        callback: () => {
+                            dialog.dismiss();
+                        }
+                    }
+                ]
+            });
+        },
+        dragover() {
+            event.preventDefault();
+            event.dataTransfer.dropEffect = "copy";
+        },
+        dropCapture(event) {
+            const isEditing = this.openmct.editor.isEditing();
+            if (isEditing) {
+                this.openmct.editor.cancel();
+            }
+        },
+        dropOnEntry(entryId, $event) {
+            event.stopImmediatePropagation();
+
+            if (!this.domainObject || !this.selectedSection || !this.selectedPage) {
+                return;
+            }
+
+            const snapshotId = $event.dataTransfer.getData('snapshot/id');
+            if (snapshotId.length) {
+                this.moveSnapshot(snapshotId);
+
+                return;
+            }
+
+            const data = $event.dataTransfer.getData('openmct/domain-object-path');
+            const objectPath = JSON.parse(data);
+            const entryPos = this.entryPosById(entryId);
+            const bounds = this.openmct.time.bounds();
+            const snapshotMeta = {
+                bounds,
+                link: null,
+                objectPath,
+                openmct: this.openmct
+            }
+            const newEmbed = createNewEmbed(snapshotMeta);
+            const entries = getNotebookEntries(this.domainObject, this.selectedSection, this.selectedPage);
+            const currentEntryEmbeds = entries[entryPos].embeds;
+            currentEntryEmbeds.push(newEmbed);
+            this.updateEntries(entries);
+        },
+        entryPosById(entryId) {
+            return getEntryPosById(entryId, this.domainObject, this.selectedSection, this.selectedPage);
+        },
+        findPositionInArray(array, id) {
+            let position = -1;
+            array.some((item, index) => {
+                const found = item.id === id;
+                if (found) {
+                    position = index;
+                }
+
+                return found;
+            });
+
+            return position;
+        },
+        formatTime(unixTime, timeFormat) {
+            return Moment(unixTime).format(timeFormat);
+        },
+        moveSnapshot(snapshotId) {
+            const snapshot = this.snapshotContainer.getSnapshot(snapshotId);
+            this.entry.embeds.push(snapshot);
+            this.updateEntry(this.entry);
+            this.snapshotContainer.removeSnapshot(snapshotId);
+        },
+        navigateToPage() {
+            this.$emit('changeSectionPage', {
+                sectionId: this.result.section.id,
+                pageId: this.result.page.id
+            });
+        },
+        navigateToSection() {
+            this.$emit('changeSectionPage', {
+                sectionId: this.result.section.id,
+                pageId: null
+            });
+        },
+        removeEmbed(id) {
+            const embedPosition = this.findPositionInArray(this.entry.embeds, id);
+            this.entry.embeds.splice(embedPosition, 1);
+            this.updateEntry(this.entry);
+        },
+        selectTextInsideElement(element) {
+            const range = document.createRange();
+            range.selectNodeContents(element);
+            var selection = window.getSelection();
+            selection.removeAllRanges();
+            selection.addRange(range);
+        },
+        textBlur($event, entryId) {
+            if (!this.domainObject || !this.selectedSection || !this.selectedPage) {
+                return;
+            }
+
+            const target = $event.target;
+            if (!target) {
+                return;
+            }
+
+            const entryPos = this.entryPosById(entryId);
+            const value = target.textContent.trim();
+            if (this.currentEntryValue !== value) {
+                const entries = getNotebookEntries(this.domainObject, this.selectedSection, this.selectedPage);
+                entries[entryPos].text = value;
+
+                this.updateEntries(entries);
+            }
+        },
+        textFocus($event) {
+            if (this.readOnly || !this.domainObject || !this.selectedSection || !this.selectedPage) {
+                return;
+            }
+
+            const target = $event.target
+            this.currentEntryValue = target ? target.innerText : '';
+
+            if (!this.entry.text.length) {
+                this.selectTextInsideElement(target);
+            }
+        },
+        updateEmbed(newEmbed) {
+            let embed = this.entry.embeds.find(e => e.id === newEmbed.id);
+
+            if (!embed) {
+                return;
+            }
+
+            embed = newEmbed;
+            this.updateEntry(this.entry);
+        },
+        updateEntry(newEntry) {
+            if (!this.domainObject || !this.selectedSection || !this.selectedPage) {
+                return;
+            }
+
+            const entries = getNotebookEntries(this.domainObject, this.selectedSection, this.selectedPage);
+            entries.forEach(entry => {
+                if (entry.id === newEntry.id) {
+                    entry = newEntry;
+                }
+            });
+
+            this.updateEntries(entries);
+        },
+        updateEntries(entries) {
+            this.$emit('updateEntries', entries);
+        }
+    }
+}
+</script>
--- a/src/plugins/notebook/components/notebook-menu-switcher.vue
+++ b/src/plugins/notebook/components/notebook-menu-switcher.vue
@@ -0,0 +1,114 @@
+<template>
+<div class="c-menu-button c-ctrl-wrapper c-ctrl-wrapper--menus-left">
+    <button
+        class="c-button--menu icon-notebook"
+        title="Take a Notebook Snapshot"
+        @click="setNotebookTypes"
+        @click.stop="toggleMenu"
+    >
+        <span class="c-button__label"></span>
+    </button>
+    <div
+        v-show="showMenu"
+        class="c-menu"
+    >
+        <ul>
+            <li
+                v-for="(type, index) in notebookTypes"
+                :key="index"
+                :class="type.cssClass"
+                :title="type.name"
+                @click="snapshot(type)"
+            >
+                {{ type.name }}
+            </li>
+        </ul>
+    </div>
+</div>
+</template>
+
+<script>
+import Snapshot from '../snapshot';
+import { clearDefaultNotebook, getDefaultNotebook } from '../utils/notebook-storage';
+import { NOTEBOOK_DEFAULT, NOTEBOOK_SNAPSHOT } from '../notebook-constants';
+
+export default {
+    inject: ['openmct'],
+    props: {
+        domainObject: {
+            type: Object,
+            default() {
+                return {};
+            }
+        }
+    },
+    data() {
+        return {
+            notebookSnapshot: null,
+            notebookTypes: [],
+            showMenu: false
+        }
+    },
+    mounted() {
+        this.notebookSnapshot = new Snapshot(this.openmct);
+
+        document.addEventListener('click', this.hideMenu);
+    },
+    destroyed() {
+        document.removeEventListener('click', this.hideMenu);
+    },
+    methods: {
+        async setNotebookTypes() {
+            const notebookTypes = [];
+            let defaultPath = '';
+            const defaultNotebook = getDefaultNotebook();
+
+            if (defaultNotebook) {
+                const domainObject = await this.openmct.objects.get(defaultNotebook.notebookMeta.identifier)
+                    .then(d => d);
+
+                if (!domainObject.location) {
+                    clearDefaultNotebook();
+                } else {
+                    defaultPath = `${domainObject.name} - ${defaultNotebook.section.name} - ${defaultNotebook.page.name}`;
+                }
+            }
+
+            if (defaultPath.length !== 0) {
+                notebookTypes.push({
+                    cssClass: 'icon-notebook',
+                    name: `Save to Notebook ${defaultPath}`,
+                    type: NOTEBOOK_DEFAULT
+                });
+            }
+
+            notebookTypes.push({
+                cssClass: 'icon-notebook',
+                name: 'Save to Notebook Snapshots',
+                type: NOTEBOOK_SNAPSHOT
+            });
+
+            this.notebookTypes = notebookTypes;
+        },
+        toggleMenu() {
+            this.showMenu = !this.showMenu;
+        },
+        hideMenu() {
+            this.showMenu = false;
+        },
+        snapshot(notebook) {
+            let element = document.getElementsByClassName("l-shell__main-container")[0];
+            const bounds = this.openmct.time.bounds();
+            const objectPath = this.openmct.router.path;
+            const snapshotMeta = {
+                bounds,
+                link: window.location.href,
+                objectPath,
+                openmct: this.openmct
+            };
+
+            this.notebookSnapshot.capture(snapshotMeta, notebook.type, element);
+        }
+    }
+}
+</script>
--- a/src/plugins/notebook/components/notebook-snapshot-container.vue
+++ b/src/plugins/notebook/components/notebook-snapshot-container.vue
@@ -0,0 +1,129 @@
+<template>
+<div class="c-snapshots-h">
+    <div class="l-browse-bar">
+        <div class="l-browse-bar__start">
+            <div class="l-browse-bar__object-name--w icon-notebook">
+                <div class="l-browse-bar__object-name">
+                    Notebook Snapshots
+                    <span v-if="snapshots.length"
+                          class="l-browse-bar__object-details"
+                    >&nbsp;{{ snapshots.length }} of {{ getNotebookSnapshotMaxCount() }}
+                    </span>
+                </div>
+                <PopupMenu v-if="snapshots.length > 0"
+                           :popup-menu-items="popupMenuItems"
+                />
+            </div>
+
+        </div>
+        <div class="l-browse-bar__end">
+            <button class="c-click-icon c-click-icon--major icon-x"
+                    @click="close"
+            ></button>
+        </div>
+    </div><!-- closes l-browse-bar -->
+    <div class="c-snapshots">
+        <span v-for="snapshot in snapshots"
+              :key="snapshot.id"
+              draggable="true"
+              @dragstart="startEmbedDrag(snapshot, $event)"
+        >
+            <NotebookEmbed ref="notebookEmbed"
+                           :key="snapshot.id"
+                           :embed="snapshot"
+                           :remove-action-string="'Delete Snapshot'"
+                           @updateEmbed="updateSnapshot"
+                           @removeEmbed="removeSnapshot"
+            />
+        </span>
+        <div v-if="!snapshots.length > 0"
+             class="hint"
+        >
+            There are no Notebook Snapshots currently.
+        </div>
+    </div>
+</div>
+</template>
+
+<script>
+import NotebookEmbed from './notebook-embed.vue';
+import PopupMenu from './popup-menu.vue';
+import RemoveDialog from '../utils/removeDialog';
+import { NOTEBOOK_SNAPSHOT_MAX_COUNT } from '../snapshot-container';
+import { EVENT_SNAPSHOTS_UPDATED } from '../notebook-constants';
+
+export default {
+    inject: ['openmct', 'snapshotContainer'],
+    components: {
+        NotebookEmbed,
+        PopupMenu
+    },
+    props: {
+        toggleSnapshot: {
+            type: Function,
+            default() {
+                return () => {};
+            }
+        }
+    },
+    data() {
+        return {
+            popupMenuItems: [],
+            removeActionString: 'Delete all snapshots',
+            snapshots: []
+        }
+    },
+    mounted() {
+        this.addPopupMenuItems();
+        this.snapshotContainer.on(EVENT_SNAPSHOTS_UPDATED, this.snapshotsUpdated);
+        this.snapshots = this.snapshotContainer.getSnapshots();
+    },
+    beforeDestory() {
+    },
+    methods: {
+        addPopupMenuItems() {
+            const removeSnapshot = {
+                cssClass: 'icon-trash',
+                name: this.removeActionString,
+                callback: this.getRemoveDialog.bind(this)
+            }
+
+            this.popupMenuItems = [removeSnapshot];
+        },
+        close() {
+            this.toggleSnapshot();
+        },
+        getNotebookSnapshotMaxCount() {
+            return NOTEBOOK_SNAPSHOT_MAX_COUNT;
+        },
+        getRemoveDialog() {
+            const options = {
+                name: this.removeActionString,
+                callback: this.removeAllSnapshots.bind(this)
+            }
+            const removeDialog = new RemoveDialog(this.openmct, options);
+            removeDialog.show();
+        },
+        removeAllSnapshots(success) {
+            if (!success) {
+                return;
+            }
+
+            this.snapshotContainer.removeAllSnapshots();
+        },
+        removeSnapshot(id) {
+            this.snapshotContainer.removeSnapshot(id);
+        },
+        snapshotsUpdated() {
+            this.snapshots = this.snapshotContainer.getSnapshots();
+        },
+        startEmbedDrag(snapshot, event) {
+            event.dataTransfer.setData('text/plain', snapshot.id);
+            event.dataTransfer.setData('snapshot/id', snapshot.id);
+        },
+        updateSnapshot(snapshot) {
+            this.snapshotContainer.updateSnapshot(snapshot);
+        }
+    }
+}
+</script>
--- a/src/plugins/notebook/components/notebook-snapshot-indicator.vue
+++ b/src/plugins/notebook/components/notebook-snapshot-indicator.vue
@@ -0,0 +1,97 @@
+<template>
+<div class="c-indicator c-indicator--clickable icon-notebook"
+     :class="[
+         { 's-status-off': snapshotCount === 0 },
+         { 's-status-on': snapshotCount > 0 },
+         { 's-status-caution': snapshotCount === snapshotMaxCount },
+         { 'has-new-snapshot': flashIndicator }
+     ]"
+>
+    <span class="label c-indicator__label">
+        {{ indicatorTitle }}
+        <button @click="toggleSnapshot">
+            {{ expanded ? 'Hide' : 'Show' }}
+        </button>
+    </span>
+    <span class="c-indicator__count">{{ snapshotCount }}</span>
+</div>
+</template>
+
+<script>
+import SnapshotContainerComponent from './notebook-snapshot-container.vue';
+import { EVENT_SNAPSHOTS_UPDATED } from '../notebook-constants';
+import { NOTEBOOK_SNAPSHOT_MAX_COUNT } from '../snapshot-container';
+import Vue from 'vue';
+
+export default {
+    inject: ['openmct','snapshotContainer'],
+    data() {
+        return {
+            expanded: false,
+            indicatorTitle: '',
+            snapshotCount: 0,
+            snapshotMaxCount: NOTEBOOK_SNAPSHOT_MAX_COUNT,
+            flashIndicator: false
+        }
+    },
+    mounted() {
+        this.snapshotContainer.on(EVENT_SNAPSHOTS_UPDATED, this.snapshotsUpdated);
+        this.updateSnapshotIndicatorTitle();
+    },
+    methods: {
+        notifyNewSnapshot() {
+            this.flashIndicator = true;
+            setTimeout(this.removeNotify, 15000);
+        },
+        removeNotify() {
+            this.flashIndicator = false;
+        },
+        snapshotsUpdated() {
+            if (this.snapshotContainer.getSnapshots().length > this.snapshotCount) {
+                this.notifyNewSnapshot();
+            }
+            this.updateSnapshotIndicatorTitle();
+        },
+        toggleSnapshot() {
+            this.expanded = !this.expanded;
+
+            const drawerElement = document.querySelector('.l-shell__drawer');
+            drawerElement.classList.toggle('is-expanded');
+
+            this.updateSnapshotContainer();
+        },
+        updateSnapshotContainer() {
+            const { openmct, snapshotContainer } = this;
+            const toggleSnapshot = this.toggleSnapshot.bind(this);
+            const drawerElement = document.querySelector('.l-shell__drawer');
+            drawerElement.innerHTML = '<div></div>';
+            const divElement = document.querySelector('.l-shell__drawer div');
+
+            this.component = new Vue({
+                provide: {
+                    openmct,
+                    snapshotContainer
+                },
+                el: divElement,
+                components: {
+                    SnapshotContainerComponent
+                },
+                data() {
+                    return {
+                        toggleSnapshot
+                    };
+                },
+                template: '<SnapshotContainerComponent :toggleSnapshot="toggleSnapshot"></SnapshotContainerComponent>'
+            }).$mount();
+        },
+        updateSnapshotIndicatorTitle() {
+            const snapshotCount = this.snapshotContainer.getSnapshots().length;
+            this.snapshotCount = snapshotCount;
+            const snapshotTitleSuffix = snapshotCount === 1
+                ? 'Snapshot'
+                : 'Snapshots';
+            this.indicatorTitle = `${snapshotCount} ${snapshotTitleSuffix}`;
+        }
+    }
+}
+</script>
--- a/src/plugins/notebook/components/notebook.vue
+++ b/src/plugins/notebook/components/notebook.vue
@@ -0,0 +1,563 @@
+<template>
+<div class="c-notebook">
+    <div class="c-notebook__head">
+        <Search class="c-notebook__search"
+                :value="search"
+                @input="throttledSearchItem"
+                @clear="throttledSearchItem"
+        />
+    </div>
+    <SearchResults v-if="search.length"
+                   ref="searchResults"
+                   :results="getSearchResults()"
+                   @changeSectionPage="changeSelectedSection"
+    />
+
+    <div v-if="!search.length"
+         class="c-notebook__body"
+    >
+        <Sidebar ref="sidebar"
+                 class="c-notebook__nav c-sidebar c-drawer c-drawer--align-left"
+                 :class="[{'is-expanded': showNav}, {'c-drawer--push': !sidebarCoversEntries}, {'c-drawer--overlays': sidebarCoversEntries}]"
+                 :default-page-id="defaultPageId"
+                 :default-section-id="defaultSectionId"
+                 :domain-object="internalDomainObject"
+                 :page-title="internalDomainObject.configuration.pageTitle"
+                 :pages="pages"
+                 :section-title="internalDomainObject.configuration.sectionTitle"
+                 :sections="sections"
+                 :sidebar-covers-entries="sidebarCoversEntries"
+                 @updatePage="updatePage"
+                 @updateSection="updateSection"
+                 @toggleNav="toggleNav"
+        />
+        <div class="c-notebook__page-view">
+            <div class="c-notebook__page-view__header">
+                <button class="c-notebook__toggle-nav-button c-icon-button c-icon-button--major icon-menu-hamburger"
+                        @click="toggleNav"
+                ></button>
+                <div class="c-notebook__page-view__path c-path">
+                    <span class="c-notebook__path__section c-path__item">
+                        {{ getSelectedSection() ? getSelectedSection().name : '' }}
+                    </span>
+                    <span class="c-notebook__path__page c-path__item">
+                        {{ getSelectedPage() ? getSelectedPage().name : '' }}
+                    </span>
+                </div>
+                <div class="c-notebook__page-view__controls">
+                    <select v-model="showTime"
+                            class="c-notebook__controls__time"
+                    >
+                        <option value="0"
+                                :selected="showTime === 0"
+                        >
+                            Show all
+                        </option>
+                        <option value="1"
+                                :selected="showTime === 1"
+                        >Last hour</option>
+                        <option value="8"
+                                :selected="showTime === 8"
+                        >Last 8 hours</option>
+                        <option value="24"
+                                :selected="showTime === 24"
+                        >Last 24 hours</option>
+                    </select>
+                    <select v-model="defaultSort"
+                            class="c-notebook__controls__time"
+                    >
+                        <option value="newest"
+                                :selected="defaultSort === 'newest'"
+                        >Newest first</option>
+                        <option value="oldest"
+                                :selected="defaultSort === 'oldest'"
+                        >Oldest first</option>
+                    </select>
+                </div>
+            </div>
+            <div class="c-notebook__drag-area icon-plus"
+                 @click="newEntry()"
+                 @dragover="dragOver"
+                 @drop.capture="dropCapture"
+                 @drop="dropOnEntry($event)"
+            >
+                <span class="c-notebook__drag-area__label">
+                    To start a new entry, click here or drag and drop any object
+                </span>
+            </div>
+            <div v-if="selectedSection && selectedPage"
+                 ref="notebookEntries"
+                 class="c-notebook__entries"
+            >
+                <NotebookEntry v-for="entry in filteredAndSortedEntries"
+                               :key="entry.id"
+                               :entry="entry"
+                               :domain-object="internalDomainObject"
+                               :selected-page="getSelectedPage()"
+                               :selected-section="getSelectedSection()"
+                               :read-only="false"
+                               @updateEntries="updateEntries"
+                />
+            </div>
+        </div>
+    </div>
+</div>
+</template>
+
+<script>
+import NotebookEntry from './notebook-entry.vue';
+import Search from '@/ui/components/search.vue';
+import SearchResults from './search-results.vue';
+import Sidebar from './sidebar.vue';
+import { clearDefaultNotebook, getDefaultNotebook, setDefaultNotebook, setDefaultNotebookSection, setDefaultNotebookPage } from '../utils/notebook-storage';
+import { addNotebookEntry, createNewEmbed, getNotebookEntries } from '../utils/notebook-entries';
+import { throttle } from 'lodash';
+
+const DEFAULT_CLASS = 'is-notebook-default';
+
+export default {
+    inject: ['openmct', 'domainObject', 'snapshotContainer'],
+    components: {
+        NotebookEntry,
+        Search,
+        SearchResults,
+        Sidebar
+    },
+    data() {
+        return {
+            defaultPageId: getDefaultNotebook() ? getDefaultNotebook().page.id : '',
+            defaultSectionId: getDefaultNotebook() ? getDefaultNotebook().section.id : '',
+            defaultSort: this.domainObject.configuration.defaultSort,
+            focusEntryId: null,
+            internalDomainObject: this.domainObject,
+            search: '',
+            showTime: 0,
+            showNav: false,
+            sidebarCoversEntries: false
+        }
+    },
+    computed: {
+        filteredAndSortedEntries() {
+            const filterTime = Date.now();
+            const pageEntries = getNotebookEntries(this.internalDomainObject, this.selectedSection, this.selectedPage) || [];
+
+            const hours = parseInt(this.showTime, 10);
+            const filteredPageEntriesByTime = hours
+                ? pageEntries.filter(entry => (filterTime - entry.createdOn) <= hours * 60 * 60 * 1000)
+                : pageEntries;
+
+            return this.defaultSort === 'oldest'
+                ? filteredPageEntriesByTime
+                : [...filteredPageEntriesByTime].reverse();
+        },
+        pages() {
+            return this.getPages() || [];
+        },
+        sections() {
+            return this.internalDomainObject.configuration.sections || [];
+        },
+        selectedPage() {
+            const pages = this.getPages();
+            if (!pages) {
+                return null;
+            }
+
+            return pages.find(page => page.isSelected);
+        },
+        selectedSection() {
+            if (!this.sections.length) {
+                return null;
+            }
+
+            return this.sections.find(section => section.isSelected);
+        }
+    },
+    watch: {
+    },
+    beforeMount() {
+        this.throttledSearchItem = throttle(this.searchItem, 500);
+    },
+    mounted() {
+        this.unlisten = this.openmct.objects.observe(this.internalDomainObject, '*', this.updateInternalDomainObject);
+        this.formatSidebar();
+        window.addEventListener('orientationchange', this.formatSidebar);
+
+        this.navigateToSectionPage();
+    },
+    beforeDestroy() {
+        if (this.unlisten) {
+            this.unlisten();
+        }
+    },
+    updated: function () {
+        this.$nextTick(function () {
+            this.focusOnEntryId();
+        })
+    },
+    methods: {
+        addDefaultClass() {
+            const classList = this.internalDomainObject.classList || [];
+            if (classList.includes(DEFAULT_CLASS)) {
+                return;
+            }
+
+            classList.push(DEFAULT_CLASS);
+            this.mutateObject('classList', classList);
+        },
+        changeSelectedSection({ sectionId, pageId }) {
+            const sections = this.sections.map(s => {
+                s.isSelected = false;
+
+                if (s.id === sectionId) {
+                    s.isSelected = true;
+                }
+
+                s.pages.forEach((p, i) => {
+                    p.isSelected = false;
+
+                    if (pageId && pageId === p.id) {
+                        p.isSelected = true;
+                    }
+
+                    if (!pageId && i === 0) {
+                        p.isSelected = true;
+                    }
+                });
+
+                return s;
+            });
+
+            this.updateSection({ sections });
+            this.throttledSearchItem('');
+        },
+        createNotebookStorageObject() {
+            const notebookMeta = {
+                name: this.internalDomainObject.name,
+                identifier: this.internalDomainObject.identifier
+            };
+            const page = this.getSelectedPage();
+            const section = this.getSelectedSection();
+
+            return {
+                notebookMeta,
+                section,
+                page
+            }
+        },
+        dragOver(event) {
+            event.preventDefault();
+            event.dataTransfer.dropEffect = "copy";
+        },
+        dropCapture(event) {
+            const isEditing = this.openmct.editor.isEditing();
+            if (isEditing) {
+                this.openmct.editor.cancel();
+            }
+        },
+        dropOnEntry(event) {
+            event.preventDefault();
+            event.stopImmediatePropagation();
+
+            const snapshotId = event.dataTransfer.getData('snapshot/id');
+            if (snapshotId.length) {
+                const snapshot = this.snapshotContainer.getSnapshot(snapshotId);
+                this.newEntry(snapshot);
+                this.snapshotContainer.removeSnapshot(snapshotId);
+
+                return;
+            }
+
+            const data = event.dataTransfer.getData('openmct/domain-object-path');
+            const objectPath = JSON.parse(data);
+            const bounds = this.openmct.time.bounds();
+            const snapshotMeta = {
+                bounds,
+                link: null,
+                objectPath,
+                openmct: this.openmct
+            };
+            const embed = createNewEmbed(snapshotMeta);
+            this.newEntry(embed);
+        },
+        focusOnEntryId() {
+            if (!this.focusEntryId) {
+                return;
+            }
+
+            const element = this.$refs.notebookEntries.querySelector(`#${this.focusEntryId}`);
+
+            if (!element) {
+                return;
+            }
+
+            element.focus();
+            this.focusEntryId = null;
+        },
+        formatSidebar() {
+            /*
+                Determine if the sidebar should slide over content, or compress it
+                Slide over checks:
+                - phone (all orientations)
+                - tablet portrait
+                - in a layout frame (within .c-so-view)
+            */
+            const classList = document.querySelector('body').classList;
+            const isPhone = Array.from(classList).includes('phone');
+            const isTablet = Array.from(classList).includes('tablet');
+            const isPortrait = window.screen.orientation.type.includes('portrait');
+            const isInLayout = !!this.$el.closest('.c-so-view');
+            const sidebarCoversEntries = (isPhone || (isTablet && isPortrait) || isInLayout);
+            this.sidebarCoversEntries = sidebarCoversEntries;
+        },
+        getDefaultNotebookObject() {
+            const oldNotebookStorage = getDefaultNotebook();
+            if (!oldNotebookStorage) {
+                return null;
+            }
+
+            return this.openmct.objects.get(oldNotebookStorage.notebookMeta.identifier).then(d => d);
+        },
+        getPage(section, id) {
+            return section.pages.find(p => p.id === id);
+        },
+        getSection(id) {
+            return this.sections.find(s => s.id === id);
+        },
+        getSearchResults() {
+            if (!this.search.length) {
+                return [];
+            }
+
+            const output = [];
+            const entries = this.internalDomainObject.configuration.entries;
+            const sectionKeys = Object.keys(entries);
+            sectionKeys.forEach(sectionKey => {
+                const pages = entries[sectionKey];
+                const pageKeys = Object.keys(pages);
+                pageKeys.forEach(pageKey => {
+                    const pageEntries = entries[sectionKey][pageKey];
+                    pageEntries.forEach(entry => {
+                        if (entry.text && entry.text.toLowerCase().includes(this.search.toLowerCase())) {
+                            const section = this.getSection(sectionKey);
+                            output.push({
+                                section,
+                                page: this.getPage(section, pageKey),
+                                entry
+                            });
+                        }
+                    });
+                });
+            });
+
+            return output;
+        },
+        getPages() {
+            const selectedSection = this.getSelectedSection();
+            if (!selectedSection || !selectedSection.pages.length) {
+                return [];
+            }
+
+            return selectedSection.pages;
+        },
+        getSelectedPage() {
+            const pages = this.getPages();
+            if (!pages) {
+                return null;
+            }
+
+            const selectedPage = pages.find(page => page.isSelected);
+            if (selectedPage) {
+                return selectedPage;
+            }
+
+            if (!selectedPage && !pages.length) {
+                return null;
+            }
+
+            pages[0].isSelected = true;
+
+            return pages[0];
+        },
+        getSelectedSection() {
+            if (!this.sections.length) {
+                return null;
+            }
+
+            return this.sections.find(section => section.isSelected);
+        },
+        mutateObject(key, value) {
+            this.openmct.objects.mutate(this.internalDomainObject, key, value);
+        },
+        navigateToSectionPage() {
+            const { pageId, sectionId } = this.openmct.router.getParams();
+            if(!pageId || !sectionId) {
+                return;
+            }
+
+            const sections = this.sections.map(s => {
+                s.isSelected = false;
+                if (s.id === sectionId) {
+                    s.isSelected = true;
+                    s.pages.forEach(p => p.isSelected = (p.id === pageId));
+                }
+
+                return s;
+            });
+
+            this.updateSection({ sections });
+        },
+        newEntry(embed = null) {
+            this.search = '';
+            const notebookStorage = this.createNotebookStorageObject();
+            this.updateDefaultNotebook(notebookStorage);
+            const id = addNotebookEntry(this.openmct, this.internalDomainObject, notebookStorage, embed);
+            this.focusEntryId = id;
+            this.search = '';
+        },
+        orientationChange() {
+            this.formatSidebar();
+        },
+        removeDefaultClass(domainObject) {
+            if (!domainObject) {
+                return;
+            }
+
+            const classList = domainObject.classList || [];
+            const index = classList.indexOf(DEFAULT_CLASS);
+            if (!classList.length || index < 0) {
+                return;
+            }
+
+            classList.splice(index, 1);
+            this.openmct.objects.mutate(domainObject, 'classList', classList);
+        },
+        searchItem(input) {
+            this.search = input;
+        },
+        toggleNav() {
+            this.showNav = !this.showNav;
+        },
+        async updateDefaultNotebook(notebookStorage) {
+            const defaultNotebookObject = await this.getDefaultNotebookObject();
+            this.removeDefaultClass(defaultNotebookObject);
+            setDefaultNotebook(notebookStorage);
+            this.addDefaultClass();
+            this.defaultSectionId = notebookStorage.section.id;
+            this.defaultPageId = notebookStorage.page.id;
+        },
+        updateDefaultNotebookPage(pages, id) {
+            if (!id) {
+                return;
+            }
+
+            const notebookStorage = getDefaultNotebook();
+            if (!notebookStorage
+                    || notebookStorage.notebookMeta.identifier.key !== this.internalDomainObject.identifier.key) {
+                return;
+            }
+
+            const defaultNotebookPage = notebookStorage.page;
+            const page = pages.find(p => p.id === id);
+            if (!page && defaultNotebookPage.id === id) {
+                this.defaultSectionId = null;
+                this.defaultPageId = null
+                this.removeDefaultClass(this.internalDomainObject);
+                clearDefaultNotebook();
+
+                return;
+            }
+
+            if (id !== defaultNotebookPage.id) {
+                return;
+            }
+
+            setDefaultNotebookPage(page);
+        },
+        updateDefaultNotebookSection(sections, id) {
+            if (!id) {
+                return;
+            }
+
+            const notebookStorage = getDefaultNotebook();
+            if (!notebookStorage
+                    || notebookStorage.notebookMeta.identifier.key !== this.internalDomainObject.identifier.key) {
+                return;
+            }
+
+            const defaultNotebookSection = notebookStorage.section;
+            const section = sections.find(s => s.id === id);
+            if (!section && defaultNotebookSection.id === id) {
+                this.defaultSectionId = null;
+                this.defaultPageId = null
+                this.removeDefaultClass(this.internalDomainObject);
+                clearDefaultNotebook();
+
+                return;
+            }
+
+            if (section.id !== defaultNotebookSection.id) {
+                return;
+            }
+
+            setDefaultNotebookSection(section);
+        },
+        updateEntries(entries) {
+            const configuration = this.internalDomainObject.configuration;
+            const notebookEntries = configuration.entries || {};
+            notebookEntries[this.selectedSection.id][this.selectedPage.id] = entries;
+
+            this.mutateObject('configuration.entries', notebookEntries);
+        },
+        updateInternalDomainObject(domainObject) {
+            this.internalDomainObject = domainObject;
+        },
+        updatePage({ pages = [], id = null}) {
+            const selectedSection = this.getSelectedSection();
+            if (!selectedSection) {
+                return;
+            }
+
+            selectedSection.pages = pages;
+            const sections = this.sections.map(section => {
+                if (section.id === selectedSection.id) {
+                    section = selectedSection;
+                }
+
+                return section;
+            });
+
+            this.updateSection({ sections });
+            this.updateDefaultNotebookPage(pages, id);
+        },
+        updateParams(sections) {
+            const selectedSection = sections.find(s => s.isSelected);
+            if (!selectedSection) {
+                return;
+            }
+
+            const selectedPage = selectedSection.pages.find(p => p.isSelected);
+            if (!selectedPage) {
+                return;
+            }
+
+            const sectionId = selectedSection.id;
+            const pageId = selectedPage.id;
+
+            if (!sectionId || !pageId) {
+                return;
+            }
+
+            this.openmct.router.updateParams({
+                sectionId,
+                pageId
+            });
+        },
+        updateSection({ sections, id = null }) {
+            this.mutateObject('configuration.sections', sections);
+
+            this.updateParams(sections);
+            this.updateDefaultNotebookSection(sections, id);
+        }
+    }
+}
+</script>
--- a/src/plugins/notebook/components/page-collection.vue
+++ b/src/plugins/notebook/components/page-collection.vue
@@ -0,0 +1,132 @@
+<template>
+<ul class="c-list">
+    <li v-for="page in pages"
+        :key="page.id"
+        class="c-list__item-h"
+    >
+        <Page ref="pageComponent"
+              :default-page-id="defaultPageId"
+              :page="page"
+              :page-title="pageTitle"
+              @deletePage="deletePage"
+              @renamePage="updatePage"
+              @selectPage="selectPage"
+        />
+    </li>
+</ul>
+</template>
+
+<script>
+import { deleteNotebookEntries } from '../utils/notebook-entries';
+import { getDefaultNotebook } from '../utils/notebook-storage';
+import Page from './page-component.vue';
+
+export default {
+    inject: ['openmct'],
+    components: {
+        Page
+    },
+    props: {
+        defaultPageId: {
+            type: String,
+            default() {
+                return '';
+            }
+        },
+        domainObject: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        pages: {
+            type: Array,
+            required: true,
+            default() {
+                return [];
+            }
+        },
+        sections: {
+            type: Array,
+            required: true,
+            default() {
+                return [];
+            }
+        },
+        pageTitle: {
+            type: String,
+            default() {
+                return '';
+            }
+        },
+        sidebarCoversEntries: {
+            type: Boolean,
+            default() {
+                return false;
+            }
+        }
+    },
+    data() {
+        return {
+        }
+    },
+    watch: {
+    },
+    mounted() {
+    },
+    destroyed() {
+    },
+    methods: {
+        deletePage(id) {
+            const selectedSection = this.sections.find(s => s.isSelected);
+            const page = this.pages.filter(p => p.id !== id);
+            deleteNotebookEntries(this.openmct, this.domainObject, selectedSection, page);
+
+            const selectedPage = this.pages.find(p => p.isSelected);
+            const defaultNotebook = getDefaultNotebook();
+            const defaultpage = defaultNotebook && defaultNotebook.page;
+            const isPageSelected = selectedPage && selectedPage.id === id;
+            const isPageDefault = defaultpage && defaultpage.id === id;
+            const pages = this.pages.filter(s => s.id !== id);
+
+            if (isPageSelected && defaultpage) {
+                pages.forEach(s => {
+                    s.isSelected = false;
+                    if (defaultpage && defaultpage.id === s.id) {
+                        s.isSelected = true;
+                    }
+                });
+            }
+
+            if (pages.length && isPageSelected && (!defaultpage || isPageDefault)) {
+                pages[0].isSelected = true;
+            }
+
+            this.$emit('updatePage', { pages, id });
+        },
+        selectPage(id) {
+            const pages = this.pages.map(page => {
+                const isSelected = page.id === id;
+                page.isSelected = isSelected;
+
+                return page;
+            });
+
+            this.$emit('updatePage', { pages, id });
+
+            // Add test here for whether or not to toggle the nav
+            if (this.sidebarCoversEntries) {
+                this.$emit('toggleNav');
+            }
+        },
+        updatePage(newPage) {
+            const id = newPage.id;
+            const pages = this.pages.map(page =>
+                page.id === id
+                    ? newPage
+                    : page);
+            this.$emit('updatePage', { pages, id });
+        }
+    }
+}
+</script>
--- a/src/plugins/notebook/components/page-component.vue
+++ b/src/plugins/notebook/components/page-component.vue
@@ -0,0 +1,127 @@
+<template>
+<div class="c-list__item js-list__item"
+     :class="[{ 'is-selected': page.isSelected, 'is-notebook-default' : (defaultPageId === page.id) }]"
+     :data-id="page.id"
+     @click="selectPage"
+>
+    <span class="c-list__item__name js-list__item__name"
+          :data-id="page.id"
+          @keydown.enter="updateName"
+          @blur="updateName"
+    >{{ page.name.length ? page.name : `Unnamed ${pageTitle}` }}</span>
+    <PopupMenu :popup-menu-items="popupMenuItems" />
+</div>
+</template>
+
+<script>
+import PopupMenu from './popup-menu.vue';
+import RemoveDialog from '../utils/removeDialog';
+
+export default {
+    inject: ['openmct'],
+    components: {
+        PopupMenu
+    },
+    props: {
+        defaultPageId: {
+            type: String,
+            default() {
+                return '';
+            }
+        },
+        page: {
+            type: Object,
+            required: true
+        },
+        pageTitle: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            popupMenuItems: [],
+            removeActionString: `Delete ${this.pageTitle}`
+        }
+    },
+    watch: {
+        page(newPage) {
+            this.toggleContentEditable(newPage);
+        }
+    },
+    mounted() {
+        this.addPopupMenuItems();
+        this.toggleContentEditable();
+    },
+    destroyed() {
+    },
+    methods: {
+        addPopupMenuItems() {
+            const removePage = {
+                cssClass: 'icon-trash',
+                name: this.removeActionString,
+                callback: this.getRemoveDialog.bind(this)
+            }
+
+            this.popupMenuItems = [removePage];
+        },
+        deletePage(success) {
+            if (!success) {
+                return;
+            }
+
+            this.$emit('deletePage', this.page.id);
+        },
+        getRemoveDialog() {
+            const message = 'This action will delete this page and all of its entries. Do you want to continue?';
+            const options = {
+                name: this.removeActionString,
+                callback: this.deletePage.bind(this),
+                message
+            }
+            const removeDialog = new RemoveDialog(this.openmct, options);
+            removeDialog.show();
+        },
+        selectPage(event) {
+            const target = event.target;
+            const page = target.closest('.js-list__item');
+            const input = page.querySelector('.js-list__item__name');
+
+            if (page.className.indexOf('is-selected') > -1) {
+                input.contentEditable = true;
+                input.classList.add('c-input-inline');
+                return;
+            }
+
+            const id = target.dataset.id;
+            if (!id) {
+                return;
+            }
+
+            this.$emit('selectPage', id);
+        },
+        toggleContentEditable(page = this.page) {
+            const pageTitle = this.$el.querySelector('span');
+            pageTitle.contentEditable = page.isSelected;
+        },
+        updateName(event) {
+            const target = event.target;
+            const name = target.textContent.toString();
+            target.contentEditable = false;
+            target.classList.remove('c-input-inline');
+
+            if (this.page.name === name) {
+                return;
+            }
+
+            if (name === '') {
+                return;
+            }
+
+            this.$emit('renamePage', Object.assign(this.page, { name }));
+        }
+    }
+}
+</script>
--- a/src/plugins/notebook/components/popup-menu.vue
+++ b/src/plugins/notebook/components/popup-menu.vue
@@ -0,0 +1,93 @@
+<template>
+<button
+    class="c-popup-menu-button c-disclosure-button"
+    title="popup menu"
+    @click="showMenuItems"
+>
+</button>
+</template>
+
+<script>
+import MenuItems from './menu-items.vue';
+import Vue from 'vue';
+
+export default {
+    inject: ['openmct'],
+    props: {
+        domainObject: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        popupMenuItems: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            menuItems: null
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        calculateMenuPosition(event, element) {
+            let eventPosX = event.clientX;
+            let eventPosY = event.clientY;
+
+            let menuDimensions = element.getBoundingClientRect();
+            let overflowX = (eventPosX + menuDimensions.width) - document.body.clientWidth;
+            let overflowY = (eventPosY + menuDimensions.height) - document.body.clientHeight;
+
+            if (overflowX > 0) {
+                eventPosX = eventPosX - overflowX;
+            }
+
+            if (overflowY > 0) {
+                eventPosY = eventPosY - overflowY;
+            }
+
+            return {
+                x: eventPosX,
+                y: eventPosY
+            }
+        },
+        hideMenuItems() {
+            document.body.removeChild(this.menuItems.$el);
+            this.menuItems.$destroy();
+            this.menuItems = null;
+            document.removeEventListener('click', this.hideMenuItems);
+
+            return;
+        },
+        showMenuItems($event) {
+            const menuItems = new Vue({
+                components: {
+                    MenuItems
+                },
+                provide: {
+                    popupMenuItems: this.popupMenuItems
+                },
+                template: '<MenuItems />'
+            });
+            this.menuItems = menuItems;
+
+            menuItems.$mount();
+            const element = this.menuItems.$el;
+            document.body.appendChild(element);
+
+            const position = this.calculateMenuPosition($event, element);
+            element.style.left = `${position.x}px`;
+            element.style.top = `${position.y}px`;
+
+            setTimeout(() => {
+                document.addEventListener('click', this.hideMenuItems);
+            }, 0);
+        }
+    }
+}
+</script>
--- a/src/plugins/notebook/components/search-results.vue
+++ b/src/plugins/notebook/components/search-results.vue
@@ -0,0 +1,50 @@
+<template>
+<div class="c-notebook__search-results">
+    <div class="c-notebook__search-results__header">Search Results</div>
+    <div class="c-notebook__entries">
+        <NotebookEntry v-for="(result, index) in results"
+                       :key="index"
+                       :result="result"
+                       :entry="result.entry"
+                       :read-only="true"
+                       :selected-page="null"
+                       :selected-section="null"
+                       @changeSectionPage="changeSectionPage"
+        />
+    </div>
+</div>
+</template>
+
+<script>
+import NotebookEntry from './notebook-entry.vue';
+
+export default {
+    inject: ['openmct', 'domainObject'],
+    components: {
+        NotebookEntry
+    },
+    props:{
+        results: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {}
+    },
+    watch: {
+        results(newResults) {}
+    },
+    destroyed() {
+    },
+    mounted() {
+    },
+    methods: {
+        changeSectionPage(data) {
+            this.$emit('changeSectionPage', data);
+        }
+    }
+}
+</script>
--- a/src/plugins/notebook/components/section-collection.vue
+++ b/src/plugins/notebook/components/section-collection.vue
@@ -0,0 +1,113 @@
+<template>
+<ul class="c-list">
+    <li v-for="section in sections"
+        :key="section.id"
+        class="c-list__item-h"
+    >
+        <sectionComponent ref="sectionComponent"
+                          :default-section-id="defaultSectionId"
+                          :section="section"
+                          :section-title="sectionTitle"
+                          @deleteSection="deleteSection"
+                          @renameSection="updateSection"
+                          @selectSection="selectSection"
+        />
+    </li>
+</ul>
+</template>
+
+<script>
+import { deleteNotebookEntries } from '../utils/notebook-entries';
+import { getDefaultNotebook } from '../utils/notebook-storage';
+import sectionComponent from './section-component.vue';
+
+export default {
+    inject: ['openmct'],
+    components: {
+        sectionComponent
+    },
+    props: {
+        defaultSectionId: {
+            type: String,
+            default() {
+                return '';
+            }
+        },
+        domainObject: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        sections: {
+            type: Array,
+            required: true,
+            default() {
+                return [];
+            }
+        },
+        sectionTitle: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+        }
+    },
+    watch: {
+    },
+    mounted() {
+    },
+    destroyed() {
+    },
+    methods: {
+        deleteSection(id) {
+            const section = this.sections.find(s => s.id === id);
+            deleteNotebookEntries(this.openmct, this.domainObject, section);
+
+            const selectedSection = this.sections.find(s => s.isSelected);
+            const defaultNotebook = getDefaultNotebook();
+            const defaultSection = defaultNotebook && defaultNotebook.section;
+            const isSectionSelected = selectedSection && selectedSection.id === id;
+            const isSectionDefault = defaultSection && defaultSection.id === id;
+            const sections = this.sections.filter(s => s.id !== id);
+
+            if (isSectionSelected && defaultSection) {
+                sections.forEach(s => {
+                    s.isSelected = false;
+                    if (defaultSection && defaultSection.id === s.id) {
+                        s.isSelected = true;
+                    }
+                });
+            }
+
+            if (sections.length && isSectionSelected && (!defaultSection || isSectionDefault)) {
+                sections[0].isSelected = true;
+            }
+
+            this.$emit('updateSection', { sections, id });
+        },
+        selectSection(id, newSections) {
+            const currentSections = newSections || this.sections;
+            const sections = currentSections.map(section => {
+                const isSelected = section.id === id;
+                section.isSelected = isSelected;
+
+                return section;
+            });
+            this.$emit('updateSection', { sections, id });
+        },
+        updateSection(newSection) {
+            const id = newSection.id;
+            const sections = this.sections.map(section =>
+                section.id === id
+                    ? newSection
+                    : section);
+            this.$emit('updateSection', { sections, id });
+        }
+    }
+}
+</script>
--- a/src/plugins/notebook/components/section-component.vue
+++ b/src/plugins/notebook/components/section-component.vue
@@ -0,0 +1,132 @@
+<template>
+<div class="c-list__item js-list__item"
+     :class="[{ 'is-selected': section.isSelected, 'is-notebook-default' : (defaultSectionId === section.id) }]"
+     :data-id="section.id"
+     @click="selectSection"
+>
+    <span class="c-list__item__name js-list__item__name"
+          :data-id="section.id"
+          @keydown.enter="updateName"
+          @blur="updateName"
+    >{{ section.name.length ? section.name : `Unnamed ${sectionTitle}` }}</span>
+    <PopupMenu :popup-menu-items="popupMenuItems" />
+</div>
+</template>
+
+<style lang="scss">
+</style>
+
+<script>
+import PopupMenu from './popup-menu.vue';
+import RemoveDialog from '../utils/removeDialog';
+
+export default {
+    inject: ['openmct'],
+    components: {
+        PopupMenu
+    },
+    props: {
+        defaultSectionId: {
+            type: String,
+            default() {
+                return '';
+            }
+        },
+        section: {
+            type: Object,
+            required: true
+        },
+        sectionTitle: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            popupMenuItems: [],
+            removeActionString: `Delete ${this.sectionTitle}`
+        }
+    },
+    watch: {
+        section(newSection) {
+            this.toggleContentEditable(newSection);
+        }
+    },
+    mounted() {
+        this.addPopupMenuItems();
+        this.toggleContentEditable();
+    },
+    destroyed() {
+    },
+    methods: {
+        addPopupMenuItems() {
+            const removeSection = {
+                cssClass: 'icon-trash',
+                name: this.removeActionString,
+                callback: this.getRemoveDialog.bind(this)
+            }
+
+            this.popupMenuItems = [removeSection];
+        },
+        deleteSection(success) {
+            if (!success) {
+                return;
+            }
+
+            this.$emit('deleteSection', this.section.id);
+        },
+        getRemoveDialog() {
+            const message = 'This action will delete this section and all of its pages and entries. Do you want to continue?';
+            const options = {
+                name: this.removeActionString,
+                callback: this.deleteSection.bind(this),
+                message
+            }
+
+            const removeDialog = new RemoveDialog(this.openmct, options);
+            removeDialog.show();
+        },
+        selectSection(event) {
+            const target = event.target;
+            const section = target.closest('.js-list__item');
+            const input = section.querySelector('.js-list__item__name');
+
+            if (section.className.indexOf('is-selected') > -1) {
+                input.contentEditable = true;
+                input.classList.add('c-input-inline');
+                return;
+            }
+
+            const id = target.dataset.id;
+
+            if (!id) {
+                return;
+            }
+
+            this.$emit('selectSection', id);
+        },
+        toggleContentEditable(section = this.section) {
+            const sectionTitle = this.$el.querySelector('span');
+            sectionTitle.contentEditable = section.isSelected;
+        },
+        updateName(event) {
+            const target = event.target;
+            target.contentEditable = false;
+            target.classList.remove('c-input-inline');
+            const name = target.textContent.trim();
+
+            if (this.section.name === name) {
+                return;
+            }
+
+            if (name === '') {
+                return;
+            }
+
+            this.$emit('renameSection', Object.assign(this.section, { name }));
+        }
+    }
+}
+</script>
--- a/src/plugins/notebook/components/sidebar.scss
+++ b/src/plugins/notebook/components/sidebar.scss
@@ -0,0 +1,119 @@
+.c-sidebar {
+    @include userSelectNone();
+    background: $sideBarBg;
+    display: flex;
+    justify-content: stretch;
+    max-width: 300px;
+
+    &.c-drawer--push.is-expanded {
+        margin-right: $interiorMargin;
+        width: 50%;
+    }
+
+    &.c-drawer--overlays.is-expanded {
+        width: 95%;
+    }
+
+    > * {
+        // Hardcoded for two columns
+        background: $sideBarBg;
+        display: flex;
+        flex: 1 1 50%;
+        flex-direction: column;
+
+        + * {
+            margin-left: $interiorMarginSm;
+        }
+
+        > * + * {
+            // Add margin-top to first and second level children
+            margin-top: $interiorMargin;
+        }
+    }
+
+    &__pane {
+        > * + * { margin-top: $interiorMargin; }
+    }
+
+    &__header-w {
+        // Wraps header, used for page pane with collapse button
+        display: flex;
+        flex: 0 0 auto;
+        background: $sideBarHeaderBg;
+        align-items: center;
+
+        .c-icon-button {
+            font-size: 0.8em;
+            color: $colorBodyFg;
+        }
+    }
+
+    &__header {
+        color: $sideBarHeaderFg;
+        display: flex;
+        flex: 1 1 auto;
+        padding: $interiorMargin;
+        text-transform: uppercase;
+
+        > * {
+            @include ellipsize();
+        }
+    }
+
+    &__contents-and-controls {
+        // Encloses pane buttons and contents elements
+        display: flex;
+        flex-direction: column;
+        flex: 1 1 auto;
+
+        > * {
+            margin: auto $interiorMargin $interiorMargin $interiorMargin;
+
+            &:first-child {
+                border-bottom: 1px solid $colorInteriorBorder;
+                flex: 0 0 auto;
+            }
+
+            + * {
+                margin-top: $interiorMargin;
+            }
+        }
+    }
+
+    &__contents {
+        flex: 1 1 auto;
+        overflow-x: hidden;
+        overflow-y: auto;
+        padding: auto $interiorMargin;
+    }
+
+    .c-list-button {
+        .c-button {
+            font-size: 0.8em;
+        }
+    }
+
+    .c-list__item {
+        @include hover() {
+            [class*="__menu-indicator"] {
+                opacity: 0.7;
+                transition: $transIn;
+            }
+        }
+
+        > * + * {
+            margin-left: $interiorMargin;
+        }
+
+        &__name {
+            flex: 0 1 auto;
+        }
+
+        &__menu-indicator {
+            flex: 0 0 auto;
+            font-size: 0.8em;
+            opacity: 0;
+            transition: $transOut;
+        }
+    }
+}
--- a/src/plugins/notebook/components/sidebar.vue
+++ b/src/plugins/notebook/components/sidebar.vue
@@ -0,0 +1,189 @@
+<template>
+<div class="c-sidebar c-drawer c-drawer--align-left">
+    <div class="c-sidebar__pane">
+        <div class="c-sidebar__header-w">
+            <div class="c-sidebar__header">
+                <span class="c-sidebar__header-label">{{ sectionTitle }}</span>
+            </div>
+        </div>
+        <div class="c-sidebar__contents-and-controls">
+            <button class="c-list-button"
+                    @click="addSection"
+            >
+                <span class="c-button c-list-button__button icon-plus"></span>
+                <span class="c-list-button__label">Add {{ sectionTitle }}</span>
+            </button>
+            <SectionCollection class="c-sidebar__contents"
+                               :default-section-id="defaultSectionId"
+                               :domain-object="domainObject"
+                               :sections="sections"
+                               :section-title="sectionTitle"
+                               @updateSection="updateSection"
+            />
+        </div>
+    </div>
+    <div class="c-sidebar__pane">
+        <div class="c-sidebar__header-w">
+            <div class="c-sidebar__header">
+                <span class="c-sidebar__header-label">{{ pageTitle }}</span>
+            </div>
+            <button class="c-click-icon c-click-icon--major icon-x-in-circle"
+                    @click="toggleNav"
+            ></button>
+        </div>
+
+        <div class="c-sidebar__contents-and-controls">
+            <button class="c-list-button"
+                    @click="addPage"
+            >
+                <span class="c-button c-list-button__button icon-plus"></span>
+                <span class="c-list-button__label">Add {{ pageTitle }}</span>
+            </button>
+            <PageCollection ref="pageCollection"
+                            class="c-sidebar__contents"
+                            :default-page-id="defaultPageId"
+                            :domain-object="domainObject"
+                            :pages="pages"
+                            :sections="sections"
+                            :sidebar-covers-entries="sidebarCoversEntries"
+                            :page-title="pageTitle"
+                            @toggleNav="toggleNav"
+                            @updatePage="updatePage"
+            />
+        </div>
+    </div>
+</div>
+</template>
+
+<script>
+import SectionCollection from './section-collection.vue';
+import PageCollection from './page-collection.vue';
+import uuid from 'uuid';
+
+export default {
+    inject: ['openmct'],
+    components: {
+        SectionCollection,
+        PageCollection
+    },
+    props: {
+        defaultPageId: {
+            type: String,
+            default() {
+                return '';
+            }
+        },
+        defaultSectionId: {
+            type: String,
+            default() {
+                return '';
+            }
+        },
+        domainObject: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        pages: {
+            type: Array,
+            required: true,
+            default() {
+                return [];
+            }
+        },
+        pageTitle: {
+            type: String,
+            default() {
+                return '';
+            }
+        },
+        sections: {
+            type: Array,
+            required: true,
+            default() {
+                return [];
+            }
+        },
+        sectionTitle: {
+            type: String,
+            default() {
+                return '';
+            }
+        },
+        sidebarCoversEntries: {
+            type: Boolean,
+            default() {
+                return false;
+            }
+        }
+    },
+    data() {
+        return {
+        }
+    },
+    watch: {
+        pages(newpages) {
+            if (!newpages.length) {
+                this.addPage();
+            }
+        },
+        sections(newSections) {
+            if (!newSections.length) {
+                this.addSection();
+            }
+        }
+    },
+    mounted() {
+        if (!this.sections.length) {
+            this.addSection();
+        }
+    },
+    destroyed() {
+    },
+    methods: {
+        addPage() {
+            const pageTitle = this.pageTitle;
+            const id = uuid();
+            const page = {
+                id,
+                isDefault : false,
+                isSelected: true,
+                name : `Unnamed ${pageTitle}`,
+                pageTitle
+            };
+
+            this.pages.forEach(p => p.isSelected = false);
+            const pages = this.pages.concat(page);
+
+            this.updatePage({ pages, id });
+        },
+        addSection() {
+            const sectionTitle = this.sectionTitle;
+            const id = uuid();
+            const section = {
+                id,
+                isDefault : false,
+                isSelected: true,
+                name : `Unnamed ${sectionTitle}`,
+                pages : [],
+                sectionTitle
+            };
+
+            this.sections.forEach(s => s.isSelected = false);
+            const sections = this.sections.concat(section);
+
+            this.updateSection({ sections, id });
+        },
+        toggleNav() {
+            this.$emit('toggleNav');
+        },
+        updatePage({ pages, id }) {
+            this.$emit('updatePage', { pages, id });
+        },
+        updateSection({ sections, id }) {
+            this.$emit('updateSection', { sections, id });
+        }
+    }
+}
+</script>
--- a/src/plugins/notebook/res/templates/snapshotTemplate.html
+++ b/src/plugins/notebook/res/templates/snapshotTemplate.html
@@ -3,10 +3,10 @@
    <div class="c-notebook-snapshot__header l-browse-bar">
        <div class="l-browse-bar__start">
            <div class="l-browse-bar__object-name--w">
-                <span class="l-browse-bar__object-name"
+                <span class="c-object-label l-browse-bar__object-name"
                    v-bind:class="embed.cssClass"
                >
-                    {{embed.name}}
+                    <span class="c-object-label__name">{{ embed.name }}</span>
                </span>
            </div>
        </div>
@@ -21,9 +21,8 @@
        </div>
    </div>

-    <div class="c-notebook-snapshot__image">
-        <div class="image-main s-image-main"
-            :style="{ backgroundImage: 'url(' + embed.snapshot.src + ')' }"
-        ></div>
+    <div class="c-notebook-snapshot__image"
+         :style="{ backgroundImage: 'url(' + embed.snapshot.src + ')' }"
+    >
    </div>
 </div>
--- a/src/plugins/notebook/notebook-constants.js
+++ b/src/plugins/notebook/notebook-constants.js
@@ -0,0 +1,3 @@
+export const EVENT_SNAPSHOTS_UPDATED = 'SNAPSHOTS_UPDATED';
+export const NOTEBOOK_DEFAULT = 'DEFAULT';
+export const NOTEBOOK_SNAPSHOT = 'SNAPSHOT';
--- a/src/plugins/notebook/plugin.js
+++ b/src/plugins/notebook/plugin.js
@@ -1,99 +1,134 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
+import Notebook from './components/notebook.vue';
+import NotebookSnapshotIndicator from './components/notebook-snapshot-indicator.vue';
+import SnapshotContainer from './snapshot-container';
+import Vue from 'vue';

-define([
-    "./src/controllers/NotebookController"
-], function (
-    NotebookController
-) {
-    var installed  = false;
+let installed  = false;

-    function NotebookPlugin() {
-        return function install(openmct) {
-            if (installed) {
-                return;
-            }
+export default function NotebookPlugin() {
+    return function install(openmct) {
+        if (installed) {
+            return;
+        }

-            installed = true;
+        installed = true;

-            openmct.legacyRegistry.register('notebook', {
-                name: 'Notebook Plugin',
-                extensions: {
-                    types: [
+        const notebookType = {
+            name: 'Notebook',
+            description: 'Create and save timestamped notes with embedded object snapshots.',
+            creatable: true,
+            cssClass: 'icon-notebook',
+            initialize: domainObject => {
+                domainObject.configuration = {
+                    defaultSort: 'oldest',
+                    entries: {},
+                    pageTitle: 'Page',
+                    sections: [],
+                    sectionTitle: 'Section',
+                    type: 'General'
+                };
+            },
+            form: [
+                {
+                    key: 'defaultSort',
+                    name: 'Entry Sorting',
+                    control: 'select',
+                    options: [
                        {
-                            key: 'notebook',
-                            name: 'Notebook',
-                            cssClass: 'icon-notebook',
-                            description: 'Create and save timestamped notes with embedded object snapshots.',
-                            features: 'creation',
-                            model: {
-                                entries: [],
-                                entryTypes: [],
-                                defaultSort: 'oldest'
-                            },
-                            properties: [
-                                {
-                                    key: 'defaultSort',
-                                    name: 'Default Sort',
-                                    control: 'select',
-                                    options: [
-                                        {
-                                            name: 'Newest First',
-                                            value: "newest"
-                                        },
-                                        {
-                                            name: 'Oldest First',
-                                            value: "oldest"
-                                        }
-                                    ],
-                                    cssClass: 'l-inline'
-                                }
-                            ]
+                            name: 'Newest First',
+                            value: "newest"
+                        },
+                        {
+                            name: 'Oldest First',
+                            value: "oldest"
                        }
+                    ],
+                    cssClass: 'l-inline',
+                    property: [
+                        "configuration",
+                        "defaultSort"
+                    ]
+                },
+                {
+                    key: 'type',
+                    name: 'Note book Type',
+                    control: 'textfield',
+                    cssClass: 'l-inline',
+                    property: [
+                        "configuration",
+                        "type"
+                    ]
+                },
+                {
+                    key: 'sectionTitle',
+                    name: 'Section Title',
+                    control: 'textfield',
+                    cssClass: 'l-inline',
+                    property: [
+                        "configuration",
+                        "sectionTitle"
+                    ]
+                },
+                {
+                    key: 'pageTitle',
+                    name: 'Page Title',
+                    control: 'textfield',
+                    cssClass: 'l-inline',
+                    property: [
+                        "configuration",
+                        "pageTitle"
                    ]
                }
-            });
+            ]
+        };
+        openmct.types.addType('notebook', notebookType);

-            openmct.legacyRegistry.enable('notebook');
-
-            openmct.objectViews.addProvider({
-                key: 'notebook-vue',
-                name: 'Notebook View',
-                cssClass: 'icon-notebook',
-                canView: function (domainObject) {
-                    return domainObject.type === 'notebook';
-                },
-                view: function (domainObject) {
-                    var controller = new NotebookController (openmct, domainObject);
-
-                    return {
-                        show: controller.show,
-                        destroy: controller.destroy
-                    };
-                }
-            });
+        const snapshotContainer = new SnapshotContainer(openmct);
+        const notebookSnapshotIndicator = new Vue ({
+            provide: {
+                openmct,
+                snapshotContainer
+            },
+            components: {
+                NotebookSnapshotIndicator
+            },
+            template: '<NotebookSnapshotIndicator></NotebookSnapshotIndicator>'
+        });
+        const indicator = {
+            element: notebookSnapshotIndicator.$mount().$el
        };

-    }
+        openmct.indicators.add(indicator);

-    return NotebookPlugin;
-});
+        openmct.objectViews.addProvider({
+            key: 'notebook-vue',
+            name: 'Notebook View',
+            cssClass: 'icon-notebook',
+            canView: function (domainObject) {
+                return domainObject.type === 'notebook';
+            },
+            view: function (domainObject) {
+                let component;
+                return {
+                    show(container) {
+                        component = new Vue({
+                            el: container,
+                            components: {
+                                Notebook
+                            },
+                            provide: {
+                                openmct,
+                                domainObject,
+                                snapshotContainer
+                            },
+                            template: '<Notebook></Notebook>'
+                        });
+                    },
+                    destroy() {
+                        component.$destroy();
+                    }
+                };
+            }
+        });
+    };
+}
--- a/src/plugins/notebook/res/templates/embed.html
+++ b/src/plugins/notebook/res/templates/embed.html
@@ -1,33 +0,0 @@
-<div class="c-ne__embed">
-    <div class="c-ne__embed__snap-thumb"
-        v-if="embed.snapshot"
-        v-on:click="openSnapshot(domainObject, entry, embed)">
-        <img v-bind:src="embed.snapshot.src">
-    </div>
-    <div class="c-ne__embed__info">
-        <div class="c-ne__embed__name">
-            <a class="c-ne__embed__link"
-               :href="objectLink"
-               :class="embed.cssClass">{{embed.name}}</a>
-            <a class="c-ne__embed__context-available icon-arrow-down"
-               @click="toggleActionMenu"></a>
-        </div>
-        <div class="hide-menu hidden">
-            <div class="menu-element context-menu-wrapper mobile-disable-select">
-                <div class="c-menu">
-                    <ul>
-                        <li v-for="action in actions"
-                            :key="action.name" 
-                            :class="action.cssClass"
-                            @click="action.perform(embed, entry)">
-                            {{ action.name }}
-                        </li> 
-                    </ul>
-                </div>
-            </div>
-        </div>
-        <div class="c-ne__embed__time" v-if="embed.snapshot">
-                {{formatTime(embed.createdOn, 'YYYY-MM-DD HH:mm:ss')}}
-        </div>
-    </div>
-</div>
--- a/src/plugins/notebook/res/templates/entry.html
+++ b/src/plugins/notebook/res/templates/entry.html
@@ -1,34 +0,0 @@
-<li class="c-notebook__entry c-ne has-local-controls"
-    @drop.prevent="dropOnEntry(entry.id, $event)">
-    <div class="c-ne__time-and-content">
-        <div class="c-ne__time">
-            <span>{{formatTime(entry.createdOn, 'YYYY-MM-DD')}}</span>
-            <span>{{formatTime(entry.createdOn, 'HH:mm:ss')}}</span>
-        </div>
-        <div class="c-ne__content">
-            <div class="c-ne__text c-input-inline"
-                 contenteditable="true"
-                 ref="contenteditable"
-                 @blur="textBlur($event, entry.id)"
-                 @focus="textFocus($event, entry.id)"
-                 v-html="entry.text">
-            </div>
-            <div class="c-ne__embeds">
-                <notebook-embed
-                    v-for="embed in entry.embeds"
-                    :key="embed.id"
-                    :embed="embed"
-                    :objectPath="embed.objectPath"
-                    :entry="entry">
-                </notebook-embed>
-            </div>
-        </div>
-    </div>
-
-    <div class="c-ne__local-controls--hidden">
-        <button class="c-icon-button c-icon-button--major icon-trash"
-           title="Delete this entry"
-           @click="deleteEntry">
-        </button>
-    </div>
-</li>
--- a/src/plugins/notebook/res/templates/notebook.html
+++ b/src/plugins/notebook/res/templates/notebook.html
@@ -1,35 +0,0 @@
-<div class="c-notebook">
-    <div class="c-notebook__head">
-        <search class="c-notebook__search"
-                :value="entrySearch"
-                @input="search"
-                @clear="search">
-            </search>
-        <div class="c-notebook__controls ">
-            <select class="c-notebook__controls__time" v-model="showTime">
-                <option value="0" selected="selected">Show all</option>
-                <option value="1">Last hour</option>
-                <option value="8">Last 8 hours</option>
-                <option value="24">Last 24 hours</option>
-            </select>
-            <select class="c-notebook__controls__time" v-model="sortEntries">
-                <option value="newest" :selected="sortEntries === 'newest'">Newest first</option>
-                <option value="oldest" :selected="sortEntries === 'oldest'">Oldest first</option>
-            </select>
-        </div>
-    </div>
-    <div class="c-notebook__drag-area icon-plus"
-         @click="newEntry($event)"
-         @drop="newEntry($event)">
-        <span class="c-notebook__drag-area__label">To start a new entry, click here or drag and drop any object</span>
-    </div>
-    <div class="c-notebook__entries">
-        <ul>
-            <notebook-entry
-                v-for="(entry,index) in filteredAndSortedEntries"
-                :key="entry.key"
-                :entry="entry">
-            </notebook-entry>
-        </ul>
-    </div>
-</div>
--- a/src/plugins/notebook/res/templates/viewSnapshot.html
+++ b/src/plugins/notebook/res/templates/viewSnapshot.html
@@ -1,50 +0,0 @@
-<div class="abs overlay l-large-view">
-    <div class="abs blocker" v-on:click="close"></div> 
-
-    <div class="abs outer-holder">
-
-        <a 
-            class="close icon-x-in-circle"
-            v-on:click="close">
-        </a>
-
-        <div class="abs inner-holder l-flex-col"> 
-            <div class="t-contents flex-elem holder grows">
-
-                <div class="t-snapshot abs l-view-header">
-                    <div class="abs object-browse-bar l-flex-row">
-                        <div class="left flex-elem l-flex-row grows">
-                            <div class="object-header flex-elem l-flex-row grows">
-                                <div class="type-icon flex-elem embed-icon holder" v-bind:class="embed.cssClass"></div>
-                                <div class="title-label flex-elem holder flex-can-shrink">{{embed.name}}</div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="btn-bar right l-flex-row flex-elem flex-justify-end flex-fixed">
-                    <div class="flex-elem holder flex-can-shrink s-snapshot-datetime">
-                        SNAPSHOT {{formatTime(embed.createdOn, 'YYYY-MM-DD HH:mm:ss')}}
-                    </div>
-                    <a class="s-button icon-pencil" title="Annotate">
-                        <span class="title-label">Annotate</span>
-                    </a>
-                </div>
-
-                <div class="abs object-holder t-image-holder s-image-holder">
-                    <div 
-                        class="image-main s-image-main"
-                        v-bind:style="{ backgroundImage: 'url(' + embed.snapshot.src + ')' }">
-                    </div>
-                </div>
-            </div>
-
-            <div 
-                class="bottom-bar flex-elem holder"
-                v-on:click="close">
- 
-                <a class="t-done s-button major">Done</a> 
-            </div> 
-        </div> 
-    </div>
-</div>
--- a/src/plugins/notebook/snapshot-container.js
+++ b/src/plugins/notebook/snapshot-container.js
@@ -0,0 +1,82 @@
+import EventEmitter from 'EventEmitter';
+import { EVENT_SNAPSHOTS_UPDATED } from './notebook-constants';
+const NOTEBOOK_SNAPSHOT_STORAGE = 'notebook-snapshot-storage';
+
+export const NOTEBOOK_SNAPSHOT_MAX_COUNT = 5;
+
+export default class SnapshotContainer extends EventEmitter {
+    constructor(openmct) {
+        super();
+
+        if (!SnapshotContainer.instance) {
+            SnapshotContainer.instance = this;
+        }
+
+        this.openmct = openmct;
+
+        return SnapshotContainer.instance;
+    }
+
+    addSnapshot(embedObject) {
+        const snapshots = this.getSnapshots();
+        if (snapshots.length >= NOTEBOOK_SNAPSHOT_MAX_COUNT) {
+            snapshots.pop();
+        }
+
+        snapshots.unshift(embedObject);
+
+        return this.saveSnapshots(snapshots);
+    }
+
+    getSnapshot(id) {
+        const snapshots = this.getSnapshots();
+
+        return snapshots.find(s => s.id === id);
+    }
+
+    getSnapshots() {
+        const snapshots = window.localStorage.getItem(NOTEBOOK_SNAPSHOT_STORAGE) || '[]';
+
+        return JSON.parse(snapshots);
+    }
+
+    removeSnapshot(id) {
+        if (!id) {
+            return;
+        }
+
+        const snapshots = this.getSnapshots();
+        const filteredsnapshots = snapshots.filter(snapshot => snapshot.id !== id);
+
+        return this.saveSnapshots(filteredsnapshots);
+    }
+
+    removeAllSnapshots() {
+        return this.saveSnapshots([]);
+    }
+
+    saveSnapshots(snapshots) {
+        try {
+            window.localStorage.setItem(NOTEBOOK_SNAPSHOT_STORAGE, JSON.stringify(snapshots));
+            this.emit(EVENT_SNAPSHOTS_UPDATED, true);
+
+            return true;
+        } catch (e) {
+            const message = 'Insufficient memory in localstorage to store snapshot, please delete some snapshots and try again!';
+            this.openmct.notifications.error(message);
+
+            return false;
+        }
+    }
+
+    updateSnapshot(snapshot) {
+        const snapshots = this.getSnapshots();
+        const updatedSnapshots = snapshots.map(s => {
+            return s.id === snapshot.id
+                ? snapshot
+                : s;
+        });
+
+        return this.saveSnapshots(updatedSnapshots);
+    }
+}
--- a/src/plugins/notebook/snapshot.js
+++ b/src/plugins/notebook/snapshot.js
@@ -0,0 +1,74 @@
+import { addNotebookEntry, createNewEmbed } from './utils/notebook-entries';
+import { getDefaultNotebook } from './utils/notebook-storage';
+import { NOTEBOOK_DEFAULT } from '@/plugins/notebook/notebook-constants';
+import SnapshotContainer from './snapshot-container';
+
+export default class Snapshot {
+    constructor(openmct) {
+        this.openmct = openmct;
+        this.snapshotContainer = new SnapshotContainer(openmct);
+        this.exportImageService = openmct.$injector.get('exportImageService');
+        this.dialogService = openmct.$injector.get('dialogService');
+
+        this.capture = this.capture.bind(this);
+        this._saveSnapShot = this._saveSnapShot.bind(this);
+    }
+
+    capture(snapshotMeta, notebookType, domElement) {
+        this.exportImageService.exportPNGtoSRC(domElement, 's-status-taking-snapshot')
+            .then(function (blob) {
+                const reader = new window.FileReader();
+                reader.readAsDataURL(blob);
+                reader.onloadend = function () {
+                    this._saveSnapShot(notebookType, reader.result, snapshotMeta);
+                }.bind(this);
+            }.bind(this));
+    }
+
+    /**
+     * @private
+     */
+    _saveSnapShot(notebookType, imageUrl, snapshotMeta) {
+        const snapshot = imageUrl ? { src: imageUrl } : '';
+        const embed = createNewEmbed(snapshotMeta, snapshot);
+        if (notebookType === NOTEBOOK_DEFAULT) {
+            this._saveToDefaultNoteBook(embed);
+
+            return;
+        }
+
+        this._saveToNotebookSnapshots(embed);
+    }
+
+    /**
+     * @private
+     */
+    _saveToDefaultNoteBook(embed) {
+        const notebookStorage = getDefaultNotebook();
+        this.openmct.objects.get(notebookStorage.notebookMeta.identifier)
+            .then(domainObject => {
+                addNotebookEntry(this.openmct, domainObject, notebookStorage, embed);
+
+                const defaultPath = `${domainObject.name} > ${notebookStorage.section.name} > ${notebookStorage.page.name}`;
+                const msg = `Saved to Notebook ${defaultPath}`;
+                this._showNotification(msg);
+            });
+    }
+
+    /**
+     * @private
+     */
+    _saveToNotebookSnapshots(embed) {
+        const saved = this.snapshotContainer.addSnapshot(embed);
+        if (!saved) {
+            return;
+        }
+
+        const msg = 'Saved to Notebook Snapshots - click to view.';
+        this._showNotification(msg);
+    }
+
+    _showNotification(msg) {
+        this.openmct.notifications.info(msg);
+    }
+}
--- a/src/plugins/notebook/src/controllers/EmbedController.js
+++ b/src/plugins/notebook/src/controllers/EmbedController.js
@@ -1,302 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([
-    'moment',
-    'zepto',
-    '../../res/templates/snapshotTemplate.html',
-    'vue',
-    'painterro'
-],
-function (
-    Moment,
-    $,
-    SnapshotTemplate,
-    Vue,
-    Painterro
-) {
-    function EmbedController(openmct, domainObject) {
-        this.openmct = openmct;
-        this.domainObject = domainObject;
-        this.popupService = openmct.$injector.get('popupService');
-        this.agentService = openmct.$injector.get('agentService');
-
-        this.exposedData = this.exposedData.bind(this);
-        this.exposedMethods = this.exposedMethods.bind(this);
-        this.toggleActionMenu = this.toggleActionMenu.bind(this);
-    }
-
-    EmbedController.prototype.openSnapshot = function (domainObject, entry, embed) {
-
-        function annotateSnapshot(openmct) {
-            return function () {
-
-                var save = false,
-                    painterroInstance = {},
-                    annotateVue = new Vue({
-                        template: '<div id="snap-annotation"></div>'
-                    }),
-                    self = this;
-
-                let annotateOverlay = openmct.overlays.overlay({
-                    element: annotateVue.$mount().$el,
-                    size: 'large',
-                    dismissable: false,
-                    buttons: [
-                        {
-                            label: 'Cancel',
-                            callback: function () {
-                                save = false;
-                                painterroInstance.save();
-                                annotateOverlay.dismiss();
-                            }
-                        },
-                        {
-                            label: 'Save',
-                            callback: function () {
-                                save = true;
-                                painterroInstance.save();
-                                annotateOverlay.dismiss();
-                            }
-                        }
-                    ],
-                    onDestroy: function () {
-                        annotateVue.$destroy(true);
-                    }
-                });
-
-                painterroInstance = Painterro({
-                    id: 'snap-annotation',
-                    activeColor: '#ff0000',
-                    activeColorAlpha: 1.0,
-                    activeFillColor: '#fff',
-                    activeFillColorAlpha: 0.0,
-                    backgroundFillColor: '#000',
-                    backgroundFillColorAlpha: 0.0,
-                    defaultFontSize: 16,
-                    defaultLineWidth: 2,
-                    defaultTool: 'ellipse',
-                    hiddenTools: ['save', 'open', 'close', 'eraser', 'pixelize', 'rotate', 'settings', 'resize'],
-                    translation: {
-                        name: 'en',
-                        strings: {
-                            lineColor: 'Line',
-                            fillColor: 'Fill',
-                            lineWidth: 'Size',
-                            textColor: 'Color',
-                            fontSize: 'Size',
-                            fontStyle: 'Style'
-                        }
-                    },
-                    saveHandler: function (image, done) {
-                        if (save) {
-                            var entryPos = self.findInArray(domainObject.entries, entry.id),
-                                embedPos = self.findInArray(entry.embeds, embed.id);
-
-                            if (entryPos !== -1 && embedPos !== -1) {
-                                var url = image.asBlob(),
-                                    reader = new window.FileReader();
-
-                                reader.readAsDataURL(url);
-                                reader.onloadend = function () {
-                                    var snapshot = reader.result,
-                                        snapshotObject = {
-                                            src: snapshot,
-                                            type: url.type,
-                                            size: url.size,
-                                            modified: Date.now()
-                                        },
-                                        dirString = 'entries[' + entryPos + '].embeds[' + embedPos + '].snapshot';
-
-                                    openmct.objects.mutate(domainObject, dirString, snapshotObject);
-                                };
-                            }
-                        } else {
-                            console.log('You cancelled the annotation!!!');
-                        }
-                        done(true);
-                    }
-                }).show(embed.snapshot.src);
-            };
-        }
-
-        var self = this,
-            snapshot = new Vue({
-                data: function () {
-                    return {
-                        embed: self.embed
-                    };
-                },
-                methods: {
-                    formatTime: self.formatTime,
-                    annotateSnapshot: annotateSnapshot(self.openmct),
-                    findInArray: self.findInArray
-                },
-                template: SnapshotTemplate
-            });
-
-        var snapshotOverlay = this.openmct.overlays.overlay({
-            element: snapshot.$mount().$el,
-            onDestroy: () => {snapshot.$destroy(true)},
-            size: 'large',
-            dismissable: true,
-            buttons: [
-                {
-                    label: 'Done',
-                    emphasis: true,
-                    callback: function () {
-                        snapshotOverlay.dismiss();
-                    }
-                }
-            ]
-        });
-    };
-
-    EmbedController.prototype.formatTime = function (unixTime, timeFormat) {
-        return Moment(unixTime).format(timeFormat);
-    };
-
-    EmbedController.prototype.findInArray = function (array, id) {
-        var foundId = -1;
-
-        array.forEach(function (element, index) {
-            if (element.id === id) {
-                foundId = index;
-                return;
-            }
-        });
-
-        return foundId;
-    };
-
-    EmbedController.prototype.populateActionMenu = function (openmct, actions) {
-        return function () {
-            var self = this;
-
-            openmct.objects.get(self.embed.type).then(function (domainObject) {
-                actions.forEach((action) => {
-                    self.actions.push({
-                        cssClass: action.cssClass,
-                        name: action.name,
-                        perform: () => {
-                            action.invoke([domainObject].concat(openmct.router.path));
-                        }
-                    });
-                });
-            });
-        };
-    };
-
-    EmbedController.prototype.removeEmbedAction = function () {
-        var self = this;
-
-        return {
-            name: 'Remove Embed',
-            cssClass: 'icon-trash',
-            perform: function (embed, entry) {
-                var entryPosition = self.findInArray(self.domainObject.entries, entry.id),
-                    embedPosition = self.findInArray(entry.embeds, embed.id);
-
-                var dialog = self.openmct.overlays.dialog({
-                    iconClass: "alert",
-                    message: 'This Action will permanently delete this embed. Do you wish to continue?',
-                    buttons: [{
-                        label: "No",
-                        callback: function () {
-                            dialog.dismiss();
-                        }
-                    },
-                    {
-                        label: "Yes",
-                        emphasis: true,
-                        callback: function () {
-                            entry.embeds.splice(embedPosition, 1);
-                            var dirString = 'entries[' + entryPosition + '].embeds';
-
-                            self.openmct.objects.mutate(self.domainObject, dirString, entry.embeds);
-                            dialog.dismiss();
-                        }
-                    }]
-                });
-            }
-        };
-    };
-
-    EmbedController.prototype.toggleActionMenu = function (event) {
-        event.preventDefault();
-
-        var body = $(document.body),
-            container = $(event.target.parentElement.parentElement),
-            initiatingEvent = this.agentService.isMobile() ?
-                'touchstart' : 'mousedown',
-            menu = container.find('.menu-element'),
-            dismissExistingMenu;
-
-        // Remove the context menu
-        function dismiss() {
-            container.find('.hide-menu').append(menu);
-            body.off(initiatingEvent, menuClickHandler);
-            dismissExistingMenu = undefined;
-        }
-
-        function menuClickHandler(e) {
-            window.setTimeout(() => {
-                dismiss();
-            }, 100);
-        }
-
-        // Dismiss any menu which was already showing
-        if (dismissExistingMenu) {
-            dismissExistingMenu();
-        }
-
-        // ...and record the presence of this menu.
-        dismissExistingMenu = dismiss;
-
-        this.popupService.display(menu, [event.pageX,event.pageY], {
-            marginX: 0,
-            marginY: -50
-        });
-
-        body.on(initiatingEvent, menuClickHandler);
-    };
-
-    EmbedController.prototype.exposedData = function () {
-        return {
-            actions: [this.removeEmbedAction()],
-            showActionMenu: false
-        };
-    };
-
-    EmbedController.prototype.exposedMethods = function () {
-        var self = this;
-
-        return {
-            openSnapshot: self.openSnapshot,
-            formatTime: self.formatTime,
-            toggleActionMenu: self.toggleActionMenu,
-            findInArray: self.findInArray
-        };
-    };
-
-    return EmbedController;
-});
--- a/src/plugins/notebook/src/controllers/EntryController.js
+++ b/src/plugins/notebook/src/controllers/EntryController.js
@@ -1,151 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([
-    'moment'
-],
-function (
-    Moment
-) {
-
-    function EntryController(openmct, domainObject) {
-        this.openmct = openmct;
-        this.domainObject = domainObject;
-
-        this.currentEntryValue = '';
-
-        this.exposedMethods = this.exposedMethods.bind(this);
-        this.exposedData = this.exposedData.bind(this);
-    }
-
-    EntryController.prototype.entryPosById = function (entryId) {
-        var foundId = -1;
-
-        this.domainObject.entries.forEach(function (element, index) {
-            if (element.id === entryId) {
-                foundId = index;
-                return;
-            }
-        });
-
-        return foundId;
-    };
-
-    EntryController.prototype.textFocus = function ($event) {
-        if ($event.target) {
-            this.currentEntryValue = $event.target.innerText;
-        } else {
-            $event.target.innerText = '';
-        }
-    };
-
-    EntryController.prototype.textBlur = function ($event, entryId) {
-        if ($event.target) {
-            var entryPos = this.entryPosById(entryId);
-
-            if (this.currentEntryValue !== $event.target.innerText) {
-                this.openmct.objects.mutate(this.domainObject, 'entries[' + entryPos + '].text', $event.target.innerText);
-            }
-        }
-    };
-
-    EntryController.prototype.formatTime = function (unixTime, timeFormat) {
-        return Moment(unixTime).format(timeFormat);
-    };
-
-    EntryController.prototype.deleteEntry = function () {
-        var entryPos = this.entryPosById(this.entry.id),
-            domainObject = this.domainObject,
-            openmct = this.openmct;
-
-        if (entryPos !== -1) {
-
-            var dialog = this.openmct.overlays.dialog({
-                iconClass: 'alert',
-                message: 'This action will permanently delete this entry. Do you wish to continue?',
-                buttons: [
-                    {
-                        label: "Ok",
-                        emphasis: true,
-                        callback: function () {
-                            domainObject.entries.splice(entryPos, 1);
-                            openmct.objects.mutate(domainObject, 'entries', domainObject.entries);
-                            dialog.dismiss();
-                        }
-                    },
-                    {
-                        label: "Cancel",
-                        callback: function () {
-                            dialog.dismiss();
-                        }
-                    }
-                ]
-            });
-        }
-    };
-
-    EntryController.prototype.dropOnEntry = function (entryid, event) {
-        var data = event.dataTransfer.getData('openmct/domain-object-path');
-
-        if (data) {
-            var objectPath = JSON.parse(data),
-                domainObject = objectPath[0],
-                domainObjectKey = domainObject.identifier.key,
-                domainObjectType = this.openmct.types.get(domainObject.type),
-                cssClass = domainObjectType && domainObjectType.definition ?
-                    domainObjectType.definition.cssClass : 'icon-object-unknown',
-                entryPos = this.entryPosById(entryid),
-                currentEntryEmbeds = this.domainObject.entries[entryPos].embeds,
-                newEmbed = {
-                    id: '' + Date.now(),
-                    domainObject: domainObject,
-                    objectPath: objectPath,
-                    type: domainObjectKey,
-                    cssClass: cssClass,
-                    name: domainObject.name,
-                    snapshot: ''
-                };
-            currentEntryEmbeds.push(newEmbed);
-            this.openmct.objects.mutate(this.domainObject, 'entries[' + entryPos + '].embeds', currentEntryEmbeds);
-        }
-    };
-
-    EntryController.prototype.exposedData = function () {
-        return {
-            openmct: this.openmct,
-            domainObject: this.domainObject,
-            currentEntryValue: this.currentEntryValue
-        };
-    };
-
-    EntryController.prototype.exposedMethods = function () {
-        return {
-            entryPosById: this.entryPosById,
-            textFocus: this.textFocus,
-            textBlur: this.textBlur,
-            formatTime: this.formatTime,
-            deleteEntry: this.deleteEntry,
-            dropOnEntry: this.dropOnEntry
-        };
-    };
-    return EntryController;
-});
--- a/src/plugins/notebook/src/controllers/NotebookController.js
+++ b/src/plugins/notebook/src/controllers/NotebookController.js
@@ -1,237 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([
-    'vue',
-    './EntryController',
-    './EmbedController',
-    '../../res/templates/notebook.html',
-    '../../res/templates/entry.html',
-    '../../res/templates/embed.html',
-    '../../../../ui/components/search.vue',
-    '../../../../ui/preview/PreviewAction',
-    '../../../../ui/mixins/object-link'
-],
-function (
-    Vue,
-    EntryController,
-    EmbedController,
-    NotebookTemplate,
-    EntryTemplate,
-    EmbedTemplate,
-    search,
-    PreviewAction,
-    objectLinkMixin
-) {
-
-    function NotebookController(openmct, domainObject) {
-        this.openmct = openmct;
-        this.domainObject = domainObject;
-        this.entrySearch = '';
-        this.previewAction = new PreviewAction.default(openmct);
-
-        this.show = this.show.bind(this);
-        this.destroy = this.destroy.bind(this);
-        this.newEntry = this.newEntry.bind(this);
-        this.entryPosById = this.entryPosById.bind(this);
-    }
-
-    NotebookController.prototype.initializeVue = function (container) {
-        var self = this,
-            entryController = new EntryController(this.openmct, this.domainObject),
-            embedController = new EmbedController(this.openmct, this.domainObject);
-
-        this.container = container;
-
-        var notebookEmbed = {
-            inject:['openmct', 'domainObject'],
-            mixins:[objectLinkMixin.default],
-            props:['embed', 'entry'],
-            template: EmbedTemplate,
-            data: embedController.exposedData,
-            methods: embedController.exposedMethods(),
-            beforeMount: embedController.populateActionMenu(self.openmct, [self.previewAction])
-        };
-
-        var entryComponent = {
-            props:['entry'],
-            template: EntryTemplate,
-            components: {
-                'notebook-embed': notebookEmbed
-            },
-            data: entryController.exposedData,
-            methods: entryController.exposedMethods(),
-            mounted: self.focusOnEntry
-        };
-
-        var NotebookVue = Vue.extend({
-            provide: {openmct: self.openmct, domainObject: self.domainObject},
-            components: {
-                'notebook-entry': entryComponent,
-                'search': search.default
-            },
-            data: function () {
-                return {
-                    entrySearch: self.entrySearch,
-                    showTime: '0',
-                    sortEntries: self.domainObject.defaultSort,
-                    entries: self.domainObject.entries,
-                    currentEntryValue: ''
-                };
-            },
-            computed: {
-                filteredAndSortedEntries() {
-                    return this.sort(this.filterBySearch(this.entries, this.entrySearch), this.sortEntries);
-                }
-            },
-            methods: {
-                search(value) {
-                    this.entrySearch = value;
-                },
-                newEntry: self.newEntry,
-                filterBySearch: self.filterBySearch,
-                sort: self.sort
-            },
-            template: NotebookTemplate
-        });
-
-        this.NotebookVue =  new NotebookVue();
-        container.appendChild(this.NotebookVue.$mount().$el);
-    };
-
-    NotebookController.prototype.newEntry = function (event) {
-        this.NotebookVue.search('');
-
-        var date = Date.now(),
-            embed;
-
-        if (event.dataTransfer && event.dataTransfer.getData('openmct/domain-object-path')) {
-            var selectedObject = JSON.parse(event.dataTransfer.getData('openmct/domain-object-path'))[0],
-                selectedObjectId = selectedObject.identifier.key,
-                cssClass = this.openmct.types.get(selectedObject.type);
-
-            embed = {
-                type: selectedObjectId,
-                id: '' + date,
-                cssClass: cssClass,
-                name: selectedObject.name,
-                snapshot: ''
-            };
-        }
-
-        var entries = this.domainObject.entries,
-            lastEntryIndex = this.NotebookVue.sortEntries === 'newest' ? 0 : entries.length - 1,
-            lastEntry = entries[lastEntryIndex];
-
-        if (lastEntry === undefined || lastEntry.text || lastEntry.embeds.length) {
-            var createdEntry = {'id': 'entry-' + date, 'createdOn': date, 'embeds':[]};
-
-            if (embed) {
-                createdEntry.embeds.push(embed);
-            }
-
-            entries.push(createdEntry);
-            this.openmct.objects.mutate(this.domainObject, 'entries', entries);
-        } else {
-            lastEntry.createdOn = date;
-
-            if(embed) {
-                lastEntry.embeds.push(embed);
-            }
-
-            this.openmct.objects.mutate(this.domainObject, 'entries[entries.length-1]', lastEntry);
-            this.focusOnEntry.bind(this.NotebookVue.$children[lastEntryIndex+1])();
-        }
-    };
-
-    NotebookController.prototype.entryPosById = function (entryId) {
-        var foundId = -1;
-
-        this.domainObject.entries.forEach(function (element, index) {
-            if (element.id === entryId) {
-                foundId = index;
-                return;
-            }
-        });
-
-        return foundId;
-    };
-
-    NotebookController.prototype.focusOnEntry = function () {
-        if (!this.entry.text) {
-            this.$refs.contenteditable.focus();
-        }
-    };
-
-    NotebookController.prototype.filterBySearch = function (entryArray, filterString) {
-        if (filterString) {
-            var lowerCaseFilterString = filterString.toLowerCase();
-
-            return entryArray.filter(function (entry) {
-                if (entry.text) {
-                    return entry.text.toLowerCase().includes(lowerCaseFilterString);
-                } else {
-                    return false;
-                }
-            });
-        } else {
-            return entryArray;
-        }
-    };
-
-    NotebookController.prototype.sort = function (array, sortDirection) {
-        let oldest = (a,b) => {
-                if (a.createdOn < b.createdOn) {
-                    return -1;
-                } else if (a.createdOn > b.createdOn) {
-                    return 1;
-                } else {
-                    return 0;
-                }
-            },
-            newest = (a,b) => {
-                if (a.createdOn < b.createdOn) {
-                    return 1;
-                } else if (a.createdOn > b.createdOn) {
-                    return -1;
-                } else {
-                    return 0;
-                }
-            };
-
-        if (sortDirection === 'newest') {
-            return array.sort(newest);
-        } else {
-            return array.sort(oldest);
-        }
-    };
-
-    NotebookController.prototype.show = function (container) {
-        this.initializeVue(container);
-    };
-
-    NotebookController.prototype.destroy = function (container) {
-        this.NotebookVue.$destroy(true);
-    };
-
-    return NotebookController;
-});
--- a/Show More
+++ b/Show More