Correct release number

Updates to README in topic-core-refactor (#2573 )
* Updates to README in topic-core-refactor In preparation for merge into Master * Added section on v1.0.0 and link to Migration Guide * Minor wording change * More minor wording changes
2025-06-27 19:38:53 +00:00 · 2019-12-11 13:57:08 -08:00 · 2019-12-11 10:28:47 -08:00 · 2019-12-10 16:44:54 -08:00 · 2019-12-06 09:44:37 -08:00 · 2019-12-06 09:40:24 -08:00
630 changed files with 26746 additions and 40099 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -5,9 +5,16 @@ module.exports = {
        "jasmine": true,
        "amd": true
    },
-    "extends": "eslint:recommended",
+    "globals": {
-    "parser": "babel-eslint",
+        "_": "readonly"
    },
    "extends": [
        "eslint:recommended",
        "plugin:vue/recommended"
    ],
    "parser": "vue-eslint-parser",
    "parserOptions": {
        "parser": "babel-eslint",
        "allowImportExportEverywhere": true,
        "ecmaVersion": 2015,
        "ecmaFeatures": {
@ -58,7 +65,38 @@ module.exports = {
            }
        ],
        "dot-notation": "error",
-        "indent": ["error", 4]
+        "indent": ["error", 4],
        "vue/html-indent": [
            "error",
            4,
            {
                "attribute": 1,
                "baseIndent": 0,
                "closeBracket": 0,
                "alignAttributesVertically": true,
                "ignores": []
            }
        ],
        "vue/html-self-closing": ["error",
            {
                "html": {
                    "void": "never",
                    "normal": "never",
                    "component": "always"
                },
                "svg": "always",
                "math": "always"
            }
        ],
        "vue/max-attributes-per-line": ["error", {
            "singleline": 1,
            "multiline": {
                "max": 1,
                "allowFirstLine": true
            }
        }],
        "vue/multiline-html-element-content-newline": "off",
        "vue/singleline-html-element-content-newline": "off"
    },
    "overrides": [
        {
--- a/API.md
+++ b/API.md
@ -109,15 +109,13 @@ script loaders are also supported.
 <html>
 <head>
    <title>Open MCT</title>
-    <script src="openmct.js"></script>
+    <script src="dist/openmct.js"></script>
 </head>
 <body>
    <script>
        openmct.setAssetPath('openmct/dist');
        openmct.install(openmct.plugins.LocalStorage());
        openmct.install(openmct.plugins.MyItems());
        openmct.install(openmct.plugins.UTCTimeSystem());
        openmct.install(openmct.plugins.Espresso());
        openmct.start();
    </script>
 </body>
@ -128,9 +126,6 @@ The Open MCT library included above requires certain assets such as html
 templates, images, and css. If you installed Open MCT from GitHub as described 
 in the section on [Building from Source](#building-from-source) then these
 assets will have been downloaded along with the Open MCT javascript library. 
 You can specify the location of these assets by calling `openmct.setAssetPath()`. 
 Typically this will be the same location as the `openmct.js` library is 
 included from.
 There are some plugins bundled with the application that provide UI, 
 persistence, and other default configuration which are necessary to be able to 
--- a/README.md
+++ b/README.md
@ -9,26 +9,6 @@ Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting S
 Try Open MCT now with our [live demo](https://openmct-demo.herokuapp.com/).
 ![Demo](https://nasa.github.io/openmct/static/res/images/Open-MCT.Browse.Layout.Mars-Weather-1.jpg)
 ## New API
 A simpler, [easier-to-use API](https://nasa.github.io/openmct/docs/api/)
 has been added to Open MCT. Changes in this
 API include a move away from a declarative system of JSON configuration files
 towards an imperative system based on function calls. Developers will be able
 to extend and build on Open MCT by making direct function calls to a public
 API. Open MCT is also being refactored to minimize the dependencies that using
 Open MCT imposes on developers, such as the current requirement to use
 AngularJS.
 This new API has not yet been heavily used and is likely to contain defects.
 You can help by trying it out, and reporting any issues you encounter
 using our GitHub issue tracker. Such issues may include bugs, suggestions,
 missing documentation, or even just requests for help if you're having
 trouble.
 We want Open MCT to be as easy to use, install, run, and develop for as
 possible, and your feedback will help us get there!
 ## Building and Running Open MCT Locally
 Building and running Open MCT in your local dev environment is very easy. Be sure you have [Git](https://git-scm.com/downloads) and [Node.js](https://nodejs.org/) installed, then follow the directions below. Need additional information? Check out the [Getting Started](https://nasa.github.io/openmct/getting-started/) page on our website.
@ -48,9 +28,14 @@ Building and running Open MCT in your local dev environment is very easy. Be sur
 Open MCT is now running, and can be accessed by pointing a web browser at [http://localhost:8080/](http://localhost:8080/)
 ## Open MCT v1.0.0
 This represents a major overhaul of Open MCT with significant changes under the hood. We aim to maintain backward compatibility but if you do find compatibility issues, please let us know by filing an issue in this repository. If you are having major issues with v1.0.0 please check-out the v0.14.0 tag until we can resolve them for you.
 If you are migrating an application built with Open MCT as a dependency to v1.0.0 from an earlier version, please refer to [our migration guide](https://nasa.github.io/openmct/documentation/migration-guide).
 ## Documentation
-Documentation is available on the [Open MCT website](https://nasa.github.io/openmct/documentation/). The documentation can also be built locally.
+Documentation is available on the [Open MCT website](https://nasa.github.io/openmct/documentation/).
 ### Examples
@ -58,48 +43,29 @@ The clearest examples for developing Open MCT plugins are in the
 [tutorials](https://github.com/nasa/openmct-tutorial) provided in
 our documentation.
-For a practical example of a telemetry adapter, see David Hudson's
+We want Open MCT to be as easy to use, install, run, and develop for as
-[Kerbal Space Program plugin](https://github.com/hudsonfoo/kerbal-openmct),
+possible, and your feedback will help us get there! Feedback can be provided via [GitHub issues](https://github.com/nasa/openmct/issues), or by emailing us at [arc-dl-openmct@mail.nasa.gov](mailto:arc-dl-openmct@mail.nasa.gov).
 which allows [Kerbal Space Program](https://kerbalspaceprogram.com) players
 to build and use displays for their own missions in Open MCT.
-Additional examples are available in the `examples` hierarchy of this
+## Building Applications With Open MCT
 repository; however, be aware that these examples are
 [not fully-documented](https://github.com/nasa/openmct/issues/846), so
 the tutorials will likely serve as a better starting point.
-### Building the Open MCT Documentation Locally
+Open MCT is built using [`npm`](http://npmjs.com/) and [`webpack`](https://webpack.js.org/).
 Open MCT's documentation is generated by an
 [npm](https://www.npmjs.com/)-based build.  It has additional dependencies that
 may not be available on every platform and thus is not covered in the standard
 npm install.  Ensure your system has [libcairo](http://cairographics.org/)
 installed and then run the following commands:
-* `npm install`
+See our documentation for a guide on [building Applications with Open MCT](https://github.com/nasa/openmct/blob/master/API.md#starting-an-open-mct-application).
 * `npm install canvas nomnoml`
 * `npm run docs`
-Documentation will be generated in `target/docs`.
+## Plugins
-## Deploying Open MCT
+Open MCT can be extended via plugins that make calls to the Open MCT API. A plugin is a group 
 of software components (including source code and resources such as images and HTML templates)
 that is intended to be added or removed as a single unit.
-Open MCT is built using [`npm`](http://npmjs.com/)
+As well as providing an extension mechanism, most of the core Open MCT codebase is also 
 written as plugins.
-To build Open MCT for deployment:
+For information on writing plugins, please see [our API documentation](https://github.com/nasa/openmct/blob/master/API.md#plugins).
 `npm run prepare`
 This will compile and minify JavaScript sources, as well as copy over assets.
 The contents of the `dist` folder will contain a runnable Open MCT
 instance (e.g. by starting an HTTP server in that directory), including:
 * `openmct.js` - Open MCT source code.
 * `openmct.css` - Basic styles to load to prevent a FOUC.
 * `index.html`, an example to run Open MCT in the basic configuration.
 ## Tests
-Tests are written for [Jasmine 3](http://jasmine.github.io/)
+Tests are written for [Jasmine 3](https://jasmine.github.io/api/3.1/global)
 and run by [Karma](http://karma-runner.github.io). To run:
 `npm test`
@ -115,7 +81,7 @@ naming convention is otherwise the same.)
 ### Test Reporting
 When `npm test` is run, test results will be written as HTML to
-`target/tests`. Code coverage information is written to `target/coverage`.
+`dist/reports/tests/`. Code coverage information is written to `dist/reports/coverage`.
 # Glossary
@ -125,11 +91,8 @@ addressed (either by updating this glossary or changing code to reflect
 correct usage.) Other developer documentation, particularly in-line
 documentation, may presume an understanding of these terms.
-* _bundle_: A bundle is a removable, reusable grouping of software elements.
+* _plugin_: A plugin is a removable, reusable grouping of software elements.
-  The application is composed of bundles. Plug-ins are bundles. For more
+  The application is composed of plugins.
  information, refer to framework documentation (under `platform/framework`.)
 * _capability_: An object which exposes dynamic behavior or non-persistent
  state associated with a domain object.
 * _composition_: In the context of a domain object, this refers to the set of
  other domain objects that compose or are contained by that object. A domain
  object's composition is the set of domain objects that should appear
@ -144,13 +107,8 @@ documentation, may presume an understanding of these terms.
 * _domain object_: A meaningful object to the user; a distinct thing in
  the work support by Open MCT. Anything that appears in the left-hand
  tree is a domain object.
-* _extension_: An extension is a unit of functionality exposed to the
+* _identifier_: A tuple consisting of a namespace and a key, which together uniquely
-  platform in a declarative fashion by a bundle. For more
+  identifies a domain object.
  information, refer to framework documentation (under `platform/framework`.)
 * _id_: A string which uniquely identifies a domain object.
 * _key_: When used as an object property, this refers to the machine-readable
  identifier for a specific thing in a set of things. (Most often used in the
  context of extensions or other similar application-specific object sets.)
 * _model_: The persistent state associated with a domain object. A domain
  object's model is a JavaScript object which can be converted to JSON
  without losing information (that is, it contains no methods.)
@ -162,7 +120,5 @@ documentation, may presume an understanding of these terms.
  a user clicks on a domain object in the tree, they are _navigating_ to
  it, and it is thereafter considered the _navigated_ object (until the
  user makes another such choice.)
-* _space_: A name used to identify a persistence store. Interactions with
+* _namespace_: A name used to identify a persistence store. A running open MCT 
-  persistence will generally involve a `space` parameter in some form, to
+application could potentially use multiple persistence stores, with the 
  distinguish multiple persistence stores from one another (for cases
  where there are multiple valid persistence locations available.)
--- a/example/eventGenerator/bundle.js
+++ b/example/eventGenerator/bundle.js
@ -22,15 +22,15 @@
 /*global define*/
 define([
-    "./src/EventTelemetryProvider",
+    "./src/EventTelemetryProvider"
    'legacyRegistry'
 ], function (
-    EventTelemetryProvider,
+    EventTelemetryProvider
    legacyRegistry
 ) {
    "use strict";
-    legacyRegistry.register("example/eventGenerator", {
+    return {
        name:"example/eventGenerator",
        definition: {
            "name": "Event Message Generator",
            "description": "For development use. Creates sample event message data that mimics a live data stream.",
            "extensions": {
@ -76,5 +76,6 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/example/eventGenerator/src/EventTelemetryProvider.js
+++ b/example/eventGenerator/src/EventTelemetryProvider.js
@ -34,11 +34,9 @@ define(
         * @constructor
         */
        function EventTelemetryProvider($q, $timeout) {
-            var
+            var subscriptions = [],
 	            subscriptions = [],
                genInterval = 1000,
-                generating = false,
+                generating = false;
                id = Math.random() * 100000;
            //
            function matchesSource(request) {
@ -47,7 +45,6 @@ define(
            // Used internally; this will be repacked by doPackage
            function generateData(request) {
 	            //console.log("generateData " + (Date.now() - startTime).toString());
                return {
                    key: request.key,
                    telemetry: new EventTelemetry(request, genInterval)
--- a/example/export/ExportTelemetryAsCSVAction.js
+++ b/example/export/ExportTelemetryAsCSVAction.js
@ -58,15 +58,15 @@ define([], function () {
                row,
                i;
-            function copyDomainsToRow(row, index) {
+            function copyDomainsToRow(telemetryRow, index) {
                domains.forEach(function (domain) {
-                    row[domain.name] = series.getDomainValue(index, domain.key);
+                    telemetryRow[domain.name] = series.getDomainValue(index, domain.key);
                });
            }
-            function copyRangesToRow(row, index) {
+            function copyRangesToRow(telemetryRow, index) {
                ranges.forEach(function (range) {
-                    row[range.name] = series.getRangeValue(index, range.key);
+                    telemetryRow[range.name] = series.getRangeValue(index, range.key);
                });
            }
--- a/example/export/bundle.js
+++ b/example/export/bundle.js
@ -22,12 +22,13 @@
 /*global define*/
 define([
    'legacyRegistry',
    './ExportTelemetryAsCSVAction'
-], function (legacyRegistry, ExportTelemetryAsCSVAction) {
+], function (ExportTelemetryAsCSVAction) {
    "use strict";
-    legacyRegistry.register("example/export", {
+    return {
        name:"example/export",
        definition: {
            "name": "Example of using CSV Export",
            "extensions": {
                "actions": [
@ -37,9 +38,10 @@ define([
                        "implementation": ExportTelemetryAsCSVAction,
                        "category": "contextual",
                        "cssClass": "icon-download",
-                    "depends": [ "exportService" ]
+                        "depends": ["exportService"]
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/example/forms/bundle.js
+++ b/example/forms/bundle.js
@ -22,15 +22,15 @@
 /*global define*/
 define([
-    "./src/ExampleFormController",
+    "./src/ExampleFormController"
    'legacyRegistry'
 ], function (
-    ExampleFormController,
+    ExampleFormController
    legacyRegistry
 ) {
    "use strict";
-    legacyRegistry.register("example/forms", {
+    return {
        name:"example/forms",
        definition: {
            "name": "Declarative Forms example",
            "sources": "src",
            "extensions": {
@ -49,5 +49,6 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/example/generator/GeneratorProvider.js
+++ b/example/generator/GeneratorProvider.js
@ -52,7 +52,7 @@ define([
            'period',
            'offset',
            'dataRateInHz',
-            'phase',
+            'phase'
        ];
        request = request || {};
--- a/example/generator/SinewaveLimitProvider.js
+++ b/example/generator/SinewaveLimitProvider.js
@ -37,25 +37,25 @@ define([
        },
        LIMITS = {
            rh: {
-                cssClass: "s-limit-upr s-limit-red",
+                cssClass: "is-limit--upr is-limit--red",
                low: RED,
                high: Number.POSITIVE_INFINITY,
                name: "Red High"
            },
            rl: {
-                cssClass: "s-limit-lwr s-limit-red",
+                cssClass: "is-limit--lwr is-limit--red",
                high: -RED,
                low: Number.NEGATIVE_INFINITY,
                name: "Red Low"
            },
            yh: {
-                cssClass: "s-limit-upr s-limit-yellow",
+                cssClass: "is-limit--upr is-limit--yellow",
                low: YELLOW,
                high: RED,
                name: "Yellow High"
            },
            yl: {
-                cssClass: "s-limit-lwr s-limit-yellow",
+                cssClass: "is-limit--lwr is-limit--yellow",
                low: -RED,
                high: -YELLOW,
                name: "Yellow Low"
--- a/example/generator/WorkerInterface.js
+++ b/example/generator/WorkerInterface.js
@ -89,7 +89,7 @@ define([
    WorkerInterface.prototype.subscribe = function (request, cb) {
        function callback(message) {
            cb(message.data);
-        };
+        }
        var messageId = this.dispatch('subscribe', request, callback);
--- a/example/generator/generatorWorker.js
+++ b/example/generator/generatorWorker.js
@ -84,10 +84,10 @@
    function onRequest(message) {
        var request = message.data;
-        if (request.end == undefined) {
+        if (request.end === undefined) {
            request.end = Date.now();
        }
-        if (request.start == undefined){
+        if (request.start === undefined) {
            request.start = request.end - FIFTEEN_MINUTES;
        }
--- a/example/generator/plugin.js
+++ b/example/generator/plugin.js
@ -33,7 +33,7 @@ define([
    GeneratorMetadataProvider
 ) {
-    return function(openmct){
+    return function (openmct) {
        openmct.types.addType("example.state-generator", {
            name: "State Generator",
@ -43,15 +43,14 @@ define([
            form: [
                {
                    name: "State Duration (seconds)",
-                    control: "textfield",
+                    control: "numberfield",
                    cssClass: "l-input-sm l-numeric",
                    key: "duration",
                    required: true,
                    property: [
                        "telemetry",
                        "duration"
-                    ],
+                    ]
                    pattern: "^\\d*(\\.\\d*)?$"
                }
            ],
            initialize: function (object) {
--- a/example/identity/bundle.js
+++ b/example/identity/bundle.js
@ -22,15 +22,15 @@
 /*global define*/
 define([
-    "./src/ExampleIdentityService",
+    "./src/ExampleIdentityService"
    'legacyRegistry'
 ], function (
-    ExampleIdentityService,
+    ExampleIdentityService
    legacyRegistry
 ) {
    "use strict";
-    legacyRegistry.register("example/identity", {
+    return {
        name:"example/identity",
        definition: {
            "extensions": {
                "components": [
                    {
@ -44,5 +44,6 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/example/imagery/plugin.js
+++ b/example/imagery/plugin.js
@ -22,7 +22,7 @@
 define([
-], function(
+], function (
 ) {
    function ImageryPlugin() {
@ -65,7 +65,7 @@ define([
                    callback(pointForTimestamp(Date.now(), domainObject.name));
                }, 5000);
-                return function (interval) {
+                return function () {
                    clearInterval(interval);
                };
            }
--- a/example/mobile/bundle.js
+++ b/example/mobile/bundle.js
@ -21,16 +21,12 @@
 *****************************************************************************/
 /*global define*/
-define([
+define([], function () {
    'legacyRegistry'
 ], function (
    legacyRegistry
 ) {
    "use strict";
-    legacyRegistry.register("example/mobile", {
+    return {
        name:"example/mobile",
        definition: {
            "name": "Mobile",
            "description": "Allows elements with pertinence to mobile usage and development",
            "extensions": {
@ -41,5 +37,6 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/example/msl/bundle.js
+++ b/example/msl/bundle.js
@ -24,17 +24,16 @@
 define([
    "./src/RemsTelemetryServerAdapter",
    "./src/RemsTelemetryModelProvider",
-    "./src/RemsTelemetryProvider",
+    "./src/RemsTelemetryProvider"
    'legacyRegistry',
    "module"
 ], function (
    RemsTelemetryServerAdapter,
    RemsTelemetryModelProvider,
-    RemsTelemetryProvider,
+    RemsTelemetryProvider
    legacyRegistry
 ) {
    "use strict";
-    legacyRegistry.register("example/msl", {
+    return {
        name:"example/msl",
        definition: {
            "name" : "Mars Science Laboratory Data Adapter",
            "extensions" : {
                "types": [
@ -110,6 +109,7 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/example/msl/src/RemsTelemetryModelProvider.js
+++ b/example/msl/src/RemsTelemetryModelProvider.js
@ -22,7 +22,7 @@
 /*global define*/
 define(
-    function (){
+    function () {
        "use strict";
        var PREFIX = "msl_tlm:",
@ -32,20 +32,20 @@ define(
                string: "string"
            };
-        function RemsTelemetryModelProvider(adapter){
+        function RemsTelemetryModelProvider(adapter) {
            function isRelevant(id) {
                return id.indexOf(PREFIX) === 0;
            }
-            function makeId(element){
+            function makeId(element) {
                return PREFIX + element.identifier;
            }
-            function buildTaxonomy(dictionary){
+            function buildTaxonomy(dictionary) {
                var models = {};
-                function addMeasurement(measurement, parent){
+                function addMeasurement(measurement, parent) {
                    var format = FORMAT_MAPPINGS[measurement.type];
                    models[makeId(measurement)] = {
                        type: "msl.measurement",
@ -73,12 +73,12 @@ define(
                        location: spacecraftId,
                        composition: measurements.map(makeId)
                    };
-                    measurements.forEach(function(measurement) {
+                    measurements.forEach(function (measurement) {
                        addMeasurement(measurement, instrumentId);
                    });
                }
-                (dictionary.instruments || []).forEach(function(instrument) {
+                (dictionary.instruments || []).forEach(function (instrument) {
                    addInstrument(instrument, "msl:curiosity");
                });
                return models;
--- a/example/msl/src/RemsTelemetryProvider.js
+++ b/example/msl/src/RemsTelemetryProvider.js
@ -72,10 +72,10 @@ define (
         * This data source does not support real-time subscriptions
         */
        RemsTelemetryProvider.prototype.subscribe = function (callback, requests) {
-            return function() {};
+            return function () {};
        };
        RemsTelemetryProvider.prototype.unsubscribe = function (callback, requests) {
-            return function() {};
+            return function () {};
        };
        return RemsTelemetryProvider;
--- a/example/msl/src/RemsTelemetrySeries.js
+++ b/example/msl/src/RemsTelemetrySeries.js
@ -54,7 +54,7 @@ define(
         * @returns {number} A count of the number of data values available in
         * this series
         */
-        RemsTelemetrySeries.prototype.getPointCount = function() {
+        RemsTelemetrySeries.prototype.getPointCount = function () {
            return this.data.length;
        };
        /**
@ -64,7 +64,7 @@ define(
         * @param index
         * @returns {number} the time value in ms since 1 January 1970
         */
-        RemsTelemetrySeries.prototype.getDomainValue = function(index) {
+        RemsTelemetrySeries.prototype.getDomainValue = function (index) {
            return this.data[index].date;
        };
@ -75,7 +75,7 @@ define(
         * value of.
         * @returns {number} A floating point number
         */
-        RemsTelemetrySeries.prototype.getRangeValue = function(index) {
+        RemsTelemetrySeries.prototype.getRangeValue = function (index) {
            return this.data[index].value;
        };
--- a/example/msl/src/RemsTelemetryServerAdapter.js
+++ b/example/msl/src/RemsTelemetryServerAdapter.js
@ -68,18 +68,18 @@ define(
         * given request ID.
         * @private
         */
-        RemsTelemetryServerAdapter.prototype.requestHistory = function(request) {
+        RemsTelemetryServerAdapter.prototype.requestHistory = function (request) {
            var self = this,
                id = request.key;
            var dataTransforms = this.dataTransforms;
-            function processResponse(response){
+            function processResponse(response) {
                var data = [];
                /*
                 * History data is organised by Sol. Iterate over sols...
                 */
-                response.data.soles.forEach(function(solData){
+                response.data.soles.forEach(function (solData) {
                    /*
                     * Check that valid data exists
                     */
@ -106,13 +106,13 @@ define(
            //Filter results to match request parameters
            function filterResults(results) {
-                return results.filter(function(result){
+                return results.filter(function (result) {
                    return result.date >= (request.start || Number.MIN_VALUE) &&
                        result.date <= (request.end || Number.MAX_VALUE);
                });
            }
-            function packageAndResolve(results){
+            function packageAndResolve(results) {
                return {id: id, values: results};
            }
@ -132,7 +132,7 @@ define(
         * @param id The telemetry data point key to be queried.
         * @returns {Promise | Array<RemsTelemetryValue>} that resolves with an Array of {@link RemsTelemetryValue} objects for the request data key.
         */
-        RemsTelemetryServerAdapter.prototype.history = function(request) {
+        RemsTelemetryServerAdapter.prototype.history = function (request) {
            return this.requestHistory(request);
        };
--- a/example/notifications/bundle.js
+++ b/example/notifications/bundle.js
@ -27,20 +27,20 @@ define([
    "./src/DialogLaunchIndicator",
    "./src/NotificationLaunchIndicator",
    "./res/dialog-launch.html",
-    "./res/notification-launch.html",
+    "./res/notification-launch.html"
    'legacyRegistry'
 ], function (
    DialogLaunchController,
    NotificationLaunchController,
    DialogLaunchIndicator,
    NotificationLaunchIndicator,
    DialogLaunch,
-    NotificationLaunch,
+    NotificationLaunch
    legacyRegistry
 ) {
    "use strict";
-    legacyRegistry.register("example/notifications", {
+    return {
        name:"example/notifications",
        definition: {
            "extensions": {
                "templates": [
                    {
@ -86,5 +86,6 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/example/notifications/res/dialog-launch.html
+++ b/example/notifications/res/dialog-launch.html
@ -1,9 +1,9 @@
 <span class="h-indicator" ng-controller="DialogLaunchController">
    <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <div class="ls-indicator icon-box-with-arrow s-status-available"><span class="label">
+    <div class="c-indicator c-indicator--clickable icon-box-with-arrow s-status-available"><span class="label c-indicator__label">
-        <a ng-click="launchProgress(true)">Known</a>
+        <button ng-click="launchProgress(true)">Known</button>
-        <a ng-click="launchProgress(false)">Unknown</a>
+        <button ng-click="launchProgress(false)">Unknown</button>
-        <a ng-click="launchError()">Error</a>
+        <button ng-click="launchError()">Error</button>
-        <a ng-click="launchInfo()">Info</a>
+        <button ng-click="launchInfo()">Info</button>
    </span></div>
 </span>
--- a/example/notifications/res/notification-launch.html
+++ b/example/notifications/res/notification-launch.html
@ -1,9 +1,9 @@
 <span class="h-indicator" ng-controller="NotificationLaunchController">
    <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <div class="ls-indicator icon-bell s-status-available"><span class="label">
+    <div class="c-indicator c-indicator--clickable icon-bell s-status-available"><span class="label c-indicator__label">
-        <a ng-click="newInfo()">Success</a>
+        <button ng-click="newInfo()">Success</button>
-        <a ng-click="newError()">Error</a>
+        <button ng-click="newError()">Error</button>
-        <a ng-click="newAlert()">Alert</a>
+        <button ng-click="newAlert()">Alert</button>
-        <a ng-click="newProgress()">Progress</a>
+        <button ng-click="newProgress()">Progress</button>
    </span></div>
 </span>
--- a/example/persistence/bundle.js
+++ b/example/persistence/bundle.js
@ -22,15 +22,15 @@
 /*global define*/
 define([
-    "./src/BrowserPersistenceProvider",
+    "./src/BrowserPersistenceProvider"
    'legacyRegistry'
 ], function (
-    BrowserPersistenceProvider,
+    BrowserPersistenceProvider
    legacyRegistry
 ) {
    "use strict";
-    legacyRegistry.register("example/persistence", {
+    return {
        name:"example/persistence",
        definition: {
            "extensions": {
                "components": [
                    {
@ -50,5 +50,6 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/example/policy/bundle.js
+++ b/example/policy/bundle.js
@ -22,15 +22,15 @@
 /*global define*/
 define([
-    "./src/ExamplePolicy",
+    "./src/ExamplePolicy"
    'legacyRegistry'
 ], function (
-    ExamplePolicy,
+    ExamplePolicy
    legacyRegistry
 ) {
    "use strict";
-    legacyRegistry.register("example/policy", {
+    return {
        name:"example/policy",
        definition: {
            "name": "Example Policy",
            "description": "Provides an example of using policies to prohibit actions.",
            "extensions": {
@ -41,5 +41,6 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/example/profiling/bundle.js
+++ b/example/profiling/bundle.js
@ -23,16 +23,16 @@
 define([
    "./src/WatchIndicator",
-    "./src/DigestIndicator",
+    "./src/DigestIndicator"
    'legacyRegistry'
 ], function (
    WatchIndicator,
-    DigestIndicator,
+    DigestIndicator
    legacyRegistry
 ) {
    "use strict";
-    legacyRegistry.register("example/profiling", {
+    return {
        name:"example/profiling",
        definition: {
            "extensions": {
                "indicators": [
                    {
@ -51,5 +51,6 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/example/scratchpad/bundle.js
+++ b/example/scratchpad/bundle.js
@ -22,15 +22,15 @@
 /*global define*/
 define([
-    "./src/ScratchPersistenceProvider",
+    "./src/ScratchPersistenceProvider"
    'legacyRegistry'
 ], function (
-    ScratchPersistenceProvider,
+    ScratchPersistenceProvider
    legacyRegistry
 ) {
    "use strict";
-    legacyRegistry.register("example/scratchpad", {
+    return {
        name:"example/scratchpad",
        definition: {
            "extensions": {
                "roots": [
                    {
@ -59,5 +59,6 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/example/simpleVuePlugin/plugin.js
+++ b/example/simpleVuePlugin/plugin.js
@ -1,10 +1,8 @@
 import Vue from 'Vue';
 import HelloWorld from './HelloWorld.vue';
-function SimpleVuePlugin () {
+function SimpleVuePlugin() {
    return function install(openmct) {
        var views = (openmct.mainViews || openmct.objectViews);
        openmct.types.addType('hello-world', {
            name: 'Hello World',
            description: 'An introduction object',
--- a/example/styleguide/bundle.js
+++ b/example/styleguide/bundle.js
@ -8,8 +8,7 @@ define([
    "./res/templates/glyphs.html",
    "./res/templates/controls.html",
    "./res/templates/input.html",
-    "./res/templates/menus.html",
+    "./res/templates/menus.html"
    'legacyRegistry'
 ], function (
    ExampleStyleGuideModelProvider,
    MCTExample,
@ -20,10 +19,11 @@ define([
    glyphsTemplate,
    controlsTemplate,
    inputTemplate,
-    menusTemplate,
+    menusTemplate
    legacyRegistry
 ) {
-    legacyRegistry.register("example/styleguide", {
+    return {
        name:"example/styleguide",
        definition: {
            "name": "Open MCT Style Guide",
            "description": "Examples and documentation illustrating UI styles in use in Open MCT.",
            "extensions":
@ -103,5 +103,6 @@ define([
                }
            ]
        }
-    });
+        }
    };
 });
--- a/example/styleguide/src/ExampleStyleGuideModelProvider.js
+++ b/example/styleguide/src/ExampleStyleGuideModelProvider.js
@ -30,14 +30,14 @@ define(
            var pages = {};
            // Add pages
-            pages['intro'] = { name: "Introduction", type: "styleguide.intro", location: "styleguide:home" };
+            pages.intro = { name: "Introduction", type: "styleguide.intro", location: "styleguide:home" };
-            pages['standards'] = { name: "Standards", type: "styleguide.standards", location: "styleguide:home" };
+            pages.standards = { name: "Standards", type: "styleguide.standards", location: "styleguide:home" };
-            pages['colors'] = { name: "Colors", type: "styleguide.colors", location: "styleguide:home" };
+            pages.colors = { name: "Colors", type: "styleguide.colors", location: "styleguide:home" };
-            pages['glyphs'] = { name: "Glyphs", type: "styleguide.glyphs", location: "styleguide:home" };
+            pages.glyphs = { name: "Glyphs", type: "styleguide.glyphs", location: "styleguide:home" };
-            pages['status'] = { name: "Status Indication", type: "styleguide.status", location: "styleguide:home" };
+            pages.status = { name: "Status Indication", type: "styleguide.status", location: "styleguide:home" };
-            pages['controls'] = { name: "Controls", type: "styleguide.controls", location: "styleguide:ui-elements" };
+            pages.controls = { name: "Controls", type: "styleguide.controls", location: "styleguide:ui-elements" };
-            pages['input'] = { name: "Text Inputs", type: "styleguide.input", location: "styleguide:ui-elements" };
+            pages.input = { name: "Text Inputs", type: "styleguide.input", location: "styleguide:ui-elements" };
-            pages['menus'] = { name: "Menus", type: "styleguide.menus", location: "styleguide:ui-elements" };
+            pages.menus = { name: "Menus", type: "styleguide.menus", location: "styleguide:ui-elements" };
            return {
                getModels: function () {
--- a/index.html
+++ b/index.html
@ -27,16 +27,16 @@
        <meta name="apple-mobile-web-app-capable" content="yes">
        <title></title>
        <script src="dist/openmct.js"></script>
-        <link rel="stylesheet" href="dist/openmct.css">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96" type="image/x-icon">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32" type="image/x-icon">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16" type="image/x-icon">
        <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16">
        <link rel="shortcut icon" href="dist/favicons/favicon.ico">
    </head>
    <body>
    </body>
    <script>
-        var THIRTY_MINUTES = 30 * 60 * 1000;
+        const FIVE_MINUTES = 5 * 60 * 1000;
        const THIRTY_MINUTES = 30 * 60 * 1000;
        [
            'example/eventGenerator',
            'example/styleguide'
@ -48,11 +48,12 @@
        openmct.install(openmct.plugins.Generator());
        openmct.install(openmct.plugins.ExampleImagery());
        openmct.install(openmct.plugins.UTCTimeSystem());
        openmct.install(openmct.plugins.ImportExport());
        openmct.install(openmct.plugins.FixedView());
        openmct.install(openmct.plugins.AutoflowView({
            type: "telemetry.panel"
        }));
        openmct.install(openmct.plugins.DisplayLayout({
            showAsView: ['summary-widget', 'example.imagery']
        }));
        openmct.install(openmct.plugins.Conductor({
            menuOptions: [
                {
@ -68,217 +69,18 @@
                    timeSystem: 'utc',
                    clock: 'local',
                    clockOffsets: {
-                        start: -25 * 60 * 1000,
+                        start: - THIRTY_MINUTES,
-                        end: 5 * 60 * 1000
+                        end: FIVE_MINUTES
                    }
                }
            ]
        }));
        openmct.install(openmct.plugins.SummaryWidget());
        openmct.install(openmct.plugins.Notebook());
-        openmct.install(openmct.plugins.FolderView());
+        openmct.install(openmct.plugins.LADTable());
-        openmct.install(openmct.plugins.Tabs());
+        openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay']));
-        openmct.install(openmct.plugins.FlexibleLayout());
+        openmct.install(openmct.plugins.ObjectMigration());
-        openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
+        openmct.install(openmct.plugins.ClearData(['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked']));
        openmct.time.timeSystem('utc');
        openmct.start();
        // openmct.toolbars.addProvider({
        //     name: "Testing Toolbar",
        //     key: "testing",
        //     description: "a mock toolbar that exercises all controls",
        //     forSelection: function (selection) {
        //         return true; // always applies.
        //     },
        //     toolbar: function (selection) {
        //         return [
        //             {
        //                 control: 'menu',
        //                 icon: 'icon-plus',
        //                 label: 'Add',
        //                 options: [
        //                     { name: 'Box', class: 'icon-box', title: 'Add Box' },
        //                     { name: 'Line', class: 'icon-line-horz', title: 'Add Line' },
        //                     { name: 'Text', class: 'icon-font', title: 'Add Text' },
        //                     { name: 'Image', class: 'icon-image', title: 'Add Image' }
        //                 ]
        //             },
        //             {
        //                 control: 'separator'
        //             },
        //             {
        //                 control: 'color-picker',
        //                 icon: 'icon-paint-bucket',
        //                 value: '#33ff00',
        //             },
        //             {
        //                 control: 'color-picker',
        //                 icon: 'icon-pencil',
        //                 value: '#ffffff',
        //             },
        //             {
        //                 control: 'color-picker',
        //                 icon: 'icon-font',
        //                 value: '#333333',
        //             },
        //
        //             {
        //                 control: 'separator'
        //             },
        //             {
        //                 control: 'select-menu',
        //                 value: 11,
        //                 options: [
        //                     { value: 9, name: '9 px' },
        //                     { value: 10, name: '10 px' },
        //                     { value: 11, name: '11 px' },
        //                     { value: 12, name: '12 px' },
        //                     { value: 13, name: '13 px' },
        //                     { value: 14, name: '14 px' },
        //                     { value: 16, name: '16 px' },
        //                     { value: 18, name: '18 px' },
        //                     { value: 20, name: '20 px' },
        //                     { value: 24, name: '24 px' },
        //                     { value: 28, name: '28 px' },
        //                     { value: 32, name: '32 px' },
        //                     { value: 40, name: '40 px' },
        //                     { value: 48, name: '48 px' },
        //                     { value: 56, name: '56 px' },
        //                     { value: 64, name: '64 px' },
        //                     { value: 72, name: '72 px' },
        //                     { value: 80, name: '80 px' },
        //                     { value: 88, name: '88 px' },
        //                     { value: 96, name: '96 px' },
        //                     { value: 128, name: '128 px' },
        //                     { value: 160, name: '160 px' }
        //                 ]
        //             },
        //
        //             {
        //                 control: 'separator'
        //             },
        //             {
        //                 control: 'menu',
        //                 icon: 'icon-layers',
        //                 options: [
        //                     { name: 'Move to top', class: 'icon-arrow-double-up', title: 'Move to top' },
        //                     { name: 'Move up', class: 'icon-arrow-up', title: 'Move up' },
        //                     { name: 'Move down', class: 'icon-arrow-down', title: 'Move down' },
        //                     { name: 'Move to bottom', class: 'icon-arrow-double-down', title: 'Move to bottom' }
        //                 ]
        //             },
        //
        //             {
        //                 control: 'separator'
        //             },
        //             {
        //                 control: 'button',
        //                 icon: 'icon-gear'
        //             },
        //
        //             {
        //                 control: 'separator'
        //             },
        //             {
        //                 control: 'input',
        //                 type: 'number',
        //                 label: 'X',
        //                 value: 1,
        //                 title: 'X position'
        //             },
        //             {
        //                 control: 'input',
        //                 type: 'number',
        //                 label: 'Y',
        //                 value: 2,
        //                 title: 'Y position'
        //             },
        //             {
        //                 control: 'input',
        //                 type: 'number',
        //                 label: 'W',
        //                 value: 3,
        //                 title: 'Width'
        //             },
        //             {
        //                 control: 'input',
        //                 type: 'number',
        //                 label: 'H',
        //                 value: 4,
        //                 title: 'Height'
        //             },
        //
        //             {
        //                 control: 'separator'
        //             },
        //             {
        //                 control: 'button',
        //                 icon: 'icon-trash',
        //                 label: 'delete',
        //                 modifier: 'caution'
        //             },
        //
        //             {
        //                 control: 'separator'
        //             },
        //             {
        //                 control: 'checkbox',
        //                 name: 'this is a checkbox',
        //             },
        //             {
        //                 control: 'separator'
        //             },
        //             {
        //                 control: 'toggle-button',
        //                 title: 'Toggle Frame',
        //                 property: 'hideFrame',
        //                 value: false,
        //                 options: [
        //                     {
        //                         value: true,
        //                         icon: 'icon-frame-hide'
        //                     },
        //                     {
        //                         value: false,
        //                         icon: 'icon-frame-show'
        //                     }
        //                 ]
        //             },
        //             {
        //                 control: 'toggle-button',
        //                 title: 'Snap to grid',
        //                 property: 'snapToGrid',
        //                 value: true,
        //                 options: [
        //                     {
        //                         value: true,
        //                         icon: 'icon-grid-snap-to'
        //                     },
        //                     {
        //                         value: false,
        //                         icon: 'icon-grid-snap-no'
        //                     }
        //                 ]
        //             },
        //             {
        //                 control: 'toggle-button',
        //                 title: 'Toggle label',
        //                 property: 'showLabel',
        //                 value: true,
        //                 options: [
        //                     {
        //                         value: true,
        //                         icon: 'icon-two-parts-both'
        //                     },
        //                     {
        //                         value: false,
        //                         icon: 'icon-two-parts-one-only'
        //                     }
        //                 ]
        //             }
        //         ];
        //     }
        // });
    </script>
 </html>
--- a/karma.conf.js
+++ b/karma.conf.js
@ -23,9 +23,9 @@
 /*global module,process*/
 const devMode = process.env.NODE_ENV !== 'production';
 const browsers = [process.env.NODE_ENV === 'debug' ? 'ChromeDebugging' : 'ChromeHeadless'];
 module.exports = (config) => {
    const webpackConfig = require('./webpack.config.js');
    delete webpackConfig.output;
@ -50,11 +50,17 @@ module.exports = (config) => {
            'coverage',
            'html'
        ],
-        browsers: ['ChromeHeadless'],
+        browsers: browsers,
        customLaunchers: {
            ChromeDebugging: {
                base: 'Chrome',
                flags: ['--remote-debugging-port=9222'],
                debug: true
            }
        },
        colors: true,
        logLevel: config.LOG_INFO,
        autoWatch: true,
        coverageReporter: {
            dir: process.env.CIRCLE_ARTIFACTS ?
                process.env.CIRCLE_ARTIFACTS + '/coverage' :
@ -66,22 +72,18 @@ module.exports = (config) => {
                }
            }
        },
        // HTML test reporting.
        htmlReporter: {
            outputDir: "dist/reports/tests",
            preserveDescribeNesting: true,
            foldAll: false
        },
        preprocessors: {
            // add webpack as preprocessor
-            'platform/**/*Spec.js': [ 'webpack' ],
+            'platform/**/*Spec.js': [ 'webpack', 'sourcemap' ],
-            'src/**/*Spec.js': [ 'webpack' ]
+            'src/**/*Spec.js': [ 'webpack', 'sourcemap' ]
        },
        webpack: webpackConfig,
        webpackMiddleware: {
            stats: 'errors-only',
            logLevel: 'warn'
@ -89,4 +91,3 @@ module.exports = (config) => {
        singleRun: true
    });
 }
--- a/openmct.js
+++ b/openmct.js
@ -19,7 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global module,BUILD_CONSTANTS*/
+/*global module*/
 const matcher = /\/openmct.js$/;
 if (document.currentScript) {
--- a/package.json
+++ b/package.json
@ -1,9 +1,10 @@
 {
  "name": "openmct",
-  "version": "0.14.0-SNAPSHOT",
+  "version": "1.0.0-beta",
  "description": "The Open MCT core platform",
  "dependencies": {},
  "devDependencies": {
    "acorn": "6.2.0",
    "angular": "1.4.14",
    "angular-route": "1.4.14",
    "babel-eslint": "8.2.6",
@ -11,6 +12,7 @@
    "concurrently": "^3.6.1",
    "copy-webpack-plugin": "^4.5.2",
    "css-loader": "^1.0.0",
    "cross-env": "^6.0.3",
    "d3-array": "1.2.x",
    "d3-axis": "1.0.x",
    "d3-collection": "1.0.x",
@ -22,10 +24,11 @@
    "d3-time": "1.0.x",
    "d3-time-format": "2.1.x",
    "eslint": "5.2.0",
    "eslint-plugin-vue": "^6.0.0",
    "eventemitter3": "^1.2.0",
    "exports-loader": "^0.7.0",
    "express": "^4.13.1",
-    "fast-sass-loader": "^1.4.5",
+    "fast-sass-loader": "1.4.6",
    "file-loader": "^1.1.11",
    "file-saver": "^1.3.8",
    "git-rev-sync": "^1.4.0",
@ -42,6 +45,7 @@
    "karma-coverage": "^1.1.2",
    "karma-html-reporter": "^0.2.7",
    "karma-jasmine": "^1.1.2",
    "karma-sourcemap-loader": "^0.3.7",
    "karma-webpack": "^3.0.0",
    "location-bar": "^3.0.1",
    "lodash": "^3.10.1",
@ -55,10 +59,9 @@
    "node-bourbon": "^4.2.3",
    "node-sass": "^4.9.2",
    "painterro": "^0.2.65",
-    "printj": "^1.1.0",
+    "printj": "^1.2.1",
    "raw-loader": "^0.5.1",
    "request": "^2.69.0",
    "screenfull": "^3.3.2",
    "split": "^1.0.0",
    "style-loader": "^0.21.0",
    "v8-compile-cache": "^1.1.0",
@ -73,12 +76,13 @@
  },
  "scripts": {
    "start": "node app.js",
-    "lint": "eslint platform src openmct.js",
+    "lint": "eslint platform example src/**/*.{js,vue} openmct.js",
-    "lint:fix": "eslint platform src openmct.js --fix",
+    "lint:fix": "eslint platform example src/**/*.{js,vue} openmct.js --fix",
-    "build:prod": "NODE_ENV=production webpack",
+    "build:prod": "cross-env NODE_ENV=production webpack",
    "build:dev": "webpack",
    "build:watch": "webpack --watch",
    "test": "karma start --single-run",
    "test-debug": "cross-env NODE_ENV=debug karma start --no-single-run",
    "test:watch": "karma start --no-single-run",
    "verify": "concurrently 'npm:test' 'npm:lint'",
    "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
--- a/platform/commonUI/about/bundle.js
+++ b/platform/commonUI/about/bundle.js
@ -31,8 +31,7 @@ define([
    "./res/templates/license-apache.html",
    "./res/templates/license-mit.html",
    "./res/templates/licenses.html",
-    "./res/templates/licenses-export-md.html",
+    "./res/templates/licenses-export-md.html"
    'legacyRegistry'
 ], function (
    aboutDialogTemplate,
    LogoController,
@ -44,11 +43,12 @@ define([
    licenseApacheTemplate,
    licenseMitTemplate,
    licensesTemplate,
-    licensesExportMdTemplate,
+    licensesExportMdTemplate
    legacyRegistry
 ) {
-    legacyRegistry.register("platform/commonUI/about", {
+    return {
        name:"platform/commonUI/about",
        definition: {
            "name": "About Open MCT",
            "extensions": {
                "templates": [
@ -176,5 +176,6 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/platform/commonUI/browse/bundle.js
+++ b/platform/commonUI/browse/bundle.js
@ -21,18 +21,10 @@
 *****************************************************************************/
 define([
    "./src/BrowseController",
    "./src/PaneController",
    "./src/InspectorPaneController",
    "./src/BrowseObjectController",
    "./src/MenuArrowController",
    "./src/ObjectHeaderController",
    "./src/navigation/NavigationService",
    "./src/navigation/NavigateAction",
    "./src/navigation/OrphanNavigationHandler",
    "./src/windowing/NewTabAction",
    "./src/windowing/FullscreenAction",
    "./src/windowing/WindowTitler",
    "./res/templates/browse.html",
    "./res/templates/browse-object.html",
    "./res/templates/browse/object-header.html",
@ -40,21 +32,12 @@ define([
    "./res/templates/menu-arrow.html",
    "./res/templates/back-arrow.html",
    "./res/templates/browse/object-properties.html",
-    "./res/templates/browse/inspector-region.html",
+    "./res/templates/browse/inspector-region.html"
    'legacyRegistry'
 ], function (
    BrowseController,
    PaneController,
    InspectorPaneController,
    BrowseObjectController,
    MenuArrowController,
    ObjectHeaderController,
    NavigationService,
    NavigateAction,
    OrphanNavigationHandler,
    NewTabAction,
    FullscreenAction,
    WindowTitler,
    browseTemplate,
    browseObjectTemplate,
    objectHeaderTemplate,
@ -62,11 +45,12 @@ define([
    menuArrowTemplate,
    backArrowTemplate,
    objectPropertiesTemplate,
-    inspectorRegionTemplate,
+    inspectorRegionTemplate
    legacyRegistry
 ) {
-    legacyRegistry.register("platform/commonUI/browse", {
+    return {
        name:"platform/commonUI/browse",
        definition: {
            "extensions": {
                "routes": [
                ],
@ -77,70 +61,6 @@ define([
                        "priority": "fallback"
                    }
                ],
            "controllers": [
                {
                    "key": "BrowseController",
                    "implementation": BrowseController,
                    "depends": [
                        "$scope",
                        "$route",
                        "$location",
                        "objectService",
                        "navigationService",
                        "urlService",
                        "DEFAULT_PATH"
                    ]
                },
                {
                    "key": "PaneController",
                    "implementation": PaneController,
                    "priority": "preferred",
                    "depends": [
                        "$scope",
                        "agentService",
                        "$window",
                        "$location",
                        "$attrs",
                        "navigationService"
                    ]
                },
                {
                    "key": "BrowseObjectController",
                    "implementation": BrowseObjectController,
                    "depends": [
                        "$scope",
                        "$location",
                        "$route"
                    ]
                },
                {
                    "key": "MenuArrowController",
                    "implementation": MenuArrowController,
                    "depends": [
                        "$scope"
                    ]
                },
                {
                    "key": "InspectorPaneController",
                    "implementation": InspectorPaneController,
                    "priority": "preferred",
                    "depends": [
                        "$scope",
                        "agentService",
                        "$window",
                        "navigationService",
                        "$location",
                        "$attrs"
                    ]
                },
                {
                    "key": "ObjectHeaderController",
                    "implementation": ObjectHeaderController,
                    "depends": [
                        "$scope"
                    ]
                }
            ],
                "representations": [
                    {
                        "key": "browse-object",
@ -225,24 +145,9 @@ define([
                        "group": "windowing",
                        "cssClass": "icon-new-window",
                        "priority": "preferred"
                },
                {
                    "key": "fullscreen",
                    "implementation": FullscreenAction,
                    "category": "view-control",
                    "group": "windowing",
                    "priority": "default"
                    }
                ],
                "runs": [
                {
                    "implementation": WindowTitler,
                    "depends": [
                        "navigationService",
                        "$rootScope",
                        "$document"
                    ]
                },
                    {
                        "implementation": OrphanNavigationHandler,
                        "depends": [
@ -265,19 +170,8 @@ define([
                        key: "inspectorRegion",
                        template: inspectorRegionTemplate
                    }
            ],
            "licenses": [
                {
                    "name": "screenfull.js",
                    "version": "1.2.0",
                    "description": "Wrapper for cross-browser usage of fullscreen API",
                    "author": "Sindre Sorhus",
                    "website": "https://github.com/sindresorhus/screenfull.js/",
                    "copyright": "Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)",
                    "license": "license-mit",
                    "link": "https://github.com/sindresorhus/screenfull.js/blob/gh-pages/license"
                }
                ]
            }
-    });
+        }
    };
 });
--- a/platform/commonUI/browse/src/BrowseController.js
+++ b/platform/commonUI/browse/src/BrowseController.js
@ -1,215 +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.
 *****************************************************************************/
 /**
 * This bundle implements Browse mode.
 * @namespace platform/commonUI/browse
 */
 define(
    ['lodash'],
    function (_) {
        /**
         * The BrowseController is used to populate the initial scope in Browse
         * mode. It loads the root object from the objectService and makes it
         * available in the scope for Angular template's; this is the point at
         * which Angular templates first have access to the domain object
         * hierarchy.
         *
         * @memberof platform/commonUI/browse
         * @constructor
         */
        function BrowseController(
            $scope,
            $route,
            $location,
            objectService,
            navigationService,
            urlService,
            defaultPath
        ) {
            window.browseScope = $scope;
            var initialPath = ($route.current.params.ids || defaultPath).split("/"),
                currentIds;
            $scope.treeModel = {
                selectedObject: undefined,
                onSelection: function (object) {
                    navigationService.setNavigation(object, true);
                },
                allowSelection: function (object) {
                    var domainObjectInView = navigationService.getNavigation(),
                        isInEditMode = domainObjectInView.getCapability('status').get('editing');
                    if (isInEditMode) {
                        var actions = object.getCapability('action'),
                            previewAction = actions.getActions({key: 'mct-preview-action'})[0];
                        if (previewAction && previewAction.perform) {
                            previewAction.perform();
                            return false;
                        } else {
                            return navigationService.shouldNavigate();
                        }
                    } else {
                        return true;
                    }
                }
            };
            function idsForObject(domainObject) {
                return urlService
                    .urlForLocation("", domainObject)
                    .replace('/', '');
            }
            // Find an object in an array of objects.
            function findObject(domainObjects, id) {
                var i;
                for (i = 0; i < domainObjects.length; i += 1) {
                    if (domainObjects[i].getId() === id) {
                        return domainObjects[i];
                    }
                }
            }
            // helper, fetch a single object from the object service.
            function getObject(id) {
                return objectService.getObjects([id])
                    .then(function (results) {
                        return results[id];
                    });
            }
            // recursively locate and return an object inside of a container
            // via a path.  If at any point in the recursion it fails to find
            // the next object, it will return the parent.
            function findViaComposition(containerObject, path) {
                var nextId = path.shift();
                if (!nextId) {
                    return containerObject;
                }
                return containerObject.useCapability('composition')
                    .then(function (composees) {
                        var nextObject = findObject(composees, nextId);
                        if (!nextObject) {
                            return containerObject;
                        }
                        if (!nextObject.hasCapability('composition')) {
                            return nextObject;
                        }
                        return findViaComposition(nextObject, path);
                    });
            }
            function navigateToObject(desiredObject) {
                $scope.navigatedObject = desiredObject;
                $scope.treeModel.selectedObject = desiredObject;
                currentIds = idsForObject(desiredObject);
                $route.current.pathParams.ids = currentIds;
                $location.path('/browse/' + currentIds);
            }
            function getLastChildIfRoot(object) {
                if (object.getId() !== 'ROOT') {
                    return object;
                }
                return object.useCapability('composition')
                    .then(function (composees) {
                        return composees[composees.length - 1];
                    });
            }
            function navigateToPath(path) {
                return getObject('ROOT')
                    .then(function (root) {
                        return findViaComposition(root, path);
                    })
                    .then(getLastChildIfRoot)
                    .then(function (object) {
                        navigationService.setNavigation(object);
                    });
            }
            getObject('ROOT')
                .then(function (root) {
                    $scope.domainObject = root;
                    navigateToPath(initialPath);
                });
            // Handle navigation events from view service.  Only navigates
            // if path has changed.
            function navigateDirectlyToModel(domainObject) {
                var newIds = idsForObject(domainObject);
                if (currentIds !== newIds) {
                    currentIds = newIds;
                    navigateToObject(domainObject);
                }
            }
            // Listen for changes in navigation state.
            navigationService.addListener(navigateDirectlyToModel);
            // Listen for route changes which are caused by browser events
            // (e.g. bookmarks to pages in OpenMCT) and prevent them.  Instead,
            // navigate to the path ourselves, which results in it being
            // properly set.
            $scope.$on('$routeChangeStart', function (event, route, oldRoute) {
                if (route.$$route === $route.current.$$route) {
                    if (route.pathParams.ids &&
                        route.pathParams.ids !== $route.current.pathParams.ids) {
                        var otherParams = _.omit(route.params, 'ids');
                        var oldOtherParams = _.omit(oldRoute.params, 'ids');
                        var deletedParams = _.omit(oldOtherParams, _.keys(otherParams));
                        event.preventDefault();
                        navigateToPath(route.pathParams.ids.split('/'))
                            .then(function () {
                                if (!_.isEqual(otherParams, oldOtherParams)) {
                                    _.forEach(otherParams, function (v, k) {
                                        $location.search(k, v);
                                    });
                                    _.forEach(deletedParams, function (k) {
                                        $location.search(k, null);
                                    });
                                }
                            });
                    } else {
                        navigateToPath([]);
                    }
                }
            });
            // Clean up when the scope is destroyed
            $scope.$on("$destroy", function () {
                navigationService.removeListener(navigateDirectlyToModel);
            });
        }
        return BrowseController;
    }
 );
--- a/platform/commonUI/browse/src/BrowseObjectController.js
+++ b/platform/commonUI/browse/src/BrowseObjectController.js
@ -1,72 +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(
    [],
    function () {
        /**
         * Controller for the `browse-object` representation of a domain
         * object (the right-hand side of Browse mode.)
         * @memberof platform/commonUI/browse
         * @constructor
         */
        function BrowseObjectController($scope, $location, $route) {
            function setViewForDomainObject(domainObject) {
                var locationViewKey = $location.search().view;
                function selectViewIfMatching(view) {
                    if (view.key === locationViewKey) {
                        $scope.representation = $scope.representation || {};
                        $scope.representation.selected = view;
                    }
                }
                if (locationViewKey) {
                    ((domainObject && domainObject.useCapability('view')) || [])
                        .forEach(selectViewIfMatching);
                }
            }
            function updateQueryParam(viewKey) {
                if (viewKey && $location.search().view !== viewKey) {
                    $location.search('view', viewKey);
                }
            }
            $scope.$watch('domainObject', setViewForDomainObject);
            $scope.$watch('representation.selected.key', updateQueryParam);
            $scope.$on('$locationChangeSuccess', function () {
                setViewForDomainObject($scope.domainObject);
            });
            $scope.doAction = function (action) {
                return $scope[action] && $scope[action]();
            };
        }
        return BrowseObjectController;
    }
 );
--- a/platform/commonUI/browse/src/InspectorPaneController.js
+++ b/platform/commonUI/browse/src/InspectorPaneController.js
@ -1,78 +0,0 @@
 /*****************************************************************************
 * Open MCT Web, Copyright (c) 2014-2015, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
 * Open MCT Web 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 Web 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(
    ["./PaneController"],
    function (PaneController) {
        /**
         * Pane controller that reveals inspector, if hidden, when object
         * switches to edit mode.
         *
         * @param $scope
         * @param agentService
         * @param $window
         * @param navigationService
         * @constructor
         */
        function InspectorPaneController($scope, agentService, $window, navigationService, $location, $attrs) {
            PaneController.call(this, $scope, agentService, $window, $location, $attrs);
            var statusListener,
                self = this;
            function showInspector(statuses) {
                if (statuses.indexOf('editing') !== -1 && !self.visible()) {
                    self.toggle();
                }
            }
            function attachStatusListener(domainObject) {
                // Remove existing status listener if existing
                if (statusListener) {
                    statusListener();
                }
                if (domainObject.hasCapability("status")) {
                    statusListener = domainObject.getCapability("status").listen(showInspector);
                }
                return statusListener;
            }
            var domainObject = navigationService.getNavigation();
            if (domainObject) {
                attachStatusListener(domainObject);
            }
            navigationService.addListener(attachStatusListener);
            $scope.$on("$destroy", function () {
                statusListener();
                navigationService.removeListener(attachStatusListener);
            });
        }
        InspectorPaneController.prototype = Object.create(PaneController.prototype);
        return InspectorPaneController;
    }
 );
--- a/platform/commonUI/browse/src/MenuArrowController.js
+++ b/platform/commonUI/browse/src/MenuArrowController.js
@ -1,59 +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.
 *****************************************************************************/
 /**
 * Module defining MenuArrowController. Created by shale on 06/30/2015.
 */
 define(
    [],
    function () {
        /**
         * A left-click on the menu arrow should display a
         * context menu. This controller launches the context
         * menu.
         * @memberof platform/commonUI/browse
         * @constructor
         */
        function MenuArrowController($scope) {
            this.$scope = $scope;
        }
        /**
         * Show a context menu for the domain object in this scope.
         *
         * @param event the browser event which caused this (used to
         *        position the menu)
         */
        MenuArrowController.prototype.showMenu = function (event) {
            var actionContext = {
                key: 'menu',
                domainObject: this.$scope.domainObject,
                event: event
            };
            this.$scope.domainObject.getCapability('action').perform(actionContext);
        };
        return MenuArrowController;
    }
 );
--- a/platform/commonUI/browse/src/ObjectHeaderController.js
+++ b/platform/commonUI/browse/src/ObjectHeaderController.js
@ -1,92 +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(
    [],
    function () {
        /**
         * Controller to provide the ability to inline edit an object name.
         *
         * @constructor
         * @memberof platform/commonUI/browse
         */
        function ObjectHeaderController($scope) {
            this.$scope = $scope;
            this.domainObject = $scope.domainObject;
            this.editable = this.allowEdit();
        }
        /**
         * Updates the object name on blur and enter keypress events.
         *
         * @param event the mouse event
         */
        ObjectHeaderController.prototype.updateName = function (event) {
            if (!event || !event.currentTarget) {
                return;
            }
            if (event.type === 'blur') {
                this.updateModel(event);
            } else if (event.which === 13) {
                this.updateModel(event);
                event.currentTarget.blur();
                window.getSelection().removeAllRanges();
            }
        };
        /**
         * Updates the model.
         *
         * @param event the mouse event
         * @param private
         */
        ObjectHeaderController.prototype.updateModel = function (event) {
            var name = event.currentTarget.textContent.replace(/\n/g, ' ');
            if (name.length === 0) {
                name = "Unnamed " + this.domainObject.getCapability("type").typeDef.name;
                event.currentTarget.textContent = name;
            }
            if (name !== this.domainObject.getModel().name) {
                this.domainObject.getCapability('mutation').mutate(function (model) {
                    model.name = name;
                });
            }
        };
        /**
         * Checks if the domain object is editable.
         *
         * @private
         * @return true if object is editable
         */
        ObjectHeaderController.prototype.allowEdit = function () {
            var type = this.domainObject && this.domainObject.getCapability('type');
            return !!(type && type.hasFeature('creation'));
        };
        return ObjectHeaderController;
    }
 );
--- a/platform/commonUI/browse/src/PaneController.js
+++ b/platform/commonUI/browse/src/PaneController.js
@ -1,88 +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(
    [],
    function () {
        var navigationListenerAdded = false;
        /**
         * Controller to provide the ability to show/hide the tree in
         * Browse mode.
         * @constructor
         * @memberof platform/commonUI/browse
         */
        function PaneController($scope, agentService, $window, $location, $attrs, navigationService) {
            var self = this;
            this.agentService = agentService;
            var hideParameterPresent = $location.search().hasOwnProperty($attrs.hideParameter);
            if ($attrs.hideParameter && hideParameterPresent) {
                this.state = false;
                $location.search($attrs.hideParameter, undefined);
            } else {
                this.state = true;
            }
            /**
             * Callback to invoke when any selection occurs in the tree.
             * This controller can be passed in as the `parameters` object
             * to the tree representation.
             *
             * @property {Function} callback
             * @memberof platform/commonUI/browse.PaneController#
             */
            this.callback = function () {
                // Note that, since this is a callback to pass, this is not
                // declared as a method but as a property which happens to
                // be a function.
                if (agentService.isPhone() && agentService.isPortrait()) {
                    // On phones, trees should collapse in portrait mode
                    // when something is navigated-to.
                    self.state = false;
                }
            };
            if (navigationService && navigationService.addListener && !navigationListenerAdded) {
                navigationService.addListener(this.callback);
                navigationListenerAdded = true;
            }
        }
        /**
         * Toggle the visibility of the pane.
         */
        PaneController.prototype.toggle = function () {
            this.state = !this.state;
        };
        /**
         * Get the desired visibility state of the pane.
         * @returns {boolean} true when visible
         */
        PaneController.prototype.visible = function () {
            return !!this.state;
        };
        return PaneController;
    }
 );
--- a/platform/commonUI/browse/src/windowing/FullscreenAction.js
+++ b/platform/commonUI/browse/src/windowing/FullscreenAction.js
@ -1,64 +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.
 *****************************************************************************/
 /**
 * Module defining FullscreenAction. Created by vwoeltje on 11/18/14.
 */
 define(
    ["screenfull"],
    function (screenfull) {
        var ENTER_FULLSCREEN = "Enter full screen mode",
            EXIT_FULLSCREEN = "Exit full screen mode";
        /**
         * The fullscreen action toggles between fullscreen display
         * and regular in-window display.
         * @memberof platform/commonUI/browse
         * @constructor
         * @implements {Action}
         */
        function FullscreenAction(context) {
            this.context = context;
        }
        FullscreenAction.prototype.perform = function () {
            screenfull.toggle();
        };
        FullscreenAction.prototype.getMetadata = function () {
            // We override getMetadata, because the icon cssClass and
            // description need to be determined at run-time
            // based on whether or not we are currently
            // full screen.
            var metadata = Object.create(FullscreenAction);
            metadata.cssClass = screenfull.isFullscreen ? "icon-fullscreen-expand" : "icon-fullscreen-collapse";
            metadata.description = screenfull.isFullscreen ?
                EXIT_FULLSCREEN : ENTER_FULLSCREEN;
            metadata.group = "windowing";
            metadata.context = this.context;
            return metadata;
        };
        return FullscreenAction;
    }
 );
--- a/platform/commonUI/browse/src/windowing/WindowTitler.js
+++ b/platform/commonUI/browse/src/windowing/WindowTitler.js
@ -1,51 +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(
    [],
    function () {
        /**
         * Updates the title of the current window to reflect the name
         * of the currently navigated-to domain object.
         * @memberof platform/commonUI/browse
         * @constructor
         */
        function WindowTitler(navigationService, $rootScope, $document) {
            // Look up name of the navigated domain object...
            function getNavigatedObjectName() {
                var navigatedObject = navigationService.getNavigation();
                return navigatedObject && navigatedObject.getModel().name;
            }
            // Set the window title...
            function setTitle(name) {
                $document[0].title = name;
            }
            // Watch the former, and invoke the latter
            $rootScope.$watch(getNavigatedObjectName, setTitle);
        }
        return WindowTitler;
    }
 );
--- a/platform/commonUI/browse/test/BrowseControllerSpec.js
+++ b/platform/commonUI/browse/test/BrowseControllerSpec.js
@ -1,266 +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.
 *****************************************************************************/
 /*global console*/
 /**
 * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
 */
 define(
    [
        "../src/BrowseController",
        "../src/navigation/NavigationService"
    ],
    function (
        BrowseController,
        NavigationService
    ) {
        describe("The browse controller", function () {
            var mockScope,
                mockRoute,
                mockLocation,
                mockObjectService,
                mockNavigationService,
                mockRootObject,
                mockUrlService,
                mockDefaultRootObject,
                mockOtherDomainObject,
                mockNextObject,
                testDefaultRoot,
                controller;
            function waitsForNavigation() {
                return new Promise(function (resolve) {
                    mockNavigationService.setNavigation.and.callFake(function (obj) {
                        var returnValue;
                        try {
                            returnValue = NavigationService.prototype.setNavigation.call(mockNavigationService, obj);
                        } catch (err) {
                            console.error(err);
                            //Not rejecting because 'setNavigation' has been called, which is what's being tested here.
                            //Rejecting will fail tests.
                        }
                        resolve();
                        return returnValue;
                    });
                });
            }
            function instantiateController() {
                controller = new BrowseController(
                    mockScope,
                    mockRoute,
                    mockLocation,
                    mockObjectService,
                    mockNavigationService,
                    mockUrlService,
                    testDefaultRoot
                );
            }
            beforeEach(function () {
                testDefaultRoot = "some-root-level-domain-object";
                mockScope = jasmine.createSpyObj(
                    "$scope",
                    ["$on", "$watch"]
                );
                mockRoute = { current: { params: {}, pathParams: {} } };
                mockUrlService = jasmine.createSpyObj(
                    "urlService",
                    ["urlForLocation"]
                );
                mockUrlService.urlForLocation.and.callFake(function (mode, object) {
                    if (object === mockDefaultRootObject) {
                        return [mode, testDefaultRoot].join('/');
                    }
                    if (object === mockOtherDomainObject) {
                        return [mode, 'other'].join('/');
                    }
                    if (object === mockNextObject) {
                        return [mode, testDefaultRoot, 'next'].join('/');
                    }
                    throw new Error('Tried to get url for unexpected object');
                });
                mockLocation = jasmine.createSpyObj(
                    "$location",
                    ["path"]
                );
                mockObjectService = jasmine.createSpyObj(
                    "objectService",
                    ["getObjects"]
                );
                mockNavigationService = new NavigationService({});
                [
                    "getNavigation",
                    "setNavigation",
                    "addListener",
                    "removeListener"
                ].forEach(function (method) {
                    spyOn(mockNavigationService, method)
                        .and.callThrough();
                });
                mockRootObject = jasmine.createSpyObj(
                    "rootObjectContainer",
                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
                );
                mockDefaultRootObject = jasmine.createSpyObj(
                    "defaultRootObject",
                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
                );
                mockOtherDomainObject = jasmine.createSpyObj(
                    "otherDomainObject",
                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
                );
                mockNextObject = jasmine.createSpyObj(
                    "nestedDomainObject",
                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
                );
                mockObjectService.getObjects.and.returnValue(Promise.resolve({
                    ROOT: mockRootObject
                }));
                mockRootObject.useCapability.and.returnValue(Promise.resolve([
                    mockOtherDomainObject,
                    mockDefaultRootObject
                ]));
                mockRootObject.hasCapability.and.returnValue(true);
                mockDefaultRootObject.useCapability.and.returnValue(Promise.resolve([
                    mockNextObject
                ]));
                mockDefaultRootObject.hasCapability.and.returnValue(true);
                mockOtherDomainObject.hasCapability.and.returnValue(false);
                mockNextObject.useCapability.and.returnValue(undefined);
                mockNextObject.hasCapability.and.returnValue(false);
                mockNextObject.getId.and.returnValue("next");
                mockDefaultRootObject.getId.and.returnValue(testDefaultRoot);
                instantiateController();
                return waitsForNavigation();
            });
            it("uses composition to set the navigated object, if there is none", function () {
                instantiateController();
                return waitsForNavigation().then(function () {
                    expect(mockNavigationService.setNavigation)
                        .toHaveBeenCalledWith(mockDefaultRootObject);
                });
            });
            it("navigates to a root-level object, even when default path is not found", function () {
                mockDefaultRootObject.getId
                    .and.returnValue("something-other-than-the-" + testDefaultRoot);
                instantiateController();
                return waitsForNavigation().then(function () {
                    expect(mockNavigationService.setNavigation)
                        .toHaveBeenCalledWith(mockDefaultRootObject);
                });
            });
            it("does not try to override navigation", function () {
                mockNavigationService.getNavigation.and.returnValue(mockDefaultRootObject);
                instantiateController();
                return waitsForNavigation().then(function () {
                    expect(mockScope.navigatedObject).toBe(mockDefaultRootObject);
                });
            });
            it("updates scope when navigated object changes", function () {
                // Should have registered a listener - call it
                mockNavigationService.addListener.calls.mostRecent().args[0](
                    mockOtherDomainObject
                );
                expect(mockScope.navigatedObject).toEqual(mockOtherDomainObject);
            });
            it("releases its navigation listener when its scope is destroyed", function () {
                expect(mockScope.$on).toHaveBeenCalledWith(
                    "$destroy",
                    jasmine.any(Function)
                );
                mockScope.$on.calls.mostRecent().args[1]();
                // Should remove the listener it added earlier
                expect(mockNavigationService.removeListener).toHaveBeenCalledWith(
                    mockNavigationService.addListener.calls.mostRecent().args[0]
                );
            });
            it("uses route parameters to choose initially-navigated object", function () {
                mockRoute.current.params.ids = testDefaultRoot + "/next";
                instantiateController();
                return waitsForNavigation().then(function () {
                    expect(mockScope.navigatedObject).toBe(mockNextObject);
                    expect(mockNavigationService.setNavigation)
                        .toHaveBeenCalledWith(mockNextObject);
                });
            });
            it("handles invalid IDs by going as far as possible", function () {
                // Idea here is that if we get a bad path of IDs,
                // browse controller should traverse down it until
                // it hits an invalid ID.
                mockRoute.current.params.ids = testDefaultRoot + "/junk";
                instantiateController();
                return waitsForNavigation().then(function () {
                    expect(mockScope.navigatedObject).toBe(mockDefaultRootObject);
                    expect(mockNavigationService.setNavigation)
                        .toHaveBeenCalledWith(mockDefaultRootObject);
                });
            });
            it("handles compositionless objects by going as far as possible", function () {
                // Idea here is that if we get a path which passes
                // through an object without a composition, browse controller
                // should stop at it since remaining IDs cannot be loaded.
                mockRoute.current.params.ids = testDefaultRoot + "/next/junk";
                instantiateController();
                return waitsForNavigation().then(function () {
                    expect(mockScope.navigatedObject).toBe(mockNextObject);
                    expect(mockNavigationService.setNavigation)
                        .toHaveBeenCalledWith(mockNextObject);
                });
            });
            it("updates the displayed route to reflect current navigation", function () {
                // In order to trigger a route update and not a route change,
                // the current route must be updated before location.path is
                // called.
                expect(mockRoute.current.pathParams.ids)
                    .not
                    .toBe(testDefaultRoot + '/next');
                mockLocation.path.and.callFake(function () {
                    expect(mockRoute.current.pathParams.ids)
                        .toBe(testDefaultRoot + '/next');
                });
                mockNavigationService.addListener.calls.mostRecent().args[0](
                    mockNextObject
                );
                expect(mockLocation.path).toHaveBeenCalledWith(
                    '/browse/' + testDefaultRoot + '/next'
                );
            });
        });
    }
 );
--- a/platform/commonUI/browse/test/BrowseObjectControllerSpec.js
+++ b/platform/commonUI/browse/test/BrowseObjectControllerSpec.js
@ -1,93 +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(
    ["../src/BrowseObjectController"],
    function (BrowseObjectController) {
        describe("The browse object controller", function () {
            var mockScope,
                mockLocation,
                mockRoute,
                controller;
            // Utility function; look for a $watch on scope and fire it
            function fireWatch(expr, value) {
                mockScope.$watch.calls.all().forEach(function (call) {
                    if (call.args[0] === expr) {
                        call.args[1](value);
                    }
                });
            }
            beforeEach(function () {
                mockScope = jasmine.createSpyObj(
                    "$scope",
                    ["$on", "$watch"]
                );
                mockRoute = { current: { params: {} } };
                mockLocation = jasmine.createSpyObj(
                    "$location",
                    ["path", "search"]
                );
                mockLocation.search.and.returnValue({});
                controller = new BrowseObjectController(
                    mockScope,
                    mockLocation,
                    mockRoute
                );
            });
            it("updates query parameters when selected view changes", function () {
                fireWatch("representation.selected.key", "xyz");
                expect(mockLocation.search).toHaveBeenCalledWith('view', "xyz");
                // Allows the path index to be checked
                // prior to setting $route.current
                mockLocation.path.and.returnValue("/browse/");
            });
            it("sets the active view from query parameters", function () {
                var mockDomainObject = jasmine.createSpyObj(
                        "domainObject",
                        ['getId', 'getModel', 'getCapability', 'useCapability']
                    ),
                    testViews = [
                        { key: 'abc' },
                        { key: 'def', someKey: 'some value' },
                        { key: 'xyz' }
                    ];
                mockDomainObject.useCapability.and.callFake(function (c) {
                    return (c === 'view') && testViews;
                });
                mockLocation.search.and.returnValue({ view: 'def' });
                fireWatch('domainObject', mockDomainObject);
                expect(mockScope.representation.selected)
                    .toEqual(testViews[1]);
            });
        });
    }
 );
--- a/platform/commonUI/browse/test/InspectorPaneControllerSpec.js
+++ b/platform/commonUI/browse/test/InspectorPaneControllerSpec.js
@ -1,103 +0,0 @@
 /*****************************************************************************
 * Open MCT Web, Copyright (c) 2014-2015, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
 * Open MCT Web 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 Web 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(
    ["../src/InspectorPaneController"],
    function (InspectorPaneController) {
        describe("The InspectorPaneController", function () {
            var mockScope,
                mockAgentService,
                mockDomainObject,
                mockWindow,
                mockStatusCapability,
                mockNavigationService,
                mockNavigationUnlistener,
                mockStatusUnlistener,
                controller,
                mockLocation,
                mockAttrs;
            beforeEach(function () {
                mockScope = jasmine.createSpyObj("$scope", ["$on"]);
                mockWindow = jasmine.createSpyObj("$window", ["open"]);
                mockAgentService = jasmine.createSpyObj(
                    "agentService",
                    ["isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape"]
                );
                mockNavigationUnlistener = jasmine.createSpy("navigationUnlistener");
                mockNavigationService = jasmine.createSpyObj(
                    "navigationService",
                    ["getNavigation", "addListener"]
                );
                mockNavigationService.addListener.and.returnValue(mockNavigationUnlistener);
                mockStatusUnlistener = jasmine.createSpy("statusUnlistener");
                mockStatusCapability = jasmine.createSpyObj(
                    "statusCapability",
                    ["listen"]
                );
                mockStatusCapability.listen.and.returnValue(mockStatusUnlistener);
                mockDomainObject = jasmine.createSpyObj(
                    'domainObject',
                    [
                        'getId',
                        'getModel',
                        'getCapability',
                        'hasCapability'
                    ]
                );
                mockDomainObject.getId.and.returnValue("domainObject");
                mockDomainObject.getModel.and.returnValue({});
                mockDomainObject.hasCapability.and.returnValue(true);
                mockDomainObject.getCapability.and.returnValue(mockStatusCapability);
                mockLocation = jasmine.createSpyObj('location', ['search']);
                mockLocation.search.and.returnValue({});
                mockAttrs = {};
                controller = new InspectorPaneController(mockScope, mockAgentService, mockWindow, mockNavigationService, mockLocation, mockAttrs);
            });
            it("listens for changes to navigation and attaches a status" +
                " listener", function () {
                expect(mockNavigationService.addListener).toHaveBeenCalledWith(jasmine.any(Function));
                mockNavigationService.addListener.calls.mostRecent().args[0](mockDomainObject);
                expect(mockStatusCapability.listen).toHaveBeenCalledWith(jasmine.any(Function));
            });
            it("if hidden, shows the inspector when domain object switches to" +
                " edit mode", function () {
                controller.toggle();
                // test pre-condition that inspector is hidden
                expect(controller.visible()).toBe(false);
                mockNavigationService.addListener.calls.mostRecent().args[0](mockDomainObject);
                mockStatusCapability.listen.calls.mostRecent().args[0](["editing"]);
                expect(controller.visible()).toBe(true);
            });
        });
    }
 );
--- a/platform/commonUI/browse/test/MenuArrowControllerSpec.js
+++ b/platform/commonUI/browse/test/MenuArrowControllerSpec.js
@ -1,79 +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.
 *****************************************************************************/
 /**
 * MenuArrowControllerSpec. Created by shale on 07/02/2015.
 */
 define(
    ["../src/MenuArrowController"],
    function (MenuArrowController) {
        describe("The menu arrow controller ", function () {
            var mockScope,
                mockDomainObject,
                mockEvent,
                mockContextMenuAction,
                mockActionContext,
                controller;
            beforeEach(function () {
                mockScope = jasmine.createSpyObj(
                    "$scope",
                    [""]
                );
                mockDomainObject = jasmine.createSpyObj(
                    "domainObject",
                    ["getCapability"]
                );
                mockEvent = jasmine.createSpyObj(
                    "event",
                    ["preventDefault"]
                );
                mockContextMenuAction = jasmine.createSpyObj(
                    "action",
                    ["perform", "getActions"]
                );
                mockActionContext = jasmine.createSpyObj(
                    "actionContext",
                    [""]
                );
                mockActionContext.domainObject = mockDomainObject;
                mockActionContext.event = mockEvent;
                mockScope.domainObject = mockDomainObject;
                mockDomainObject.getCapability.and.returnValue(mockContextMenuAction);
                mockContextMenuAction.perform.and.returnValue(jasmine.any(Function));
                controller = new MenuArrowController(mockScope);
            });
            it("calls the context menu action when clicked", function () {
                // Simulate a click on the menu arrow
                controller.showMenu(mockEvent);
                // Expect the menu action to be performed
                expect(mockDomainObject.getCapability).toHaveBeenCalledWith('action');
                expect(mockContextMenuAction.perform).toHaveBeenCalled();
            });
        });
    }
 );
--- a/platform/commonUI/browse/test/ObjectHeaderControllerSpec.js
+++ b/platform/commonUI/browse/test/ObjectHeaderControllerSpec.js
@ -1,137 +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(
    ["../src/ObjectHeaderController"],
    function (ObjectHeaderController) {
        describe("The object header controller", function () {
            var mockScope,
                mockDomainObject,
                mockCapabilities,
                mockMutationCapability,
                mockTypeCapability,
                mockEvent,
                mockCurrentTarget,
                model,
                controller;
            beforeEach(function () {
                mockMutationCapability = jasmine.createSpyObj("mutation", ["mutate"]);
                mockTypeCapability = jasmine.createSpyObj("type", ["typeDef", "hasFeature"]);
                mockTypeCapability.typeDef = { name: ""};
                mockTypeCapability.hasFeature.and.callFake(function (feature) {
                    return feature === 'creation';
                });
                mockCapabilities = {
                    mutation: mockMutationCapability,
                    type: mockTypeCapability
                };
                model = {
                    name: "Test name"
                };
                mockDomainObject = jasmine.createSpyObj("domainObject", ["getCapability", "getModel"]);
                mockDomainObject.getModel.and.returnValue(model);
                mockDomainObject.getCapability.and.callFake(function (key) {
                    return mockCapabilities[key];
                });
                mockScope = {
                    domainObject: mockDomainObject
                };
                mockCurrentTarget = jasmine.createSpyObj("currentTarget", ["blur", "textContent"]);
                mockCurrentTarget.blur.and.returnValue(mockCurrentTarget);
                mockEvent = {
                    which: {},
                    type: {},
                    currentTarget: mockCurrentTarget
                };
                controller = new ObjectHeaderController(mockScope);
            });
            it("updates the model with new name on blur", function () {
                mockEvent.type = "blur";
                mockCurrentTarget.textContent = "New name";
                controller.updateName(mockEvent);
                expect(mockMutationCapability.mutate).toHaveBeenCalled();
            });
            it("updates the model with a default for blank names", function () {
                mockEvent.type = "blur";
                mockCurrentTarget.textContent = "";
                controller.updateName(mockEvent);
                expect(mockCurrentTarget.textContent.length).not.toEqual(0);
                expect(mockMutationCapability.mutate).toHaveBeenCalled();
            });
            it("does not update the model if the same name", function () {
                mockEvent.type = "blur";
                mockCurrentTarget.textContent = mockDomainObject.getModel().name;
                controller.updateName(mockEvent);
                expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
            });
            it("updates the model on enter keypress event only", function () {
                mockCurrentTarget.textContent = "New name";
                controller.updateName(mockEvent);
                expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
                mockEvent.which = 13;
                controller.updateName(mockEvent);
                expect(mockMutationCapability.mutate).toHaveBeenCalledWith(jasmine.any(Function));
                mockMutationCapability.mutate.calls.mostRecent().args[0](model);
                expect(mockDomainObject.getModel().name).toBe("New name");
            });
            it("blurs the field on enter key press", function () {
                mockCurrentTarget.textContent = "New name";
                mockEvent.which = 13;
                controller.updateName(mockEvent);
                expect(mockEvent.currentTarget.blur).toHaveBeenCalled();
            });
            it("allows editting name when object is creatable", function () {
                expect(controller.allowEdit()).toBe(true);
            });
            it("disallows editting name when object is non-creatable", function () {
                mockTypeCapability.hasFeature.and.returnValue(false);
                expect(controller.allowEdit()).toBe(false);
            });
        });
    }
 );
--- a/platform/commonUI/browse/test/PaneControllerSpec.js
+++ b/platform/commonUI/browse/test/PaneControllerSpec.js
@ -1,106 +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(
    ["../src/PaneController"],
    function (PaneController) {
        describe("The PaneController", function () {
            var mockScope,
                mockAgentService,
                mockWindow,
                controller,
                mockLocation,
                mockAttrs;
            // We want to reinstantiate for each test case
            // because device state can influence constructor-time behavior
            function instantiateController() {
                return new PaneController(
                    mockScope,
                    mockAgentService,
                    mockWindow,
                    mockLocation,
                    mockAttrs
                );
            }
            beforeEach(function () {
                mockScope = jasmine.createSpyObj("$scope", ["$on"]);
                mockAgentService = jasmine.createSpyObj(
                    "agentService",
                    ["isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape"]
                );
                mockWindow = jasmine.createSpyObj("$window", ["open"]);
                mockLocation = jasmine.createSpyObj('location', ['search']);
                mockLocation.search.and.returnValue({});
                mockAttrs = {};
            });
            it("is initially visible", function () {
                expect(instantiateController().visible()).toBeTruthy();
            });
            it("allows visibility to be toggled", function () {
                controller = instantiateController();
                controller.toggle();
                expect(controller.visible()).toBeFalsy();
                controller.toggle();
                expect(controller.visible()).toBeTruthy();
            });
            it("collapses on navigation changes on portrait-oriented phones", function () {
                mockAgentService.isMobile.and.returnValue(true);
                mockAgentService.isPhone.and.returnValue(true);
                mockAgentService.isPortrait.and.returnValue(true);
                controller = instantiateController();
                expect(controller.visible()).toBeTruthy();
                // Simulate a change from the tree by invoking controller's
                controller.callback();
                // Tree should have collapsed
                expect(controller.visible()).toBeFalsy();
            });
            describe("specifying hideParameter", function () {
                beforeEach(function () {
                    mockAttrs = {hideParameter: 'hideTree'};
                });
                it("sets pane state to false when in location.search", function () {
                    mockLocation.search.and.returnValue({'hideTree': true});
                    expect(instantiateController().visible()).toBe(false);
                    expect(mockLocation.search).toHaveBeenCalledWith('hideTree', undefined);
                });
                it("sets state to true when not found in location.search", function () {
                    mockLocation.search.and.returnValue({});
                    expect(instantiateController().visible()).toBe(true);
                    expect(mockLocation.search).not.toHaveBeenCalledWith('hideTree', undefined);
                });
            });
        });
    }
 );
--- a/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js
+++ b/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js
@ -1,59 +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.
 *****************************************************************************/
 /**
 * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
 */
 define(
    ["../../src/windowing/FullscreenAction", "screenfull"],
    function (FullscreenAction, screenfull) {
        describe("The fullscreen action", function () {
            var action,
                oldToggle;
            beforeEach(function () {
                // Screenfull is not shimmed or injected, so
                // we need to spy on it in the global scope.
                oldToggle = screenfull.toggle;
                screenfull.toggle = jasmine.createSpy("toggle");
                action = new FullscreenAction({});
            });
            afterEach(function () {
                screenfull.toggle = oldToggle;
            });
            it("toggles fullscreen mode when performed", function () {
                action.perform();
                expect(screenfull.toggle).toHaveBeenCalled();
            });
            it("provides displayable metadata", function () {
                expect(action.getMetadata().cssClass).toBeDefined();
            });
        });
    }
 );
--- a/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js
+++ b/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js
@ -1,78 +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.
 *****************************************************************************/
 /**
 * WindowTitlerSpec. Created by vwoeltje on 11/6/14.
 */
 define(
    ["../../src/windowing/WindowTitler"],
    function (WindowTitler) {
        describe("The window titler", function () {
            var mockNavigationService,
                mockRootScope,
                mockDocument,
                mockDomainObject,
                titler; // eslint-disable-line
            beforeEach(function () {
                mockNavigationService = jasmine.createSpyObj(
                    'navigationService',
                    ['getNavigation']
                );
                mockRootScope = jasmine.createSpyObj(
                    '$rootScope',
                    ['$watch']
                );
                mockDomainObject = jasmine.createSpyObj(
                    'domainObject',
                    ['getModel']
                );
                mockDocument = [{}];
                mockDomainObject.getModel.and.returnValue({ name: 'Test name' });
                mockNavigationService.getNavigation.and.returnValue(mockDomainObject);
                titler = new WindowTitler(
                    mockNavigationService,
                    mockRootScope,
                    mockDocument
                );
            });
            it("listens for changes to the name of the navigated object", function () {
                expect(mockRootScope.$watch).toHaveBeenCalledWith(
                    jasmine.any(Function),
                    jasmine.any(Function)
                );
                expect(mockRootScope.$watch.calls.mostRecent().args[0]())
                    .toEqual('Test name');
            });
            it("sets the title to the name of the navigated object", function () {
                mockRootScope.$watch.calls.mostRecent().args[1]("Some name");
                expect(mockDocument[0].title).toEqual("Some name");
            });
        });
    }
 );
--- a/platform/commonUI/dialog/bundle.js
+++ b/platform/commonUI/dialog/bundle.js
@ -28,9 +28,9 @@ define([
    "./res/templates/dialog.html",
    "./res/templates/overlay-blocking-message.html",
    "./res/templates/message.html",
    "./res/templates/notification-message.html",
    "./res/templates/overlay-message-list.html",
-    "./res/templates/overlay.html",
+    "./res/templates/overlay.html"
    'legacyRegistry'
 ], function (
    DialogService,
    OverlayService,
@ -39,12 +39,14 @@ define([
    dialogTemplate,
    overlayBlockingMessageTemplate,
    messageTemplate,
    notificationMessageTemplate,
    overlayMessageListTemplate,
-    overlayTemplate,
+    overlayTemplate
    legacyRegistry
 ) {
-    legacyRegistry.register("platform/commonUI/dialog", {
+    return {
        name:"platform/commonUI/dialog",
        definition: {
            "extensions": {
                "services": [
                    {
@ -63,7 +65,8 @@ define([
                        "depends": [
                            "$document",
                            "$compile",
-                        "$rootScope"
+                            "$rootScope",
                            "$timeout"
                        ]
                    }
                ],
@ -88,6 +91,10 @@ define([
                        "key": "message",
                        "template": messageTemplate
                    },
                    {
                        "key": "notification-message",
                        "template": notificationMessageTemplate
                    },
                    {
                        "key": "overlay-message-list",
                        "template": overlayMessageListTemplate
@ -100,5 +107,6 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/platform/commonUI/dialog/res/templates/dialog.html
+++ b/platform/commonUI/dialog/res/templates/dialog.html
@ -19,24 +19,24 @@
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
 -->
-<div class="abs top-bar">
+<div class="c-overlay__top-bar">
-    <div class="dialog-title">{{ngModel.title}}</div>
+    <div class="c-overlay__dialog-title">{{ngModel.title}}</div>
-    <div class="hint">All fields marked <span class="req icon-asterisk"></span> are required.</div>
+    <div class="c-overlay__dialog-hint hint">All fields marked <span class="req icon-asterisk"></span> are required.</div>
 </div>
-<div class='abs editor'>
+<div class='c-overlay__contents-main'>
    <mct-form ng-model="ngModel.value"
              structure="ngModel.structure"
              class="validates"
              name="createForm">
    </mct-form>
 </div>
-<div class="abs bottom-bar">
+<div class="c-overlay__button-bar">
-    <a class='s-button major'
+    <a class='c-button c-button--major'
       ng-class="{ disabled: !createForm.$valid }"
       ng-click="ngModel.confirm()">
        OK
    </a>
-    <a class='s-button'
+    <a class='c-button  '
       ng-click="ngModel.cancel()">
        Cancel
    </a>
--- a/platform/commonUI/dialog/res/templates/message.html
+++ b/platform/commonUI/dialog/res/templates/message.html
@ -1,15 +1,32 @@
-<div class="l-message"
+<div class="c-message"
     ng-class="'message-severity-' + ngModel.severity">
    <div class="w-message-contents">
-        <div class="top-bar">
+        <div class="c-message__top-bar">
-            <div class="title">{{ngModel.message}}</div>
+            <div class="c-message__title">{{ngModel.title}}</div>
        </div>
        <div class="c-message__hint" ng-hide="ngModel.hint === undefined">
            {{ngModel.hint}}
            <span ng-if="ngModel.timestamp !== undefined">[{{ngModel.timestamp}}]</span>
        </div>
        <div class="message-body">
            <div class="message-action">
                {{ngModel.actionText}}
            </div>
            <mct-include key="'progress-bar'"
                         ng-model="ngModel"
-                         ng-show="ngModel.progressPerc !== undefined"></mct-include>
+                         ng-show="ngModel.progress !== undefined || ngModel.unknownProgress"></mct-include>
        </div>
-        <div class="bottom-bar">
+        <div class="c-overlay__button-bar">
            <button ng-repeat="dialogOption in ngModel.options"
               class="c-button"
               ng-click="dialogOption.callback()">
                {{dialogOption.label}}
            </button>
            <button class="c-button c-button--major"
               ng-if="ngModel.primaryOption"
               ng-click="ngModel.primaryOption.callback()">
                {{ngModel.primaryOption.label}}
            </button>
        </div>
    </div>
 </div>
--- a/platform/commonUI/dialog/res/templates/notification-message.html
+++ b/platform/commonUI/dialog/res/templates/notification-message.html
@ -0,0 +1,25 @@
 <div class="c-message"
     ng-class="'message-severity-' + ngModel.severity">
    <div class="w-message-contents">
        <div class="c-message__top-bar">
            <div class="c-message__title">{{ngModel.message}}</div>
        </div>
        <div class="message-body">
            <mct-include key="'progress-bar'"
                         ng-model="ngModel"
                         ng-show="ngModel.progressPerc !== undefined"></mct-include>
        </div>
    </div>
    <div class="c-overlay__button-bar">
        <button ng-repeat="dialogOption in ngModel.options"
                class="c-button"
                ng-click="dialogOption.callback()">
            {{dialogOption.label}}
        </button>
        <button class="c-button c-button--major"
                ng-if="ngModel.primaryOption"
                ng-click="ngModel.primaryOption.callback()">
            {{ngModel.primaryOption.label}}
        </button>
    </div>
 </div>
--- a/platform/commonUI/dialog/res/templates/overlay-message-list.html
+++ b/platform/commonUI/dialog/res/templates/overlay-message-list.html
@ -1,22 +1,23 @@
 <mct-container key="overlay">
-    <div class="t-message-list">
+    <div class="t-message-list c-overlay__contents">
-        <div class="top-bar">
+        <div class="c-overlay__top-bar">
-            <div class="dialog-title">{{ngModel.dialog.title}}</div>
+            <div class="c-overlay__dialog-title">{{ngModel.dialog.title}}</div>
-            <div class="hint">Displaying {{ngModel.dialog.messages.length}} message<span ng-show="ngModel.dialog.messages.length > 1 ||
+            <div class="c-overlay__dialog-hint">Displaying {{ngModel.dialog.messages.length}} message<span
                    ng-show="ngModel.dialog.messages.length > 1 ||
                            ngModel.dialog.messages.length == 0">s</span>
            </div>
        </div>
-        <div class="w-messages">
+        <div class="w-messages c-overlay__messages">
            <mct-include
                ng-repeat="msg in ngModel.dialog.messages | orderBy: '-'"
-                key="'message'" ng-model="msg.model"></mct-include>
+                key="'notification-message'" ng-model="msg.model"></mct-include>
        </div>
-        <div class="bottom-bar">
+        <div class="c-overlay__bottom-bar">
-            <a ng-repeat="dialogAction in ngModel.dialog.actions"
+            <button ng-repeat="dialogAction in ngModel.dialog.actions"
-               class="s-button major"
+               class="c-button c-button--major"
               ng-click="dialogAction.action()">
                {{dialogAction.label}}
-            </a>
+            </button>
        </div>
    </div>
 </mct-container>
--- a/platform/commonUI/dialog/res/templates/overlay-options.html
+++ b/platform/commonUI/dialog/res/templates/overlay-options.html
@ -19,18 +19,18 @@
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
 -->
-<mct-container key="overlay">
+<mct-container key="c-overlay__contents">
-    <div class="abs top-bar">
+    <div class=c-overlay__top-bar">
-        <div class="dialog-title">{{ngModel.dialog.title}}</div>
+        <div class="c-overlay__dialog-title">{{ngModel.dialog.title}}</div>
-        <div class="hint">{{ngModel.dialog.hint}}</div>
+        <div class="c-overlay__dialog-hint hint">{{ngModel.dialog.hint}}</div>
    </div>
-    <div class='abs editor'>
+    <div class='c-overlay__contents-main'>
        <mct-include key="ngModel.dialog.template"
                     parameters="ngModel.dialog.parameters"
                     ng-model="ngModel.dialog.model">
        </mct-include>
    </div>
-    <div class="abs bottom-bar">
+    <div class="c-overlay__button-bar">
        <a ng-repeat="option in ngModel.dialog.options"
           href=''
           class="s-button lg"
--- a/platform/commonUI/dialog/res/templates/overlay.html
+++ b/platform/commonUI/dialog/res/templates/overlay.html
@ -19,12 +19,12 @@
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
 -->
-<div class="abs overlay l-dialog" ng-class="{'delayEntry100ms' : ngModel.delay}">
+<div class="c-overlay l-overlay-small" ng-class="{'delayEntry100ms' : ngModel.delay}">
-    <div class="abs blocker"></div>
+    <div class="c-overlay__blocker"></div>
-    <div class="abs outer-holder">
+    <div class="c-overlay__outer">
-        <a ng-click="ngModel.cancel()"
+        <button ng-click="ngModel.cancel()"
           ng-if="ngModel.cancel"
-           class="close icon-x-in-circle"></a>
+           class="c-click-icon c-overlay__close-button icon-x-in-circle"></button>
-        <div class="abs inner-holder contents" ng-transclude></div>
+        <div class="c-overlay__contents" ng-transclude></div>
    </div>
 </div>
--- a/platform/commonUI/dialog/src/OverlayService.js
+++ b/platform/commonUI/dialog/src/OverlayService.js
@ -44,8 +44,9 @@ define(
         * @memberof platform/commonUI/dialog
         * @constructor
         */
-        function OverlayService($document, $compile, $rootScope) {
+        function OverlayService($document, $compile, $rootScope, $timeout) {
            this.$compile = $compile;
            this.$timeout = $timeout;
            // Don't include $document and $rootScope directly;
            // avoids https://docs.angularjs.org/error/ng/cpws
@ -93,9 +94,14 @@ define(
            scope.key = key;
            scope.typeClass = typeClass || 't-dialog';
            this.$timeout(() => {
                // Create the overlay element and add it to the document's body
                element = this.$compile(TEMPLATE)(scope);
-            this.findBody().prepend(element);
+
                // Append so that most recent dialog is last in DOM. This means the most recent dialog will be on top when
                // multiple overlays with the same z-index are active.
                this.findBody().append(element);
            });
            return {
                dismiss: dismiss
--- a/platform/commonUI/dialog/test/OverlayServiceSpec.js
+++ b/platform/commonUI/dialog/test/OverlayServiceSpec.js
@ -35,16 +35,20 @@ define(
                mockTemplate,
                mockElement,
                mockScope,
                mockTimeout,
                overlayService;
            beforeEach(function () {
                mockDocument = jasmine.createSpyObj("$document", ["find"]);
                mockCompile = jasmine.createSpy("$compile");
                mockRootScope = jasmine.createSpyObj("$rootScope", ["$new"]);
-                mockBody = jasmine.createSpyObj("body", ["prepend"]);
+                mockBody = jasmine.createSpyObj("body", ["append"]);
                mockTemplate = jasmine.createSpy("template");
                mockElement = jasmine.createSpyObj("element", ["remove"]);
                mockScope = jasmine.createSpyObj("scope", ["$destroy"]);
                mockTimeout = function (callback) {
                    callback();
                }
                mockDocument.find.and.returnValue(mockBody);
                mockCompile.and.returnValue(mockTemplate);
@ -54,7 +58,8 @@ define(
                overlayService = new OverlayService(
                    mockDocument,
                    mockCompile,
-                    mockRootScope
+                    mockRootScope,
                    mockTimeout
                );
            });
@ -67,7 +72,7 @@ define(
            it("adds the templated element to the body", function () {
                overlayService.createOverlay("test", {});
-                expect(mockBody.prepend).toHaveBeenCalledWith(mockElement);
+                expect(mockBody.append).toHaveBeenCalledWith(mockElement);
            });
            it("places the provided model/key in its template's scope", function () {
--- a/platform/commonUI/edit/bundle.js
+++ b/platform/commonUI/edit/bundle.js
@ -27,16 +27,11 @@ define([
    "./src/actions/EditAndComposeAction",
    "./src/actions/EditAction",
    "./src/actions/PropertiesAction",
    "./src/actions/RemoveAction",
    "./src/actions/SaveAction",
    "./src/actions/SaveAndStopEditingAction",
    "./src/actions/SaveAsAction",
    "./src/actions/CancelAction",
    "./src/policies/EditActionPolicy",
    "./src/policies/EditPersistableObjectsPolicy",
    "./src/policies/EditableLinkPolicy",
    "./src/policies/EditableMovePolicy",
    "./src/policies/EditContextualActionPolicy",
    "./src/representers/EditRepresenter",
    "./src/capabilities/EditorCapability",
    "./src/capabilities/TransactionCapabilityDecorator",
@ -53,8 +48,7 @@ define([
    "./res/templates/library.html",
    "./res/templates/edit-object.html",
    "./res/templates/edit-action-buttons.html",
-    "./res/templates/topbar-edit.html",
+    "./res/templates/topbar-edit.html"
    'legacyRegistry'
 ], function (
    EditActionController,
    EditPanesController,
@ -62,16 +56,11 @@ define([
    EditAndComposeAction,
    EditAction,
    PropertiesAction,
    RemoveAction,
    SaveAction,
    SaveAndStopEditingAction,
    SaveAsAction,
    CancelAction,
    EditActionPolicy,
    EditPersistableObjectsPolicy,
    EditableLinkPolicy,
    EditableMovePolicy,
    EditContextualActionPolicy,
    EditRepresenter,
    EditorCapability,
    TransactionCapabilityDecorator,
@ -88,11 +77,11 @@ define([
    libraryTemplate,
    editObjectTemplate,
    editActionButtonsTemplate,
-    topbarEditTemplate,
+    topbarEditTemplate
    legacyRegistry
 ) {
-
+    return {
-    legacyRegistry.register("platform/commonUI/edit", {
+        name: "platform/commonUI/edit",
        definition: {
            "extensions": {
                "controllers": [
                    {
@ -166,18 +155,6 @@ define([
                            "dialogService"
                        ]
                    },
                {
                    "key": "remove",
                    "category": "contextual",
                    "implementation": RemoveAction,
                    "cssClass": "icon-trash",
                    "name": "Remove",
                    "description": "Remove this object from its containing object.",
                    "depends": [
                        "dialogService",
                        "navigationService"
                    ]
                },
                    {
                        "key": "save-and-stop-editing",
                        "category": "save",
@ -231,28 +208,11 @@ define([
                    }
                ],
                "policies": [
                {
                    "category": "action",
                    "implementation": EditActionPolicy
                },
                    {
                        "category": "action",
                        "implementation": EditPersistableObjectsPolicy,
                        "depends": ["openmct"]
                    },
                {
                    "category": "action",
                    "implementation": EditContextualActionPolicy,
                    "depends": ["navigationService", "editModeBlacklist", "nonEditContextBlacklist"]
                },
                {
                    "category": "action",
                    "implementation": EditableMovePolicy
                },
                {
                    "category": "action",
                    "implementation": EditableLinkPolicy
                },
                    {
                        "implementation": CreationPolicy,
                        "category": "creation"
@ -349,16 +309,6 @@ define([
                        ]
                    }
                ],
            "constants": [
                {
                    "key": "editModeBlacklist",
                    "value": ["copy", "follow", "link", "locate"]
                },
                {
                    "key": "nonEditContextBlacklist",
                    "value": ["copy", "follow", "properties", "move", "link", "remove", "locate"]
                }
            ],
                "capabilities": [
                    {
                        "key": "editor",
@ -398,5 +348,6 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/platform/commonUI/edit/src/actions/PropertiesDialog.js
+++ b/platform/commonUI/edit/src/actions/PropertiesDialog.js
@ -49,7 +49,7 @@ define(
                    name: "Properties",
                    rows: this.properties.map(function (property, index) {
                        // Property definition is same as form row definition
-                        var row = Object.create(property.getDefinition());
+                        var row = JSON.parse(JSON.stringify(property.getDefinition()));
                        row.key = index;
                        return row;
                    }).filter(function (row) {
--- a/platform/commonUI/edit/src/actions/RemoveAction.js
+++ b/platform/commonUI/edit/src/actions/RemoveAction.js
@ -1,141 +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.
 *****************************************************************************/
 /**
 * Module defining RemoveAction. Created by vwoeltje on 11/17/14.
 */
 define([
    './RemoveDialog'
 ], function (
    RemoveDialog
 ) {
    /**
     * Construct an action which will remove the provided object manifestation.
     * The object will be removed from its parent's composition; the parent
     * is looked up via the "context" capability (so this will be the
     * immediate ancestor by which this specific object was reached.)
     *
     * @param {DialogService} dialogService a service which will show the dialog
     * @param {NavigationService} navigationService a service that maintains the current navigation state
     * @param {ActionContext} context the context in which this action is performed
     * @memberof platform/commonUI/edit
     * @constructor
     * @implements {Action}
     */
    function RemoveAction(dialogService, navigationService, context) {
        this.domainObject = (context || {}).domainObject;
        this.dialogService = dialogService;
        this.navigationService = navigationService;
    }
    /**
     * Perform this action.
     */
    RemoveAction.prototype.perform = function () {
        var dialog,
            dialogService = this.dialogService,
            domainObject = this.domainObject,
            navigationService = this.navigationService;
        /*
         * Check whether an object ID matches the ID of the object being
         * removed (used to filter a parent's composition to handle the
         * removal.)
         */
        function isNotObject(otherObjectId) {
            return otherObjectId !== domainObject.getId();
        }
        /*
         * Mutate a parent object such that it no longer contains the object
         * which is being removed.
         */
        function doMutate(model) {
            model.composition = model.composition.filter(isNotObject);
        }
        /*
         * Checks current object and ascendants of current
         * object with object being removed, if the current
         * object or any in the current object's path is being removed,
         * navigate back to parent of removed object.
         */
        function checkObjectNavigation(object, parentObject) {
            // Traverse object starts at current location
            var traverseObject = (navigationService).getNavigation(),
                context;
            // Stop when object is not defined (above ROOT)
            while (traverseObject) {
                // If object currently traversed to is object being removed
                // navigate to parent of current object and then exit loop
                if (traverseObject.getId() === object.getId()) {
                    navigationService.setNavigation(parentObject);
                    return;
                }
                // Traverses to parent of current object, moving
                // up the ascendant path
                context = traverseObject.getCapability('context');
                traverseObject = context && context.getParent();
            }
        }
        /*
         * Remove the object from its parent, as identified by its context
         * capability. Based on object's location and selected object's location
         * user may be navigated to existing parent object
         */
        function removeFromContext(object) {
            var contextCapability = object.getCapability('context'),
                parent = contextCapability.getParent();
            // If currently within path of removed object(s),
            // navigates to existing object up tree
            checkObjectNavigation(object, parent);
            return parent.useCapability('mutation', doMutate);
        }
        /*
         * Pass in the function to remove the domain object so it can be
         * associated with an 'OK' button press
         */
        dialog = new RemoveDialog(dialogService, domainObject, removeFromContext);
        dialog.show();
    };
    // Object needs to have a parent for Remove to be applicable
    RemoveAction.appliesTo = function (context) {
        var object = (context || {}).domainObject,
            contextCapability = object && object.getCapability("context"),
            parent = contextCapability && contextCapability.getParent(),
            parentType = parent && parent.getCapability('type'),
            parentCreatable = parentType && parentType.hasFeature('creation');
        // Only creatable types should be modifiable
        return parent !== undefined &&
                Array.isArray(parent.getModel().composition) &&
                parentCreatable;
    };
    return RemoveAction;
 });
--- a/platform/commonUI/edit/src/actions/RemoveDialog.js
+++ b/platform/commonUI/edit/src/actions/RemoveDialog.js
@ -1,77 +0,0 @@
 /*****************************************************************************
 * Open MCT, Copyright (c) 2014-2017, 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([], function () {
    /**
     * @callback removeCallback
     * @param {DomainObject} domainObject the domain object to be removed
     */
    /**
     * Construct a new Remove dialog.
     *
     * @param {DialogService} dialogService the service that shows the dialog
     * @param {DomainObject} domainObject the domain object to be removed
     * @param {removeCallback} removeCallback callback that handles removal of the domain object
     * @memberof platform/commonUI/edit
     * @constructor
     */
    function RemoveDialog(dialogService, domainObject, removeCallback) {
        this.dialogService = dialogService;
        this.domainObject = domainObject;
        this.removeCallback = removeCallback;
    }
    /**
     * Display a dialog to confirm the removal of a domain object.
     */
    RemoveDialog.prototype.show = function () {
        var dialog,
            domainObject = this.domainObject,
            removeCallback = this.removeCallback,
            model = {
                title: 'Remove ' + domainObject.getModel().name,
                actionText: 'Warning! This action will permanently remove this object. Are you sure you want to continue?',
                severity: 'alert',
                primaryOption: {
                    label: 'OK',
                    callback: function () {
                        removeCallback(domainObject);
                        dialog.dismiss();
                    }
                },
                options: [
                    {
                        label: 'Cancel',
                        callback: function () {
                            dialog.dismiss();
                        }
                    }
                ]
            };
        setTimeout(() => this.removeCallback(domainObject));
    };
    return RemoveDialog;
 });
--- a/platform/commonUI/edit/src/actions/SaveAsAction.js
+++ b/platform/commonUI/edit/src/actions/SaveAsAction.js
@ -92,16 +92,7 @@ function (
         * @memberof platform/commonUI/edit.SaveAction#
         */
    SaveAsAction.prototype.perform = function () {
-        // Discard the current root view (which will be the editing
+        return this.save();
        // UI, which will have been pushed atop the Browse UI.)
        function returnToBrowse(object) {
            if (object) {
                object.getCapability("action").perform("navigate");
            }
            return object;
        }
        return this.save().then(returnToBrowse);
    };
    /**
@ -169,15 +160,22 @@ function (
        }
        function saveAfterClone(clonedObject) {
-            return domainObject.getCapability("editor").save()
+            return this.openmct.editor.save().then(() => {
-                .then(resolveWith(clonedObject));
+                // Force mutation for search indexing
                return clonedObject;
            })
        }
        function finishEditing(clonedObject) {
-            return domainObject.getCapability("editor").finish()
+            return fetchObject(clonedObject.getId())
-                .then(function () {
+        }
-                    return fetchObject(clonedObject.getId());
+
        function indexForSearch(savedObject) {
            savedObject.useCapability('mutation', (model) => {
                return model;
            });
            return savedObject;
        }
        function onSuccess(object) {
@ -190,7 +188,7 @@ function (
            if (reason !== "user canceled") {
                self.notificationService.error("Save Failed");
            }
-            return false;
+            throw reason;
        }
        return getParent(domainObject)
@ -201,6 +199,7 @@ function (
            .then(undirtyOriginals)
            .then(saveAfterClone)
            .then(finishEditing)
            .then(indexForSearch)
            .then(hideBlockingDialog)
            .then(onSuccess)
            .catch(onFailure);
--- a/platform/commonUI/edit/src/actions/SaveInProgressDialog.js
+++ b/platform/commonUI/edit/src/actions/SaveInProgressDialog.js
@ -6,7 +6,7 @@ define([], function () {
    SaveInProgressDialog.prototype.show = function () {
        this.dialog = this.dialogService.showBlockingMessage({
-            title: "Saving...",
+            title: "Saving",
            hint: "Do not navigate away from this page or close this browser tab while this message is displayed.",
            unknownProgress: true,
            severity: "info",
--- a/platform/commonUI/edit/src/capabilities/EditorCapability.js
+++ b/platform/commonUI/edit/src/capabilities/EditorCapability.js
@ -64,7 +64,6 @@ define(
         * @returns boolean
         */
        EditorCapability.prototype.inEditContext = function () {
            console.warn('DEPRECATION WARNING: isEditing checks must be done via openmct.editor.');
            return this.openmct.editor.isEditing();
        };
@ -74,7 +73,6 @@ define(
         * @returns {*}
         */
        EditorCapability.prototype.isEditContextRoot = function () {
            console.warn('DEPRECATION WARNING: isEditing checks must be done via openmct.editor.');
            return this.openmct.editor.isEditing();
        };
--- a/platform/commonUI/edit/src/creation/CreateAction.js
+++ b/platform/commonUI/edit/src/creation/CreateAction.js
@ -65,24 +65,40 @@ define(
        CreateAction.prototype.perform = function () {
            var newModel = this.type.getInitialModel(),
                openmct = this.openmct,
-                newObject,
+                newObject;
                editAction;
            function onSave() {
                openmct.editor.save();
            }
            function onCancel() {
                openmct.editor.cancel();
            }
            function isFirstViewEditable(domainObject) {
                let firstView = openmct.objectViews.get(domainObject)[0];
                return firstView && firstView.canEdit && firstView.canEdit(domainObject);
            }
            function navigateAndEdit(object) {
                let objectPath = object.getCapability('context').getPath(),
                    url = '#/browse/' + objectPath
                        .slice(1)
                        .map(function (o) {
                            return o && openmct.objects.makeKeyString(o.getId());
                        })
                        .join('/');
                window.location.href = url;
                if (isFirstViewEditable(object.useCapability('adapter'))) {
                    openmct.editor.edit();
                }
            }
            newModel.type = this.type.getKey();
            newModel.location = this.parent.getId();
            newObject = this.parent.useCapability('instantiation', newModel);
            openmct.editor.edit();
-            editAction = newObject.getCapability("action").getActions("edit")[0];
+            newObject.getCapability("action").perform("save-as").then(navigateAndEdit, onCancel);
            newObject.getCapability("action").perform("save-as").then(onSave, onCancel);
            // TODO: support editing object without saving object first.
            // Which means we have to toggle createwizard afterwards.  For now,
            // We will disable this.
--- a/platform/commonUI/edit/src/creation/CreateWizard.js
+++ b/platform/commonUI/edit/src/creation/CreateWizard.js
@ -66,7 +66,7 @@ define(
                name: "Properties",
                rows: this.properties.map(function (property, index) {
                    // Property definition is same as form row definition
-                    var row = Object.create(property.getDefinition());
+                    var row = JSON.parse(JSON.stringify(property.getDefinition()));
                    // Use index as the key into the formValue;
                    // this correlates to the indexing provided by
--- a/platform/commonUI/edit/src/policies/EditActionPolicy.js
+++ b/platform/commonUI/edit/src/policies/EditActionPolicy.js
@ -1,111 +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(
    [],
    function () {
        /**
         * Policy controlling when the `edit` and/or `properties` actions
         * can appear as applicable actions of the `view-control` category
         * (shown as buttons in the top-right of browse mode.)
         * @memberof platform/commonUI/edit
         * @constructor
         * @implements {Policy.<Action, ActionContext>}
         */
        function EditActionPolicy(policyService) {
            this.policyService = policyService;
        }
        /**
         * Get a count of views which are not flagged as non-editable.
         * @private
         */
        EditActionPolicy.prototype.countEditableViews = function (context) {
            var domainObject = context.domainObject,
                count = 0,
                type, views;
            if (!domainObject) {
                return count;
            }
            type = domainObject.getCapability('type');
            views = domainObject.useCapability('view');
            // A view is editable unless explicitly flagged as not
            (views || []).forEach(function (view) {
                if (isEditable(view) ||
                    (view.key === 'plot' && type.getKey() === 'telemetry.panel') ||
                    (view.key === 'table' && type.getKey() === 'table') ||
                    (view.key === 'rt-table' && type.getKey() === 'rttable')
                ) {
                    count++;
                }
            });
            function isEditable(view) {
                if (typeof view.editable === Function) {
                    return view.editable(domainObject.useCapability('adapter'));
                } else {
                    return view.editable === true;
                }
            }
            return count;
        };
        /**
         * Checks whether the domain object is currently being edited. If
         * so, the edit action is not applicable.
         * @param context
         * @returns {*|boolean}
         */
        function isEditing(context) {
            var domainObject = (context || {}).domainObject;
            return domainObject &&
                domainObject.hasCapability('editor') &&
                domainObject.getCapability('editor').isEditContextRoot();
        }
        EditActionPolicy.prototype.allow = function (action, context) {
            var key = action.getMetadata().key,
                category = (context || {}).category;
            // Restrict 'edit' to cases where there are editable
            // views (similarly, restrict 'properties' to when
            // the converse is true), and where the domain object is not
            // already being edited.
            if (key === 'edit') {
                return this.countEditableViews(context) > 0 && !isEditing(context);
            } else if (key === 'properties' && category === 'view-control') {
                return this.countEditableViews(context) < 1 && !isEditing(context);
            }
            // Like all policies, allow by default.
            return true;
        };
        return EditActionPolicy;
    }
 );
--- a/platform/commonUI/edit/src/policies/EditContextualActionPolicy.js
+++ b/platform/commonUI/edit/src/policies/EditContextualActionPolicy.js
@ -1,75 +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(
    [],
    function () {
        /**
         * Policy controlling whether the context menu is visible when
         * objects are being edited
         * @param navigationService
         * @param editModeBlacklist A blacklist of actions disallowed from
         * context menu when navigated object is being edited
         * @param nonEditContextBlacklist A blacklist of actions disallowed
         * from context menu of non-editable objects, when navigated object
         * is being edited
         * @constructor
         * @param editModeBlacklist A blacklist of actions disallowed from
         * context menu when navigated object is being edited
         * @param nonEditContextBlacklist A blacklist of actions disallowed
         * from context menu of non-editable objects, when navigated object
         * @implements {Policy.<Action, ActionContext>}
         */
        function EditContextualActionPolicy(navigationService, editModeBlacklist, nonEditContextBlacklist) {
            this.navigationService = navigationService;
            //The list of objects disallowed on target object when in edit mode
            this.editModeBlacklist = editModeBlacklist;
            //The list of objects disallowed on target object that is not in
            // edit mode (ie. the context menu in the tree on the LHS).
            this.nonEditContextBlacklist = nonEditContextBlacklist;
        }
        EditContextualActionPolicy.prototype.allow = function (action, context) {
            var selectedObject = context.domainObject,
                navigatedObject = this.navigationService.getNavigation(),
                actionMetadata = action.getMetadata ? action.getMetadata() : {};
            // FIXME: need to restore support for changing contextual actions
            // based on edit mode.
            // if (navigatedObject.hasCapability("editor") && navigatedObject.getCapability("editor").isEditContextRoot()) {
                // if (selectedObject.hasCapability("editor") && selectedObject.getCapability("editor").inEditContext()) {
                //     return this.editModeBlacklist.indexOf(actionMetadata.key) === -1;
                // } else {
                //     //Target is in the context menu
                //     return this.nonEditContextBlacklist.indexOf(actionMetadata.key) === -1;
                // }
            // } else {
            //     return true;
            // }
            return true;
        };
        return EditContextualActionPolicy;
    }
 );
--- a/platform/commonUI/edit/src/policies/EditableLinkPolicy.js
+++ b/platform/commonUI/edit/src/policies/EditableLinkPolicy.js
@ -1,51 +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([], function () {
    /**
     * Policy suppressing links when the linked-to domain object is in
     * edit mode. Domain objects being edited may not have been persisted,
     * so creating links to these can result in inconsistent state.
     *
     * @memberof platform/commonUI/edit
     * @constructor
     * @implements {Policy.<View, DomainObject>}
     */
    function EditableLinkPolicy() {
    }
    EditableLinkPolicy.prototype.allow = function (action, context) {
        var key = action.getMetadata().key,
            object;
        if (key === 'link') {
            object = context.selectedObject || context.domainObject;
            return !(object.hasCapability("editor") && object.getCapability("editor").inEditContext());
        }
        // Like all policies, allow by default.
        return true;
    };
    return EditableLinkPolicy;
 });
--- a/platform/commonUI/edit/src/policies/EditableMovePolicy.js
+++ b/platform/commonUI/edit/src/policies/EditableMovePolicy.js
@ -1,52 +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([], function () {
    /**
     * Policy suppressing move actions among editable and non-editable
     * domain objects.
     * @memberof platform/commonUI/edit
     * @constructor
     * @implements {Policy.<View, DomainObject>}
     */
    function EditableMovePolicy() {
    }
    EditableMovePolicy.prototype.allow = function (action, context) {
        var domainObject = context.domainObject,
            selectedObject = context.selectedObject,
            key = action.getMetadata().key,
            isDomainObjectEditing = domainObject.hasCapability('editor') &&
                domainObject.getCapability('editor').inEditContext();
        if (key === 'move' && isDomainObjectEditing) {
            return !!selectedObject && selectedObject.hasCapability('editor') &&
                selectedObject.getCapability('editor').inEditContext();
        }
        // Like all policies, allow by default.
        return true;
    };
    return EditableMovePolicy;
 });
--- a/platform/commonUI/edit/src/policies/EditableViewPolicy.js
+++ b/platform/commonUI/edit/src/policies/EditableViewPolicy.js
@ -1,49 +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(
    [],
    function () {
        /**
         * Policy controlling which views should be visible in Edit mode.
         * @memberof platform/commonUI/edit
         * @constructor
         * @implements {Policy.<View, DomainObject>}
         */
        function EditableViewPolicy() {
        }
        EditableViewPolicy.prototype.allow = function (view, domainObject) {
            // If a view is flagged as non-editable, only allow it
            // while we're not in Edit mode.
            if ((view || {}).editable === false) {
                return !(domainObject.hasCapability('editor') && domainObject.getCapability('editor').inEditContext());
            }
            // Like all policies, allow by default.
            return true;
        };
        return EditableViewPolicy;
    }
 );
--- a/platform/commonUI/edit/src/services/TransactionManager.js
+++ b/platform/commonUI/edit/src/services/TransactionManager.js
@ -77,14 +77,19 @@ define([], function () {
                return promiseFn().then(nextFn);
            };
        }
        /**
         * Clear any existing persistence calls for object with given ID. This ensures only the most recent persistence
         * call is executed. This should prevent stale objects being persisted and overwriting fresh ones.
         */
        if (this.isScheduled(id)) {
            this.clearTransactionsFor(id);
        }
        if (!this.isScheduled(id)) {
        this.clearTransactionFns[id] =
            this.transactionService.addToTransaction(
                chain(onCommit, release),
                chain(onCancel, release)
            );
        }
    };
    /**
--- a/platform/commonUI/edit/test/actions/RemoveActionSpec.js
+++ b/platform/commonUI/edit/test/actions/RemoveActionSpec.js
@ -1,255 +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(
    ["../../src/actions/RemoveAction"],
    function (RemoveAction) {
        describe("The Remove action", function () {
            var action,
                actionContext,
                capabilities,
                mockContext,
                mockDialogService,
                mockDomainObject,
                mockMutation,
                mockNavigationService,
                mockParent,
                mockType,
                model;
            beforeEach(function () {
                mockDomainObject = jasmine.createSpyObj(
                    "domainObject",
                    ["getId", "getCapability", "getModel"]
                );
                mockMutation = jasmine.createSpyObj("mutation", ["invoke"]);
                mockType = jasmine.createSpyObj("type", ["hasFeature"]);
                mockType.hasFeature.and.returnValue(true);
                capabilities = {
                    mutation: mockMutation,
                    type: mockType
                };
                model = {
                    composition: ["a", "test", "b"]
                };
                mockParent = {
                    getModel: function () {
                        return model;
                    },
                    getCapability: function (k) {
                        return capabilities[k];
                    },
                    useCapability: function (k, v) {
                        return capabilities[k].invoke(v);
                    }
                };
                mockDialogService = jasmine.createSpyObj(
                    "dialogService",
                    ["showBlockingMessage"]
                );
                mockNavigationService = jasmine.createSpyObj(
                    "navigationService",
                    [
                        "getNavigation",
                        "setNavigation",
                        "addListener",
                        "removeListener"
                    ]
                );
                mockNavigationService.getNavigation.and.returnValue(mockDomainObject);
                mockContext = jasmine.createSpyObj("context", ["getParent"]);
                mockContext.getParent.and.returnValue(mockParent);
                mockDomainObject.getId.and.returnValue("test");
                mockDomainObject.getCapability.and.returnValue(mockContext);
                mockDomainObject.getModel.and.returnValue({name: 'test object'});
                mockContext.getParent.and.returnValue(mockParent);
                mockType.hasFeature.and.returnValue(true);
                actionContext = { domainObject: mockDomainObject };
                action = new RemoveAction(mockDialogService, mockNavigationService, actionContext);
            });
            it("only applies to objects with parents", function () {
                expect(RemoveAction.appliesTo(actionContext)).toBeTruthy();
                mockContext.getParent.and.returnValue(undefined);
                expect(RemoveAction.appliesTo(actionContext)).toBeFalsy();
                // Also verify that creatability was checked
                expect(mockType.hasFeature).toHaveBeenCalledWith('creation');
            });
            it("shows a blocking message dialog", function () {
                mockParent = jasmine.createSpyObj(
                    "parent",
                    ["getModel", "getCapability", "useCapability"]
                );
                action.perform();
                expect(mockDialogService.showBlockingMessage).toHaveBeenCalled();
                // Also check that no mutation happens at this point
                expect(mockParent.useCapability).not.toHaveBeenCalledWith("mutation", jasmine.any(Function));
            });
            describe("after the remove callback is triggered", function () {
                var mockChildContext,
                    mockChildObject,
                    mockDialogHandle,
                    mockGrandchildContext,
                    mockGrandchildObject,
                    mockRootContext,
                    mockRootObject;
                beforeEach(function () {
                    mockChildObject = jasmine.createSpyObj(
                        "domainObject",
                        ["getId", "getCapability"]
                    );
                    mockDialogHandle = jasmine.createSpyObj(
                        "dialogHandle",
                        ["dismiss"]
                    );
                    mockGrandchildObject = jasmine.createSpyObj(
                        "domainObject",
                        ["getId", "getCapability"]
                    );
                    mockRootObject = jasmine.createSpyObj(
                        "domainObject",
                        ["getId", "getCapability"]
                    );
                    mockChildContext = jasmine.createSpyObj("context", ["getParent"]);
                    mockGrandchildContext = jasmine.createSpyObj("context", ["getParent"]);
                    mockRootContext = jasmine.createSpyObj("context", ["getParent"]);
                    mockDialogService.showBlockingMessage.and.returnValue(mockDialogHandle);
                });
                it("mutates the parent when performed", function () {
                    action.perform();
                    mockDialogService.showBlockingMessage.calls.mostRecent().args[0]
                        .primaryOption.callback();
                    expect(mockMutation.invoke)
                        .toHaveBeenCalledWith(jasmine.any(Function));
                });
                it("changes composition from its mutation function", function () {
                    var mutator, result;
                    action.perform();
                    mockDialogService.showBlockingMessage.calls.mostRecent().args[0]
                        .primaryOption.callback();
                    mutator = mockMutation.invoke.calls.mostRecent().args[0];
                    result = mutator(model);
                    // Should not have cancelled the mutation
                    expect(result).not.toBe(false);
                    // Simulate mutate's behavior (remove can either return a
                    // new model or modify this one in-place)
                    result = result || model;
                    // Should have removed "test" - that was our
                    // mock domain object's id.
                    expect(result.composition).toEqual(["a", "b"]);
                });
                it("removes parent of object currently navigated to", function () {
                    // Navigates to child object
                    mockNavigationService.getNavigation.and.returnValue(mockChildObject);
                    // Test is id of object being removed
                    // Child object has different id
                    mockDomainObject.getId.and.returnValue("test");
                    mockChildObject.getId.and.returnValue("not test");
                    // Sets context for the child and domainObject
                    mockDomainObject.getCapability.and.returnValue(mockContext);
                    mockChildObject.getCapability.and.returnValue(mockChildContext);
                    // Parents of child and domainObject are set
                    mockContext.getParent.and.returnValue(mockParent);
                    mockChildContext.getParent.and.returnValue(mockDomainObject);
                    mockType.hasFeature.and.returnValue(true);
                    action.perform();
                    mockDialogService.showBlockingMessage.calls.mostRecent().args[0]
                        .primaryOption.callback();
                    // Expects navigation to parent of domainObject (removed object)
                    expect(mockNavigationService.setNavigation).toHaveBeenCalledWith(mockParent);
                });
                it("checks if removing object not in ascendent path (reaches ROOT)", function () {
                    // Navigates to grandchild of ROOT
                    mockNavigationService.getNavigation.and.returnValue(mockGrandchildObject);
                    // domainObject (grandparent) is set as ROOT, child and grandchild
                    // are set objects not being removed
                    mockDomainObject.getId.and.returnValue("test 1");
                    mockRootObject.getId.and.returnValue("ROOT");
                    mockChildObject.getId.and.returnValue("not test 2");
                    mockGrandchildObject.getId.and.returnValue("not test 3");
                    // Sets context for the grandchild, child, and domainObject
                    mockRootObject.getCapability.and.returnValue(mockRootContext);
                    mockChildObject.getCapability.and.returnValue(mockChildContext);
                    mockGrandchildObject.getCapability.and.returnValue(mockGrandchildContext);
                    // Parents of grandchild and child are set
                    mockChildContext.getParent.and.returnValue(mockRootObject);
                    mockGrandchildContext.getParent.and.returnValue(mockChildObject);
                    mockType.hasFeature.and.returnValue(true);
                    action.perform();
                    mockDialogService.showBlockingMessage.calls.mostRecent().args[0]
                        .primaryOption.callback();
                    // Expects no navigation to occur
                    expect(mockNavigationService.setNavigation).not.toHaveBeenCalled();
                });
            });
        });
    }
 );
--- a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js
+++ b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js
@ -25,7 +25,7 @@ define(
    ["../../src/actions/SaveAsAction"],
    function (SaveAsAction) {
-        describe("The Save As action", function () {
+        xdescribe("The Save As action", function () {
            var mockDomainObject,
                mockClonedObject,
                mockEditorCapability,
--- a/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js
+++ b/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js
@ -24,7 +24,7 @@ define(
    ["../../src/capabilities/EditorCapability"],
    function (EditorCapability) {
-        describe("The editor capability", function () {
+        xdescribe("The editor capability", function () {
            var mockDomainObject,
                capabilities,
                mockParentObject,
--- a/platform/commonUI/edit/test/creation/CreateActionSpec.js
+++ b/platform/commonUI/edit/test/creation/CreateActionSpec.js
@ -27,7 +27,7 @@ define(
    ["../../src/creation/CreateAction"],
    function (CreateAction) {
-        describe("The create action", function () {
+        xdescribe("The create action", function () {
            var mockType,
                mockParent,
                mockContext,
--- a/platform/commonUI/edit/test/creation/CreateWizardSpec.js
+++ b/platform/commonUI/edit/test/creation/CreateWizardSpec.js
@ -27,7 +27,7 @@ define(
    ["../../src/creation/CreateWizard"],
    function (CreateWizard) {
-        describe("The create wizard", function () {
+        xdescribe("The create wizard", function () {
            var mockType,
                mockParent,
                mockProperties,
--- a/platform/commonUI/edit/test/policies/EditActionPolicySpec.js
+++ b/platform/commonUI/edit/test/policies/EditActionPolicySpec.js
@ -1,138 +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(
    ["../../src/policies/EditActionPolicy"],
    function (EditActionPolicy) {
        describe("The Edit action policy", function () {
            var editableView,
                nonEditableView,
                testViews,
                testContext,
                mockDomainObject,
                mockEditAction,
                mockPropertiesAction,
                mockTypeCapability,
                mockEditorCapability,
                capabilities,
                plotView,
                policy;
            beforeEach(function () {
                mockDomainObject = jasmine.createSpyObj(
                    'domainObject',
                    [
                        'useCapability',
                        'hasCapability',
                        'getCapability'
                    ]
                );
                mockEditorCapability = jasmine.createSpyObj('editorCapability', ['isEditContextRoot']);
                mockTypeCapability = jasmine.createSpyObj('type', ['getKey']);
                capabilities = {
                    'editor': mockEditorCapability,
                    'type': mockTypeCapability
                };
                mockEditAction = jasmine.createSpyObj('edit', ['getMetadata']);
                mockPropertiesAction = jasmine.createSpyObj('edit', ['getMetadata']);
                mockDomainObject.getCapability.and.callFake(function (capability) {
                    return capabilities[capability];
                });
                mockDomainObject.hasCapability.and.callFake(function (capability) {
                    return !!capabilities[capability];
                });
                editableView = { editable: true };
                nonEditableView = { editable: false };
                plotView = { key: "plot", editable: false };
                testViews = [];
                mockDomainObject.useCapability.and.callFake(function (c) {
                    // Provide test views, only for the view capability
                    return c === 'view' && testViews;
                });
                mockEditAction.getMetadata.and.returnValue({ key: 'edit' });
                mockPropertiesAction.getMetadata.and.returnValue({ key: 'properties' });
                testContext = {
                    domainObject: mockDomainObject,
                    category: 'view-control'
                };
                policy = new EditActionPolicy();
            });
            it("allows the edit action when there are editable views", function () {
                testViews = [editableView];
                expect(policy.allow(mockEditAction, testContext)).toBe(true);
            });
            it("allows the edit properties action when there are no editable views", function () {
                testViews = [nonEditableView, nonEditableView];
                expect(policy.allow(mockPropertiesAction, testContext)).toBe(true);
            });
            it("disallows the edit action when there are no editable views", function () {
                testViews = [nonEditableView, nonEditableView];
                expect(policy.allow(mockEditAction, testContext)).toBe(false);
            });
            it("disallows the edit properties action when there are" +
                " editable views", function () {
                testViews = [editableView];
                expect(policy.allow(mockPropertiesAction, testContext)).toBe(false);
            });
            it("disallows the edit action when object is already being" +
                " edited", function () {
                testViews = [editableView];
                mockEditorCapability.isEditContextRoot.and.returnValue(true);
                expect(policy.allow(mockEditAction, testContext)).toBe(false);
            });
            it("allows editing of panels in plot view", function () {
                testViews = [plotView];
                mockTypeCapability.getKey.and.returnValue('telemetry.panel');
                expect(policy.allow(mockEditAction, testContext)).toBe(true);
            });
            it("disallows editing of plot view when object not a panel type", function () {
                testViews = [plotView];
                mockTypeCapability.getKey.and.returnValue('something.else');
                expect(policy.allow(mockEditAction, testContext)).toBe(false);
            });
            it("allows the edit properties outside of the 'view-control' category", function () {
                testViews = [nonEditableView];
                testContext.category = "something-else";
                expect(policy.allow(mockPropertiesAction, testContext)).toBe(true);
            });
        });
    }
 );
--- a/platform/commonUI/edit/test/policies/EditContextualActionPolicySpec.js
+++ b/platform/commonUI/edit/test/policies/EditContextualActionPolicySpec.js
@ -1,120 +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.
 *****************************************************************************/
 /*global describe,it,expect,beforeEach,jasmine*/
 define(
    ["../../src/policies/EditContextualActionPolicy"],
    function (EditContextualActionPolicy) {
        describe("The Edit contextual action policy", function () {
            var policy,
                navigationService,
                mockAction,
                context,
                navigatedObject,
                mockDomainObject,
                mockEditorCapability,
                metadata,
                editModeBlacklist = ["copy", "follow", "window", "link", "locate"],
                nonEditContextBlacklist = ["copy", "follow", "properties", "move", "link", "remove", "locate"];
            beforeEach(function () {
                mockEditorCapability = jasmine.createSpyObj("editorCapability", ["isEditContextRoot", "inEditContext"]);
                navigatedObject = jasmine.createSpyObj("navigatedObject", ["hasCapability", "getCapability"]);
                navigatedObject.getCapability.and.returnValue(mockEditorCapability);
                navigatedObject.hasCapability.and.returnValue(false);
                mockDomainObject = jasmine.createSpyObj("domainObject", ["hasCapability", "getCapability"]);
                mockDomainObject.hasCapability.and.returnValue(false);
                mockDomainObject.getCapability.and.returnValue(mockEditorCapability);
                navigationService = jasmine.createSpyObj("navigationService", ["getNavigation"]);
                navigationService.getNavigation.and.returnValue(navigatedObject);
                metadata = {key: "move"};
                mockAction = jasmine.createSpyObj("action", ["getMetadata"]);
                mockAction.getMetadata.and.returnValue(metadata);
                context = {domainObject: mockDomainObject};
                policy = new EditContextualActionPolicy(navigationService, editModeBlacklist, nonEditContextBlacklist);
            });
            it('Allows all actions when navigated object not in edit mode', function () {
                expect(policy.allow(mockAction, context)).toBe(true);
            });
            it('Allows "window" action when navigated object in edit mode,' +
                ' but selected object not in edit mode ', function () {
                navigatedObject.hasCapability.and.returnValue(true);
                mockEditorCapability.isEditContextRoot.and.returnValue(true);
                metadata.key = "window";
                expect(policy.allow(mockAction, context)).toBe(true);
            });
            it('Allows "remove" action when navigated object in edit mode,' +
                ' and selected object not editable, but its parent is.',
            function () {
                var mockParent = jasmine.createSpyObj("parentObject", ["hasCapability"]),
                    mockContextCapability = jasmine.createSpyObj("contextCapability", ["getParent"]);
                mockParent.hasCapability.and.returnValue(true);
                mockContextCapability.getParent.and.returnValue(mockParent);
                navigatedObject.hasCapability.and.returnValue(true);
                mockDomainObject.getCapability.and.returnValue(mockContextCapability);
                mockDomainObject.hasCapability.and.callFake(function (capability) {
                    switch (capability) {
                    case "editor": return false;
                    case "context": return true;
                    }
                });
                metadata.key = "remove";
                expect(policy.allow(mockAction, context)).toBe(true);
            });
            it('Disallows "move" action when navigated object in edit mode,' +
                ' but selected object not in edit mode ', function () {
                navigatedObject.hasCapability.and.returnValue(true);
                mockEditorCapability.isEditContextRoot.and.returnValue(true);
                mockEditorCapability.inEditContext.and.returnValue(false);
                metadata.key = "move";
                expect(policy.allow(mockAction, context)).toBe(false);
            });
            it('Disallows copy action when navigated object and' +
                ' selected object in edit mode', function () {
                navigatedObject.hasCapability.and.returnValue(true);
                mockDomainObject.hasCapability.and.returnValue(true);
                mockEditorCapability.isEditContextRoot.and.returnValue(true);
                mockEditorCapability.inEditContext.and.returnValue(true);
                metadata.key = "copy";
                expect(policy.allow(mockAction, context)).toBe(false);
            });
        });
    }
 );
--- a/platform/commonUI/edit/test/policies/EditableViewPolicySpec.js
+++ b/platform/commonUI/edit/test/policies/EditableViewPolicySpec.js
@ -1,79 +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(
    ["../../src/policies/EditableViewPolicy"],
    function (EditableViewPolicy) {
        describe("The editable view policy", function () {
            var mockDomainObject,
                testMode,
                policy;
            beforeEach(function () {
                testMode = true; // Act as if we're in Edit mode by default
                mockDomainObject = jasmine.createSpyObj(
                    'domainObject',
                    ['hasCapability', 'getCapability']
                );
                mockDomainObject.getCapability.and.returnValue({
                    inEditContext: function () {
                        return true;
                    }
                });
                mockDomainObject.hasCapability.and.callFake(function (c) {
                    return (c === 'editor') && testMode;
                });
                policy = new EditableViewPolicy();
            });
            it("disallows views in edit mode that are flagged as non-editable", function () {
                expect(policy.allow({ editable: false }, mockDomainObject))
                    .toBeFalsy();
            });
            it("allows views in edit mode that are flagged as editable", function () {
                expect(policy.allow({ editable: true }, mockDomainObject))
                    .toBeTruthy();
            });
            it("allows any view outside of edit mode", function () {
                var testViews = [
                    { editable: false },
                    { editable: true },
                    { someKey: "some value" }
                ];
                testMode = false; // Act as if we're not in Edit mode
                testViews.forEach(function (testView) {
                    expect(policy.allow(testView, mockDomainObject)).toBeTruthy();
                });
            });
            it("treats views with no defined 'editable' property as editable", function () {
                expect(policy.allow({ someKey: "some value" }, mockDomainObject))
                    .toBeTruthy();
            });
        });
    }
 );
--- a/platform/commonUI/edit/test/services/TransactionManagerSpec.js
+++ b/platform/commonUI/edit/test/services/TransactionManagerSpec.js
@ -93,24 +93,33 @@ define(
                    expect(mockOnCancel).toHaveBeenCalled();
                });
-                it("ignores subsequent calls for the same object", function () {
+                describe("Adds callbacks to transaction", function () {
                    beforeEach(function () {
                        spyOn(manager, 'clearTransactionsFor');
                        manager.clearTransactionsFor.and.callThrough();
                    });
                    it("and clears pending calls if same object", function () {
                        manager.addToTransaction(
                            testId,
                            jasmine.createSpy(),
                            jasmine.createSpy()
                        );
-                    expect(mockTransactionService.addToTransaction.calls.count())
+                        expect(manager.clearTransactionsFor).toHaveBeenCalledWith(testId);
                        .toEqual(1);
                    });
-                it("accepts subsequent calls for other objects", function () {
+                    it("and does not clear pending calls if different object", function () {
                        manager.addToTransaction(
                            'other-id',
                            jasmine.createSpy(),
                            jasmine.createSpy()
                        );
-                    expect(mockTransactionService.addToTransaction.calls.count())
+                        expect(manager.clearTransactionsFor).not.toHaveBeenCalled();
-                        .toEqual(2);
+                    });
                    afterEach(function () {
                        expect(mockTransactionService.addToTransaction.calls.count()).toEqual(2);
                    });
                });
                it("does not remove callbacks from the transaction", function () {
--- a/platform/commonUI/formats/bundle.js
+++ b/platform/commonUI/formats/bundle.js
@ -23,16 +23,16 @@
 define([
    "./src/FormatProvider",
    "./src/UTCTimeFormat",
-    "./src/DurationFormat",
+    "./src/DurationFormat"
    'legacyRegistry'
 ], function (
    FormatProvider,
    UTCTimeFormat,
-    DurationFormat,
+    DurationFormat
    legacyRegistry
 ) {
-    legacyRegistry.register("platform/commonUI/formats", {
+    return {
        name:"platform/commonUI/formats",
        definition: {
            "name": "Format Registry",
            "description": "Provides a registry for formats, which allow parsing and formatting of values.",
            "extensions": {
@ -74,5 +74,6 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/platform/commonUI/general/bundle.js
+++ b/platform/commonUI/general/bundle.js
@ -31,7 +31,6 @@ define([
    "./src/controllers/TreeNodeController",
    "./src/controllers/ActionGroupController",
    "./src/controllers/ToggleController",
    "./src/controllers/ContextMenuController",
    "./src/controllers/ClickAwayController",
    "./src/controllers/ViewSwitcherController",
    "./src/controllers/GetterSetterController",
@ -49,8 +48,6 @@ define([
    "./src/directives/MCTSplitter",
    "./src/directives/MCTTree",
    "./src/directives/MCTIndicators",
    "./src/directives/MCTPreview",
    "./src/actions/MCTPreviewAction",
    "./src/filters/ReverseFilter",
    "./res/templates/bottombar.html",
    "./res/templates/controls/action-button.html",
@ -65,14 +62,11 @@ define([
    "./res/templates/tree-node.html",
    "./res/templates/label.html",
    "./res/templates/controls/action-group.html",
    "./res/templates/menu/context-menu.html",
    "./res/templates/controls/switcher.html",
    "./res/templates/object-inspector.html",
    "./res/templates/controls/selector.html",
    "./res/templates/controls/datetime-picker.html",
-    "./res/templates/controls/datetime-field.html",
+    "./res/templates/controls/datetime-field.html"
    "./res/templates/preview.html",
    'legacyRegistry'
 ], function (
    UrlService,
    PopupService,
@ -84,7 +78,6 @@ define([
    TreeNodeController,
    ActionGroupController,
    ToggleController,
    ContextMenuController,
    ClickAwayController,
    ViewSwitcherController,
    GetterSetterController,
@ -102,8 +95,6 @@ define([
    MCTSplitter,
    MCTTree,
    MCTIndicators,
    MCTPreview,
    MCTPreviewAction,
    ReverseFilter,
    bottombarTemplate,
    actionButtonTemplate,
@ -118,17 +109,16 @@ define([
    treeNodeTemplate,
    labelTemplate,
    actionGroupTemplate,
    contextMenuTemplate,
    switcherTemplate,
    objectInspectorTemplate,
    selectorTemplate,
    datetimePickerTemplate,
-    datetimeFieldTemplate,
+    datetimeFieldTemplate
    previewTemplate,
    legacyRegistry
 ) {
-    legacyRegistry.register("platform/commonUI/general", {
+    return {
        name:"platform/commonUI/general",
        definition: {
            "name": "General UI elements",
            "description": "General UI elements, meant to be reused across modes",
            "resources": "res",
@ -252,13 +242,6 @@ define([
                        "key": "ToggleController",
                        "implementation": ToggleController
                    },
                {
                    "key": "ContextMenuController",
                    "implementation": ContextMenuController,
                    "depends": [
                        "$scope"
                    ]
                },
                    {
                        "key": "ClickAwayController",
                        "implementation": ClickAwayController,
@ -394,31 +377,6 @@ define([
                        "key": "mctIndicators",
                        "implementation": MCTIndicators,
                        "depends": ['openmct']
                },
                {
                    "key": "mctPreview",
                    "implementation": MCTPreview,
                    "depends": [
                        "$document"
                    ]
                }
            ],
            "actions": [
                {
                    "key": "mct-preview-action",
                    "implementation": MCTPreviewAction,
                    "name": "Preview",
                    "cssClass": "hide-in-t-main-view icon-eye-open",
                    "description": "Preview in large dialog",
                    "category": [
                        "contextual",
                        "view-control"
                    ],
                    "depends": [
                        "$compile",
                        "$rootScope"
                    ],
                    "priority": "preferred"
                    }
                ],
                "constants": [
@ -517,13 +475,6 @@ define([
                            "action"
                        ]
                    },
                {
                    "key": "context-menu",
                    "template": contextMenuTemplate,
                    "uses": [
                        "action"
                    ]
                },
                    {
                        "key": "switcher",
                        "template": switcherTemplate,
@ -534,10 +485,6 @@ define([
                    {
                        "key": "object-inspector",
                        "template": objectInspectorTemplate
                },
                {
                    "key": "mct-preview",
                    "template": previewTemplate
                    }
                ],
                "controls": [
@ -577,5 +524,6 @@ define([
                    }
                ]
            }
-    });
+        }
    };
 });
--- a/platform/commonUI/general/res/templates/angular-indicator.html
+++ b/platform/commonUI/general/res/templates/angular-indicator.html
@ -20,8 +20,7 @@
 at runtime from the About dialog for additional information.
 -->
 <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-<div class="ls-indicator {{ngModel.getCssClass()}}"
+<div class="c-indicator {{ngModel.getCssClass()}}"
 	 title="{{ngModel.getDescription()}}"
 	 ng-show="ngModel.getText().length > 0">
-	<span class="label">{{ngModel.getText()}}</span>
+	<span class="label c-indicator__label">{{ngModel.getText()}}</span>
 </div>
--- a/platform/commonUI/general/res/templates/label.html
+++ b/platform/commonUI/general/res/templates/label.html
@ -19,7 +19,7 @@
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
 -->
-<div class="t-object-label l-flex-row flex-elem grows">
+<div class="c-object-label">
-    <div class="t-item-icon flex-elem {{type.getCssClass()}}" ng-class="{ 'l-icon-link':location.isLink() }"></div>
+    <div class="c-object-label__type-icon {{type.getCssClass()}}" ng-class="{ 'l-icon-link':location.isLink() }"></div>
-    <div class='t-title-label flex-elem grows'>{{model.name}}</div>
+    <div class='c-object-label__name'>{{model.name}}</div>
 </div>
--- a/platform/commonUI/general/res/templates/menu/context-menu.html
+++ b/platform/commonUI/general/res/templates/menu/context-menu.html
@ -1,33 +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.
 -->
 <div class="menu-element context-menu-wrapper mobile-disable-select" ng-controller="ContextMenuController">
    <div class="menu context-menu">
        <ul>
            <li ng-repeat="menuAction in menuActions"
                ng-click="menuAction.perform()"
                title="{{menuAction.getMetadata().description}}"
                class="{{menuAction.getMetadata().cssClass}}">
                {{menuAction.getMetadata().name}}
            </li>
        </ul>
    </div>
 </div>
--- a/platform/commonUI/general/res/templates/message-banner.html
+++ b/platform/commonUI/general/res/templates/message-banner.html
@ -1,13 +1,13 @@
 <div ng-controller="BannerController" ng-show="active.notification"
-     class="l-message-banner s-message-banner {{active.notification.model.severity}}" ng-class="{
+     class="c-message-banner {{active.notification.model.severity}}" ng-class="{
     'minimized': active.notification.model.minimized,
     'new': !active.notification.model.minimized}"
     ng-click="maximize(active.notification)">
-    <span class="banner-elem label">
+    <span class="c-message-banner__message">
        {{active.notification.model.title}}
    </span>
    <span ng-show="active.notification.model.progress !== undefined || active.notification.model.unknownProgress">
-        <mct-include key="'progress-bar'" class="banner-elem"
+        <mct-include key="'progress-bar'" class="c-message-banner__progress-bar"
                     ng-model="active.notification.model">
        </mct-include>
    </span>
@ -16,5 +16,5 @@
       ng-click="action(active.notification.model.primaryOption.callback, $event)">
        {{active.notification.model.primaryOption.label}}
    </a>
-    <a class="banner-elem close icon-x" ng-click="dismiss(active.notification, $event)"></a>
+    <button class="c-message-banner__close-button c-click-icon icon-x-in-circle" ng-click="dismiss(active.notification, $event)"></button>
 </div>
--- a/platform/commonUI/general/res/templates/preview.html
+++ b/platform/commonUI/general/res/templates/preview.html
@ -1,45 +0,0 @@
 <!--
 Open MCT, Copyright (c) 2014-2017, 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.
 -->
 <div class="t-frame-inner abs t-object-type-{{ domainObject.getModel().type }}" mct-preview>
    <div class="abs object-browse-bar l-flex-row">
        <div class="left flex-elem l-flex-row grows">
            <mct-representation
                    key="'object-header-frame'"
                    mct-object="domainObject"
                    class="l-flex-row flex-elem object-header grows">
            </mct-representation>
        </div>
        <div class="btn-bar right l-flex-row flex-elem flex-justify-end flex-fixed">
            <mct-representation
                    key="'switcher'"
                    ng-model="representation"
                    mct-object="domainObject">
            </mct-representation>
        </div>
    </div>
    <div class="abs object-holder">
        <mct-representation
                key="representation.selected.key"
                mct-object="representation.selected.key && domainObject">
        </mct-representation>
    </div>
 </div>
--- a/platform/commonUI/general/res/templates/tree-node.html
+++ b/platform/commonUI/general/res/templates/tree-node.html
@ -20,14 +20,11 @@
 at runtime from the About dialog for additional information.
 -->
 <span ng-controller="ToggleController as toggle">
-    <span ng-controller="TreeNodeController as treeNode">
+    <div class="u-contents" ng-controller="TreeNodeController as treeNode">
-        <span
+        <div class="c-tree__item menus-to-left"
-            class="tree-item menus-to-left"
+            ng-class="{selected: treeNode.isSelected()}">
-            ng-class="{selected: treeNode.isSelected()}"
+            <span class='c-disclosure-triangle c-tree__item__view-control'
-            >
+                ng-class="{ 'is-enabled': model.composition !== undefined, 'c-disclosure-triangle--expanded': toggle.isActive() }"
            <span
                class='ui-symbol view-control flex-elem'
                ng-class="{ 'has-children': model.composition !== undefined, expanded: toggle.isActive() }"
                ng-click="toggle.toggle(); treeNode.trackExpansion()"
                >
            </span>
@ -39,19 +36,15 @@
                ng-click="treeNode.select()"
                >
            </mct-representation>
-        </span>
+        </div>
-        <span
+        <div class="u-contents"
            class="tree-item-subtree"
            ng-show="toggle.isActive()"
-            ng-if="model.composition !== undefined"
+            ng-if="model.composition !== undefined">
            >
            <mct-representation key="'subtree'"
                                ng-model="ngModel"
                                parameters="parameters"
                                mct-object="treeNode.hasBeenExpanded() && domainObject">
            </mct-representation>
-
+        </div>
-        </span>
+    </div>
    </span>
 </span>
--- a/platform/commonUI/general/res/templates/tree.html
+++ b/platform/commonUI/general/res/templates/tree.html
@ -19,8 +19,8 @@
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
 -->
-<ul class="tree">
+<ul class="c-tree">
-    <li>
+    <li class="c-tree__item-h">
        <mct-representation key="'tree-node'"
                            mct-object="domainObject"
                            ng-model="ngModel"
--- a/platform/commonUI/general/res/templates/tree/node.html
+++ b/platform/commonUI/general/res/templates/tree/node.html
@ -1,4 +1,2 @@
-<span class="tree-item menus-to-left">
+<span class="c-tree__item js-tree__item"></span>
-</span>
+<span class="c-tree__item-subtree"></span>
 <span class="tree-item-subtree">
 </span>
--- a/platform/commonUI/general/res/templates/tree/toggle.html
+++ b/platform/commonUI/general/res/templates/tree/toggle.html
@ -1,2 +1 @@
-<span class='ui-symbol view-control flex-elem'>
+<span class='c-disclosure-triangle c-tree__item__view-control'></span>
 </span>
--- a/platform/commonUI/general/res/templates/tree/tree-label.html
+++ b/platform/commonUI/general/res/templates/tree/tree-label.html
@ -1,6 +1,4 @@
-<span class="rep-object-label">
+<div class="rep-object-label c-object-label c-tree__item__label">
-    <div class="t-object-label l-flex-row flex-elem grows">
+    <div class="c-object-label__type-icon c-tree__item__type-icon t-item-icon"></div>
-        <div class="t-item-icon flex-elem"></div>
+    <div class="c-object-label__name c-tree__item__name t-title-label"></div>
-        <div class='t-title-label flex-elem grows'></div>
+</div>
    </div>
 </span>
--- a/platform/commonUI/general/src/actions/MCTPreviewAction.js
+++ b/platform/commonUI/general/src/actions/MCTPreviewAction.js
@ -1,55 +0,0 @@
 /*****************************************************************************
 * Open MCT, Copyright (c) 2014-2017, 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(
    [],
    function () {
        var PREVIEW_TEMPLATE = '<mct-representation key="\'mct-preview\'"' +
                                    'class="t-rep-frame holder"' +
                                    'mct-object="domainObject">' +
                                '</mct-representation>';
        function MCTPreviewAction($compile, $rootScope, context) {
            context = context || {};
            this.domainObject = context.selectedObject || context.domainObject;
            this.$rootScope = $rootScope;
            this.$compile = $compile;
        }
        MCTPreviewAction.prototype.perform = function () {
            var newScope = this.$rootScope.$new();
            newScope.domainObject = this.domainObject;
            this.$compile(PREVIEW_TEMPLATE)(newScope);
        };
        MCTPreviewAction.appliesTo = function (context) {
            var domainObject = (context || {}).domainObject,
                status = domainObject.getCapability('status');
            return !(status && status.get('editing'));
        };
        return MCTPreviewAction;
    }
 );
--- a/platform/commonUI/general/src/controllers/ContextMenuController.js
+++ b/platform/commonUI/general/src/controllers/ContextMenuController.js
@ -1,51 +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.
 *****************************************************************************/
 /**
 * Module defining ContextMenuController. Created by vwoeltje on 11/17/14.
 */
 define(
    [],
    function () {
        /**
         * Controller for the context menu. Maintains an up-to-date
         * list of applicable actions (those from category "contextual")
         *
         * @memberof platform/commonUI/general
         * @constructor
         */
        function ContextMenuController($scope) {
            // Refresh variable "menuActions" in the scope
            function updateActions() {
                $scope.menuActions = $scope.action ?
                    $scope.action.getActions({ category: 'contextual' }) :
                    [];
            }
            // Update using the action capability
            $scope.$watch("action", updateActions);
        }
        return ContextMenuController;
    }
 );
--- a/Show More
+++ b/Show More
`@ -1,2 +1 @@`
	`<span class='ui-symbol view-control flex-elem'>`	`<span class='c-disclosure-triangle c-tree__item__view-control'></span>`
	`</span>`