Removing star listeners

More bug fixes
Change instances of openmct.objects.get to openmct.objects.getAsMutable
2019-11-27 14:38:01 -08:00 · 2019-11-25 11:59:39 -08:00 · 2019-11-25 11:41:35 -08:00 · 2019-11-25 11:25:11 -08:00 · 2019-11-11 14:13:36 -08:00 · 2019-11-11 13:43:37 -08:00
207 changed files with 9334 additions and 10561 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -5,16 +5,9 @@ module.exports = {
        "jasmine": true,
        "amd": true
    },
-    "globals": {
-        "_": "readonly"
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:vue/recommended"
-    ],
-    "parser": "vue-eslint-parser",
+    "extends": "eslint:recommended",
+    "parser": "babel-eslint",
    "parserOptions": {
-        "parser": "babel-eslint",
        "allowImportExportEverywhere": true,
        "ecmaVersion": 2015,
        "ecmaFeatures": {
@@ -65,38 +58,7 @@ module.exports = {
            }
        ],
        "dot-notation": "error",
-        "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"
+        "indent": ["error", 4]
    },
    "overrides": [
        {
--- a/API.md
+++ b/API.md
@@ -109,13 +109,15 @@ script loaders are also supported.
 <html>
 <head>
    <title>Open MCT</title>
-    <script src="dist/openmct.js"></script>
+    <script src="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>
@@ -126,6 +128,9 @@ 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,6 +9,26 @@ 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.
@@ -28,14 +48,9 @@ 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/).
+Documentation is available on the [Open MCT website](https://nasa.github.io/openmct/documentation/). The documentation can also be built locally.

 ### Examples

@@ -43,29 +58,48 @@ The clearest examples for developing Open MCT plugins are in the
 [tutorials](https://github.com/nasa/openmct-tutorial) provided in
 our documentation.

-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! 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).
+For a practical example of a telemetry adapter, see David Hudson's
+[Kerbal Space Program plugin](https://github.com/hudsonfoo/kerbal-openmct),
+which allows [Kerbal Space Program](https://kerbalspaceprogram.com) players
+to build and use displays for their own missions in Open MCT.

-## Building Applications With Open MCT
+Additional examples are available in the `examples` hierarchy of this
+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.

-Open MCT is built using [`npm`](http://npmjs.com/) and [`webpack`](https://webpack.js.org/).
+### Building the Open MCT Documentation Locally
+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:

-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`
+* `npm install canvas nomnoml`
+* `npm run docs`

-## Plugins
+Documentation will be generated in `target/docs`.

-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.
+## Deploying Open MCT

-As well as providing an extension mechanism, most of the core Open MCT codebase is also 
-written as plugins.
+Open MCT is built using [`npm`](http://npmjs.com/)

-For information on writing plugins, please see [our API documentation](https://github.com/nasa/openmct/blob/master/API.md#plugins).
+To build Open MCT for deployment:
+
+`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](https://jasmine.github.io/api/3.1/global)
+Tests are written for [Jasmine 3](http://jasmine.github.io/)
 and run by [Karma](http://karma-runner.github.io). To run:

 `npm test`
@@ -81,7 +115,7 @@ naming convention is otherwise the same.)
 ### Test Reporting

 When `npm test` is run, test results will be written as HTML to
-`dist/reports/tests/`. Code coverage information is written to `dist/reports/coverage`.
+`target/tests`. Code coverage information is written to `target/coverage`.

 # Glossary

@@ -91,8 +125,11 @@ 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.

-* _plugin_: A plugin is a removable, reusable grouping of software elements.
-  The application is composed of plugins.
+* _bundle_: A bundle is a removable, reusable grouping of software elements.
+  The application is composed of bundles. Plug-ins are bundles. For more
+  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
@@ -107,8 +144,13 @@ 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.
-* _identifier_: A tuple consisting of a namespace and a key, which together uniquely
-  identifies a domain object.
+* _extension_: An extension is a unit of functionality exposed to the
+  platform in a declarative fashion by a bundle. For more
+  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.)
@@ -120,5 +162,7 @@ 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.)
-* _namespace_: A name used to identify a persistence store. A running open MCT 
-application could potentially use multiple persistence stores, with the 
+* _space_: A name used to identify a persistence store. Interactions with
+  persistence will generally involve a `space` parameter in some form, to
+  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,60 +22,59 @@
 /*global define*/

 define([
-    "./src/EventTelemetryProvider"
+    "./src/EventTelemetryProvider",
+    'legacyRegistry'
 ], function (
-    EventTelemetryProvider
+    EventTelemetryProvider,
+    legacyRegistry
 ) {
    "use strict";

-    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": {
-                "components": [
-                    {
-                        "implementation": EventTelemetryProvider,
-                        "type": "provider",
-                        "provides": "telemetryService",
-                        "depends": [
-                            "$q",
-                            "$timeout"
+    legacyRegistry.register("example/eventGenerator", {
+        "name": "Event Message Generator",
+        "description": "For development use. Creates sample event message data that mimics a live data stream.",
+        "extensions": {
+            "components": [
+                {
+                    "implementation": EventTelemetryProvider,
+                    "type": "provider",
+                    "provides": "telemetryService",
+                    "depends": [
+                        "$q",
+                        "$timeout"
+                    ]
+                }
+            ],
+            "types": [
+                {
+                    "key": "eventGenerator",
+                    "name": "Event Message Generator",
+                    "cssClass": "icon-generator-events",
+                    "description": "For development use. Creates sample event message data that mimics a live data stream.",
+                    "priority": 10,
+                    "features": "creation",
+                    "model": {
+                        "telemetry": {}
+                    },
+                    "telemetry": {
+                        "source": "eventGenerator",
+                        "domains": [
+                            {
+                                "key": "utc",
+                                "name": "Timestamp",
+                                "format": "utc"
+                            }
+                        ],
+                        "ranges": [
+                            {
+                                "key": "message",
+                                "name": "Message",
+                                "format": "string"
+                            }
                        ]
                    }
-                ],
-                "types": [
-                    {
-                        "key": "eventGenerator",
-                        "name": "Event Message Generator",
-                        "cssClass": "icon-generator-events",
-                        "description": "For development use. Creates sample event message data that mimics a live data stream.",
-                        "priority": 10,
-                        "features": "creation",
-                        "model": {
-                            "telemetry": {}
-                        },
-                        "telemetry": {
-                            "source": "eventGenerator",
-                            "domains": [
-                                {
-                                    "key": "utc",
-                                    "name": "Timestamp",
-                                    "format": "utc"
-                                }
-                            ],
-                            "ranges": [
-                                {
-                                    "key": "message",
-                                    "name": "Message",
-                                    "format": "string"
-                                }
-                            ]
-                        }
-                    }
-                ]
-            }
+                }
+            ]
        }
-    };
+    });
 });
--- a/example/eventGenerator/src/EventTelemetry.js
+++ b/example/eventGenerator/src/EventTelemetry.js
@@ -48,11 +48,11 @@ define(
                        (domain !== 'delta' ? firstObservedTime : 0);
            };

-            generatorData.getRangeValue = function (i, range) {
-                var domainDelta = this.getDomainValue(i) - firstObservedTime,
+	        generatorData.getRangeValue = function (i, range) {
+		        var domainDelta = this.getDomainValue(i) - firstObservedTime,
                    ind = i % messages.length;
                return messages[ind] + " - [" + domainDelta.toString() + "]";
-            };
+	        };

            return generatorData;
        }
--- a/example/eventGenerator/src/EventTelemetryProvider.js
+++ b/example/eventGenerator/src/EventTelemetryProvider.js
@@ -34,9 +34,11 @@ define(
         * @constructor
         */
        function EventTelemetryProvider($q, $timeout) {
-            var subscriptions = [],
-                genInterval = 1000,
-                generating = false;
+            var
+	            subscriptions = [],
+	            genInterval = 1000,
+                generating = false,
+                id = Math.random() * 100000;

            //
            function matchesSource(request) {
@@ -45,6 +47,7 @@ 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(telemetryRow, index) {
+            function copyDomainsToRow(row, index) {
                domains.forEach(function (domain) {
-                    telemetryRow[domain.name] = series.getDomainValue(index, domain.key);
+                    row[domain.name] = series.getDomainValue(index, domain.key);
                });
            }

-            function copyRangesToRow(telemetryRow, index) {
+            function copyRangesToRow(row, index) {
                ranges.forEach(function (range) {
-                    telemetryRow[range.name] = series.getRangeValue(index, range.key);
+                    row[range.name] = series.getRangeValue(index, range.key);
                });
            }

--- a/example/export/bundle.js
+++ b/example/export/bundle.js
@@ -22,26 +22,24 @@
 /*global define*/

 define([
+    'legacyRegistry',
    './ExportTelemetryAsCSVAction'
-], function (ExportTelemetryAsCSVAction) {
+], function (legacyRegistry, ExportTelemetryAsCSVAction) {
    "use strict";

-    return {
-        name:"example/export",
-        definition: {
-            "name": "Example of using CSV Export",
-            "extensions": {
-                "actions": [
-                    {
-                        "key": "example.export",
-                        "name": "Export Telemetry as CSV",
-                        "implementation": ExportTelemetryAsCSVAction,
-                        "category": "contextual",
-                        "cssClass": "icon-download",
-                        "depends": ["exportService"]
-                    }
-                ]
-            }
+    legacyRegistry.register("example/export", {
+        "name": "Example of using CSV Export",
+        "extensions": {
+            "actions": [
+                {
+                    "key": "example.export",
+                    "name": "Export Telemetry as CSV",
+                    "implementation": ExportTelemetryAsCSVAction,
+                    "category": "contextual",
+                    "cssClass": "icon-download",
+                    "depends": [ "exportService" ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/example/forms/bundle.js
+++ b/example/forms/bundle.js
@@ -22,33 +22,32 @@
 /*global define*/

 define([
-    "./src/ExampleFormController"
+    "./src/ExampleFormController",
+    'legacyRegistry'
 ], function (
-    ExampleFormController
+    ExampleFormController,
+    legacyRegistry
 ) {
    "use strict";

-    return {
-        name:"example/forms",
-        definition: {
-            "name": "Declarative Forms example",
-            "sources": "src",
-            "extensions": {
-                "controllers": [
-                    {
-                        "key": "ExampleFormController",
-                        "implementation": ExampleFormController,
-                        "depends": [
-                            "$scope"
-                        ]
-                    }
-                ],
-                "routes": [
-                    {
-                        "templateUrl": "templates/exampleForm.html"
-                    }
-                ]
-            }
+    legacyRegistry.register("example/forms", {
+        "name": "Declarative Forms example",
+        "sources": "src",
+        "extensions": {
+            "controllers": [
+                {
+                    "key": "ExampleFormController",
+                    "implementation": ExampleFormController,
+                    "depends": [
+                        "$scope"
+                    ]
+                }
+            ],
+            "routes": [
+                {
+                    "templateUrl": "templates/exampleForm.html"
+                }
+            ]
        }
-    };
+    });
 });
--- 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
@@ -28,7 +28,7 @@ define([
 ) {

    var RED = {
-            sin: 0.9,
+            sin: 0.9, 
            cos: 0.9
        },
        YELLOW = {
@@ -74,7 +74,7 @@ define([
        return {
            evaluate: function (datum, valueMetadata) {
                var range = valueMetadata && valueMetadata.key;
-
+                
                if (datum[range] > RED[range]) {
                    return LIMITS.rh;
                }
--- 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",
--- a/example/identity/bundle.js
+++ b/example/identity/bundle.js
@@ -22,28 +22,27 @@
 /*global define*/

 define([
-    "./src/ExampleIdentityService"
+    "./src/ExampleIdentityService",
+    'legacyRegistry'
 ], function (
-    ExampleIdentityService
+    ExampleIdentityService,
+    legacyRegistry
 ) {
    "use strict";

-    return {
-        name:"example/identity",
-        definition: {
-            "extensions": {
-                "components": [
-                    {
-                        "implementation": ExampleIdentityService,
-                        "provides": "identityService",
-                        "type": "provider",
-                        "depends": [
-                            "dialogService",
-                            "$q"
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("example/identity", {
+        "extensions": {
+            "components": [
+                {
+                    "implementation": ExampleIdentityService,
+                    "provides": "identityService",
+                    "type": "provider",
+                    "depends": [
+                        "dialogService",
+                        "$q"
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/example/imagery/plugin.js
+++ b/example/imagery/plugin.js
@@ -22,31 +22,31 @@

 define([

-], function (
+], function(

 ) {
    function ImageryPlugin() {

        var IMAGE_SAMPLES = [
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18731.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18732.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18733.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18734.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18735.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18736.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18737.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18738.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18739.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18740.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18741.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18742.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18743.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18744.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18745.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18746.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18747.jpg",
-            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18748.jpg"
-        ];
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18731.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18732.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18733.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18734.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18735.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18736.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18737.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18738.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18739.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18740.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18741.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18742.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18743.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18744.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18745.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18746.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18747.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18748.jpg"
+            ];

        function pointForTimestamp(timestamp, name) {
            return {
@@ -65,7 +65,7 @@ define([
                    callback(pointForTimestamp(Date.now(), domainObject.name));
                }, 5000);

-                return function () {
+                return function (interval) {
                    clearInterval(interval);
                };
            }
--- a/example/mobile/bundle.js
+++ b/example/mobile/bundle.js
@@ -21,22 +21,25 @@
 *****************************************************************************/
 /*global define*/

-define([], function () {
+define([
+    
+    'legacyRegistry'
+], function (
+    
+    legacyRegistry
+) {
    "use strict";

-    return {
-        name:"example/mobile",
-        definition: {
-            "name": "Mobile",
-            "description": "Allows elements with pertinence to mobile usage and development",
-            "extensions": {
-                "stylesheets": [
-                    {
-                        "stylesheetUrl": "css/mobile-example.css",
-                        "priority": "mandatory"
-                    }
-                ]
-            }
+    legacyRegistry.register("example/mobile", {
+        "name": "Mobile",
+        "description": "Allows elements with pertinence to mobile usage and development",
+        "extensions": {
+            "stylesheets": [
+                {
+                    "stylesheetUrl": "css/mobile-example.css",
+                    "priority": "mandatory"
+                }
+            ]
        }
-    };
+    });
 });
--- a/example/msl/bundle.js
+++ b/example/msl/bundle.js
@@ -24,92 +24,92 @@
 define([
    "./src/RemsTelemetryServerAdapter",
    "./src/RemsTelemetryModelProvider",
-    "./src/RemsTelemetryProvider"
+    "./src/RemsTelemetryProvider",
+    'legacyRegistry',
+    "module"
 ], function (
    RemsTelemetryServerAdapter,
    RemsTelemetryModelProvider,
-    RemsTelemetryProvider
+    RemsTelemetryProvider,
+    legacyRegistry
 ) {
    "use strict";
-    return {
-        name:"example/msl",
-        definition: {
-            "name" : "Mars Science Laboratory Data Adapter",
-            "extensions" : {
-                "types": [
-                    {
-                        "name":"Mars Science Laboratory",
-                        "key": "msl.curiosity",
-                        "cssClass": "icon-object"
-                    },
-                    {
-                        "name": "Instrument",
-                        "key": "msl.instrument",
-                        "cssClass": "icon-object",
-                        "model": {"composition": []}
-                    },
-                    {
-                        "name": "Measurement",
-                        "key": "msl.measurement",
-                        "cssClass": "icon-telemetry",
-                        "model": {"telemetry": {}},
-                        "telemetry": {
-                            "source": "rems.source",
-                            "domains": [
-                                {
-                                    "name": "Time",
-                                    "key": "utc",
-                                    "format": "utc"
-                                }
-                            ]
-                        }
+    legacyRegistry.register("example/msl", {
+        "name" : "Mars Science Laboratory Data Adapter",
+        "extensions" : {
+            "types": [
+                {
+                    "name":"Mars Science Laboratory",
+                    "key": "msl.curiosity",
+                    "cssClass": "icon-object"
+                },
+                {
+                    "name": "Instrument",
+                    "key": "msl.instrument",
+                    "cssClass": "icon-object",
+                    "model": {"composition": []}
+                },
+                {
+                    "name": "Measurement",
+                    "key": "msl.measurement",
+                    "cssClass": "icon-telemetry",
+                    "model": {"telemetry": {}},
+                    "telemetry": {
+                        "source": "rems.source",
+                        "domains": [
+                            {
+                                "name": "Time",
+                                "key": "utc",
+                                "format": "utc"
+                            }
+                        ]
                    }
-                ],
-                "constants": [
-                    {
-                        "key": "REMS_WS_URL",
-                        "value": "/proxyUrl?url=http://cab.inta-csic.es/rems/wp-content/plugins/marsweather-widget/api.php"
+                }
+            ],
+            "constants": [
+                {
+                    "key": "REMS_WS_URL",
+                    "value": "/proxyUrl?url=http://cab.inta-csic.es/rems/wp-content/plugins/marsweather-widget/api.php"
+                }
+            ],
+            "roots": [
+                {
+                    "id": "msl:curiosity"
+                }
+            ],
+            "models": [
+                {
+                    "id": "msl:curiosity",
+                    "priority": "preferred",
+                    "model": {
+                        "type": "msl.curiosity",
+                        "name": "Mars Science Laboratory",
+                        "composition": ["msl_tlm:rems"]
                    }
-                ],
-                "roots": [
-                    {
-                        "id": "msl:curiosity"
-                    }
-                ],
-                "models": [
-                    {
-                        "id": "msl:curiosity",
-                        "priority": "preferred",
-                        "model": {
-                            "type": "msl.curiosity",
-                            "name": "Mars Science Laboratory",
-                            "composition": ["msl_tlm:rems"]
-                        }
-                    }
-                ],
-                "services": [
-                    {
-                        "key":"rems.adapter",
-                        "implementation": RemsTelemetryServerAdapter,
-                        "depends": ["$http", "$log", "REMS_WS_URL"]
-                    }
-                ],
-                "components": [
-                    {
-                        "provides": "modelService",
-                        "type": "provider",
-                        "implementation": RemsTelemetryModelProvider,
-                        "depends": ["rems.adapter"]
-                    },
-                    {
-                        "provides": "telemetryService",
-                        "type": "provider",
-                        "implementation": RemsTelemetryProvider,
-                        "depends": ["rems.adapter", "$q"]
-                    }
-                ]
-            }
+                }
+            ],
+            "services": [
+                {
+                    "key":"rems.adapter",
+                    "implementation": RemsTelemetryServerAdapter,
+                    "depends": ["$http", "$log", "REMS_WS_URL"]
+                }
+            ],
+            "components": [
+                {
+                    "provides": "modelService",
+                    "type": "provider",
+                    "implementation": RemsTelemetryModelProvider,
+                    "depends": ["rems.adapter"]
+                },
+                {
+                    "provides": "telemetryService",
+                    "type": "provider",
+                    "implementation": RemsTelemetryProvider,
+                    "depends": ["rems.adapter", "$q"]
+                }
+            ]
        }
-    };
+    });
 });

--- a/example/msl/src/MSLDataDictionary.js
+++ b/example/msl/src/MSLDataDictionary.js
@@ -76,4 +76,4 @@ 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,8 +54,8 @@ define(
         * @returns {number} A count of the number of data values available in
         * this series
         */
-        RemsTelemetrySeries.prototype.getPointCount = function () {
-            return this.data.length;
+        RemsTelemetrySeries.prototype.getPointCount = function() {
+                    return this.data.length;
        };
        /**
         * The domain value at the given index. The Rems telemetry data is
@@ -64,8 +64,8 @@ define(
         * @param index
         * @returns {number} the time value in ms since 1 January 1970
         */
-        RemsTelemetrySeries.prototype.getDomainValue = function (index) {
-            return this.data[index].date;
+        RemsTelemetrySeries.prototype.getDomainValue = function(index) {
+                    return this.data[index].date;
        };

        /**
@@ -75,8 +75,8 @@ define(
         * value of.
         * @returns {number} A floating point number
         */
-        RemsTelemetrySeries.prototype.getRangeValue = function (index) {
-            return this.data[index].value;
+        RemsTelemetrySeries.prototype.getRangeValue = function(index) {
+                    return this.data[index].value;
        };

        return RemsTelemetrySeries;
--- 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,65 +27,64 @@ 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";

-    return {
-        name:"example/notifications",
-        definition: {
-            "extensions": {
-                "templates": [
-                    {
-                        "key": "dialogLaunchTemplate",
-                        "template": DialogLaunch
-                    },
-                    {
-                        "key": "notificationLaunchTemplate",
-                        "template": NotificationLaunch
-                    }
-                ],
-                "controllers": [
-                    {
-                        "key": "DialogLaunchController",
-                        "implementation": DialogLaunchController,
-                        "depends": [
-                            "$scope",
-                            "$timeout",
-                            "$log",
-                            "dialogService",
-                            "notificationService"
-                        ]
-                    },
-                    {
-                        "key": "NotificationLaunchController",
-                        "implementation": NotificationLaunchController,
-                        "depends": [
-                            "$scope",
-                            "$timeout",
-                            "$log",
-                            "notificationService"
-                        ]
-                    }
-                ],
-                "indicators": [
-                    {
-                        "implementation": DialogLaunchIndicator,
-                        "priority": "fallback"
-                    },
-                    {
-                        "implementation": NotificationLaunchIndicator,
-                        "priority": "fallback"
-                    }
-                ]
-            }
+    legacyRegistry.register("example/notifications", {
+        "extensions": {
+            "templates": [
+                {
+                    "key": "dialogLaunchTemplate",
+                    "template": DialogLaunch
+                },
+                {
+                    "key": "notificationLaunchTemplate",
+                    "template": NotificationLaunch
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "DialogLaunchController",
+                    "implementation": DialogLaunchController,
+                    "depends": [
+                        "$scope",
+                        "$timeout",
+                        "$log",
+                        "dialogService",
+                        "notificationService"
+                    ]
+                },
+                {
+                    "key": "NotificationLaunchController",
+                    "implementation": NotificationLaunchController,
+                    "depends": [
+                        "$scope",
+                        "$timeout",
+                        "$log",
+                        "notificationService"
+                    ]
+                }
+            ],
+            "indicators": [
+                {
+                    "implementation": DialogLaunchIndicator,
+                    "priority": "fallback"
+                },
+                {
+                    "implementation": NotificationLaunchIndicator,
+                    "priority": "fallback"
+                }
+            ]
        }
-    };
+    });
 });
--- a/example/notifications/src/DialogLaunchController.js
+++ b/example/notifications/src/DialogLaunchController.js
@@ -137,12 +137,12 @@ define(
                        " attention to an event.",
                        severity: "info",
                        primaryOption: {
-                            label: "OK",
-                            callback: function () {
-                                $log.debug("OK Pressed");
-                                dialog.dismiss();
+                                label: "OK",
+                                callback: function () {
+                                    $log.debug("OK Pressed");
+                                    dialog.dismiss();
+                                }
                            }
-                        }
                    };

                dialog = dialogService.showBlockingMessage(model);
--- a/example/persistence/bundle.js
+++ b/example/persistence/bundle.js
@@ -22,34 +22,33 @@
 /*global define*/

 define([
-    "./src/BrowserPersistenceProvider"
+    "./src/BrowserPersistenceProvider",
+    'legacyRegistry'
 ], function (
-    BrowserPersistenceProvider
+    BrowserPersistenceProvider,
+    legacyRegistry
 ) {
    "use strict";

-    return {
-        name:"example/persistence",
-        definition: {
-            "extensions": {
-                "components": [
-                    {
-                        "provides": "persistenceService",
-                        "type": "provider",
-                        "implementation": BrowserPersistenceProvider,
-                        "depends": [
-                            "$q",
-                            "PERSISTENCE_SPACE"
-                        ]
-                    }
-                ],
-                "constants": [
-                    {
-                        "key": "PERSISTENCE_SPACE",
-                        "value": "mct"
-                    }
-                ]
-            }
+    legacyRegistry.register("example/persistence", {
+        "extensions": {
+            "components": [
+                {
+                    "provides": "persistenceService",
+                    "type": "provider",
+                    "implementation": BrowserPersistenceProvider,
+                    "depends": [
+                        "$q",
+                        "PERSISTENCE_SPACE"
+                    ]
+                }
+            ],
+            "constants": [
+                {
+                    "key": "PERSISTENCE_SPACE",
+                    "value": "mct"
+                }
+            ]
        }
-    };
+    });
 });
--- a/example/policy/bundle.js
+++ b/example/policy/bundle.js
@@ -22,25 +22,24 @@
 /*global define*/

 define([
-    "./src/ExamplePolicy"
+    "./src/ExamplePolicy",
+    'legacyRegistry'
 ], function (
-    ExamplePolicy
+    ExamplePolicy,
+    legacyRegistry
 ) {
    "use strict";

-    return {
-        name:"example/policy",
-        definition: {
-            "name": "Example Policy",
-            "description": "Provides an example of using policies to prohibit actions.",
-            "extensions": {
-                "policies": [
-                    {
-                        "implementation": ExamplePolicy,
-                        "category": "action"
-                    }
-                ]
-            }
+    legacyRegistry.register("example/policy", {
+        "name": "Example Policy",
+        "description": "Provides an example of using policies to prohibit actions.",
+        "extensions": {
+            "policies": [
+                {
+                    "implementation": ExamplePolicy,
+                    "category": "action"
+                }
+            ]
        }
-    };
+    });
 });
--- a/example/profiling/bundle.js
+++ b/example/profiling/bundle.js
@@ -23,34 +23,33 @@

 define([
    "./src/WatchIndicator",
-    "./src/DigestIndicator"
+    "./src/DigestIndicator",
+    'legacyRegistry'
 ], function (
    WatchIndicator,
-    DigestIndicator
+    DigestIndicator,
+    legacyRegistry
 ) {
    "use strict";

-    return {
-        name:"example/profiling",
-        definition: {
-            "extensions": {
-                "indicators": [
-                    {
-                        "implementation": WatchIndicator,
-                        "depends": [
-                            "$interval",
-                            "$rootScope"
-                        ]
-                    },
-                    {
-                        "implementation": DigestIndicator,
-                        "depends": [
-                            "$interval",
-                            "$rootScope"
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("example/profiling", {
+        "extensions": {
+            "indicators": [
+                {
+                    "implementation": WatchIndicator,
+                    "depends": [
+                        "$interval",
+                        "$rootScope"
+                    ]
+                },
+                {
+                    "implementation": DigestIndicator,
+                    "depends": [
+                        "$interval",
+                        "$rootScope"
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/example/scratchpad/bundle.js
+++ b/example/scratchpad/bundle.js
@@ -22,43 +22,42 @@
 /*global define*/

 define([
-    "./src/ScratchPersistenceProvider"
+    "./src/ScratchPersistenceProvider",
+    'legacyRegistry'
 ], function (
-    ScratchPersistenceProvider
+    ScratchPersistenceProvider,
+    legacyRegistry
 ) {
    "use strict";

-    return {
-        name:"example/scratchpad",
-        definition: {
-            "extensions": {
-                "roots": [
-                    {
-                        "id": "scratch:root"
-                    }
-                ],
-                "models": [
-                    {
-                        "id": "scratch:root",
-                        "model": {
-                            "type": "folder",
-                            "composition": [],
-                            "name": "Scratchpad"
-                        },
-                        "priority": "preferred"
-                    }
-                ],
-                "components": [
-                    {
-                        "provides": "persistenceService",
-                        "type": "provider",
-                        "implementation": ScratchPersistenceProvider,
-                        "depends": [
-                            "$q"
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("example/scratchpad", {
+        "extensions": {
+            "roots": [
+                {
+                    "id": "scratch:root"
+                }
+            ],
+            "models": [
+                {
+                    "id": "scratch:root",
+                    "model": {
+                        "type": "folder",
+                        "composition": [],
+                        "name": "Scratchpad"
+                    },
+                    "priority": "preferred"
+                }
+            ],
+            "components": [
+                {
+                    "provides": "persistenceService",
+                    "type": "provider",
+                    "implementation": ScratchPersistenceProvider,
+                    "depends": [
+                        "$q"
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/example/scratchpad/src/ScratchPersistenceProvider.js
+++ b/example/scratchpad/src/ScratchPersistenceProvider.js
@@ -60,7 +60,7 @@ define(
        ScratchPersistenceProvider.prototype.readObject = function (space, key) {
            return this.$q.when(
                (space === 'scratch' && this.table[key]) ?
-                    JSON.parse(this.table[key]) : undefined
+                        JSON.parse(this.table[key]) : undefined
            );
        };

--- a/example/simpleVuePlugin/plugin.js
+++ b/example/simpleVuePlugin/plugin.js
@@ -1,8 +1,10 @@
 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,7 +8,8 @@ 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,
@@ -19,14 +20,13 @@ define([
    glyphsTemplate,
    controlsTemplate,
    inputTemplate,
-    menusTemplate
+    menusTemplate,
+    legacyRegistry
 ) {
-    return {
-        name:"example/styleguide",
-        definition: {
-            "name": "Open MCT Style Guide",
-            "description": "Examples and documentation illustrating UI styles in use in Open MCT.",
-            "extensions":
+    legacyRegistry.register("example/styleguide", {
+        "name": "Open MCT Style Guide",
+        "description": "Examples and documentation illustrating UI styles in use in Open MCT.",
+        "extensions":
        {
            "types": [
                { "key": "styleguide.intro", "name": "Introduction", "cssClass": "icon-page", "description": "Introduction and overview to the style guide" },
@@ -103,6 +103,5 @@ 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.standards = { name: "Standards", type: "styleguide.standards", location: "styleguide:home" };
-            pages.colors = { name: "Colors", type: "styleguide.colors", 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.controls = { name: "Controls", type: "styleguide.controls", 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['intro'] = { name: "Introduction", type: "styleguide.intro", location: "styleguide:home" };
+            pages['standards'] = { name: "Standards", type: "styleguide.standards", location: "styleguide:home" };
+            pages['colors'] = { name: "Colors", type: "styleguide.colors", 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['controls'] = { name: "Controls", type: "styleguide.controls", 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" };

            return {
                getModels: function () {
@@ -48,4 +48,4 @@ define(

        return ExampleStyleGuideModelProvider
    }
-);
+);
--- a/package.json
+++ b/package.json
@@ -12,7 +12,6 @@
    "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",
@@ -24,7 +23,6 @@
    "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",
@@ -76,13 +74,13 @@
  },
  "scripts": {
    "start": "node app.js",
-    "lint": "eslint platform example src/**/*.{js,vue} openmct.js",
-    "lint:fix": "eslint platform example src/**/*.{js,vue} openmct.js --fix",
-    "build:prod": "cross-env NODE_ENV=production webpack",
+    "lint": "eslint platform src openmct.js",
+    "lint:fix": "eslint platform src openmct.js --fix",
+    "build:prod": "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-debug": "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,7 +31,8 @@ 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,
@@ -43,139 +44,137 @@ define([
    licenseApacheTemplate,
    licenseMitTemplate,
    licensesTemplate,
-    licensesExportMdTemplate
+    licensesExportMdTemplate,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/commonUI/about",
-        definition: {
-            "name": "About Open MCT",
-            "extensions": {
-                "templates": [
-                    {
-                        "key": "app-logo",
-                        "priority": "optional",
-                        "template": appLogoTemplate
-                    },
-                    {
-                        "key": "about-logo",
-                        "priority": "preferred",
-                        "template": aboutLogoTemplate
-                    },
-                    {
-                        "key": "about-dialog",
-                        "template": aboutDialogTemplate
-                    },
-                    {
-                        "key": "overlay-about",
-                        "template": overlayAboutTemplate
-                    },
-                    {
-                        "key": "license-apache",
-                        "template": licenseApacheTemplate
-                    },
-                    {
-                        "key": "license-mit",
-                        "template": licenseMitTemplate
-                    }
-                ],
-                "controllers": [
-                    {
-                        "key": "LogoController",
-                        "depends": [
-                            "overlayService"
-                        ],
-                        "implementation": LogoController
-                    },
-                    {
-                        "key": "AboutController",
-                        "depends": [
-                            "versions[]",
-                            "$window"
-                        ],
-                        "implementation": AboutController
-                    },
-                    {
-                        "key": "LicenseController",
-                        "depends": [
-                            "licenses[]"
-                        ],
-                        "implementation": LicenseController
-                    }
-                ],
-                "licenses": [
-                    {
-                        "name": "Json.NET",
-                        "version": "6.0.8",
-                        "author": "Newtonsoft",
-                        "description": "JSON serialization/deserialization",
-                        "website": "http://www.newtonsoft.com/json",
-                        "copyright": "Copyright (c) 2007 James Newton-King",
-                        "license": "license-mit",
-                        "link": "https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md"
-                    },
-                    {
-                        "name": "Nancy",
-                        "version": "0.23.2",
-                        "author": "Andreas Håkansson, Steven Robbins and contributors",
-                        "description": "Embedded web server",
-                        "website": "http://nancyfx.org/",
-                        "copyright": "Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors",
-                        "license": "license-mit",
-                        "link": "http://www.opensource.org/licenses/mit-license.php"
-                    },
-                    {
-                        "name": "Nancy.Hosting.Self",
-                        "version": "0.23.2",
-                        "author": "Andreas Håkansson, Steven Robbins and contributors",
-                        "description": "Embedded web server",
-                        "website": "http://nancyfx.org/",
-                        "copyright": "Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors",
-                        "license": "license-mit",
-                        "link": "http://www.opensource.org/licenses/mit-license.php"
-                    },
-                    {
-                        "name": "SuperSocket",
-                        "version": "0.9.0.2",
-                        "author": " Kerry Jiang",
-                        "description": "Supports SuperWebSocket",
-                        "website": "https://supersocket.codeplex.com/",
-                        "copyright": "Copyright 2010-2014 Kerry Jiang (kerry-jiang@hotmail.com)",
-                        "license": "license-apache",
-                        "link": "https://supersocket.codeplex.com/license"
-                    },
-                    {
-                        "name": "SuperWebSocket",
-                        "version": "0.9.0.2",
-                        "author": " Kerry Jiang",
-                        "description": "WebSocket implementation for client-server communication",
-                        "website": "https://superwebsocket.codeplex.com/",
-                        "copyright": "Copyright 2010-2014 Kerry Jiang (kerry-jiang@hotmail.com)",
-                        "license": "license-apache",
-                        "link": "https://superwebsocket.codeplex.com/license"
-                    },
-                    {
-                        "name": "log4net",
-                        "version": "2.0.3",
-                        "author": "Apache Software Foundation",
-                        "description": "Logging",
-                        "website": "http://logging.apache.org/log4net/",
-                        "copyright": "Copyright © 2004-2015 Apache Software Foundation.",
-                        "license": "license-apache",
-                        "link": "http://logging.apache.org/log4net/license.html"
-                    }
-                ],
-                "routes": [
-                    {
-                        "when": "/licenses",
-                        "template": licensesTemplate
-                    },
-                    {
-                        "when": "/licenses-md",
-                        "template": licensesExportMdTemplate
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/commonUI/about", {
+        "name": "About Open MCT",
+        "extensions": {
+            "templates": [
+                {
+                    "key": "app-logo",
+                    "priority": "optional",
+                    "template": appLogoTemplate
+                },
+                {
+                    "key": "about-logo",
+                    "priority": "preferred",
+                    "template": aboutLogoTemplate
+                },
+                {
+                    "key": "about-dialog",
+                    "template": aboutDialogTemplate
+                },
+                {
+                    "key": "overlay-about",
+                    "template": overlayAboutTemplate
+                },
+                {
+                    "key": "license-apache",
+                    "template": licenseApacheTemplate
+                },
+                {
+                    "key": "license-mit",
+                    "template": licenseMitTemplate
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "LogoController",
+                    "depends": [
+                        "overlayService"
+                    ],
+                    "implementation": LogoController
+                },
+                {
+                    "key": "AboutController",
+                    "depends": [
+                        "versions[]",
+                        "$window"
+                    ],
+                    "implementation": AboutController
+                },
+                {
+                    "key": "LicenseController",
+                    "depends": [
+                        "licenses[]"
+                    ],
+                    "implementation": LicenseController
+                }
+            ],
+            "licenses": [
+                {
+                    "name": "Json.NET",
+                    "version": "6.0.8",
+                    "author": "Newtonsoft",
+                    "description": "JSON serialization/deserialization",
+                    "website": "http://www.newtonsoft.com/json",
+                    "copyright": "Copyright (c) 2007 James Newton-King",
+                    "license": "license-mit",
+                    "link": "https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md"
+                },
+                {
+                    "name": "Nancy",
+                    "version": "0.23.2",
+                    "author": "Andreas Håkansson, Steven Robbins and contributors",
+                    "description": "Embedded web server",
+                    "website": "http://nancyfx.org/",
+                    "copyright": "Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors",
+                    "license": "license-mit",
+                    "link": "http://www.opensource.org/licenses/mit-license.php"
+                },
+                {
+                    "name": "Nancy.Hosting.Self",
+                    "version": "0.23.2",
+                    "author": "Andreas Håkansson, Steven Robbins and contributors",
+                    "description": "Embedded web server",
+                    "website": "http://nancyfx.org/",
+                    "copyright": "Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors",
+                    "license": "license-mit",
+                    "link": "http://www.opensource.org/licenses/mit-license.php"
+                },
+                {
+                    "name": "SuperSocket",
+                    "version": "0.9.0.2",
+                    "author": " Kerry Jiang",
+                    "description": "Supports SuperWebSocket",
+                    "website": "https://supersocket.codeplex.com/",
+                    "copyright": "Copyright 2010-2014 Kerry Jiang (kerry-jiang@hotmail.com)",
+                    "license": "license-apache",
+                    "link": "https://supersocket.codeplex.com/license"
+                },
+                {
+                    "name": "SuperWebSocket",
+                    "version": "0.9.0.2",
+                    "author": " Kerry Jiang",
+                    "description": "WebSocket implementation for client-server communication",
+                    "website": "https://superwebsocket.codeplex.com/",
+                    "copyright": "Copyright 2010-2014 Kerry Jiang (kerry-jiang@hotmail.com)",
+                    "license": "license-apache",
+                    "link": "https://superwebsocket.codeplex.com/license"
+                },
+                {
+                    "name": "log4net",
+                    "version": "2.0.3",
+                    "author": "Apache Software Foundation",
+                    "description": "Logging",
+                    "website": "http://logging.apache.org/log4net/",
+                    "copyright": "Copyright © 2004-2015 Apache Software Foundation.",
+                    "license": "license-apache",
+                    "link": "http://logging.apache.org/log4net/license.html"
+                }
+            ],
+            "routes": [
+                {
+                    "when": "/licenses",
+                    "template": licensesTemplate
+                },
+                {
+                    "when": "/licenses-md",
+                    "template": licensesExportMdTemplate
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/commonUI/browse/bundle.js
+++ b/platform/commonUI/browse/bundle.js
@@ -32,7 +32,8 @@ 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 (
    NavigationService,
    NavigateAction,
@@ -45,133 +46,131 @@ define([
    menuArrowTemplate,
    backArrowTemplate,
    objectPropertiesTemplate,
-    inspectorRegionTemplate
+    inspectorRegionTemplate,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/commonUI/browse",
-        definition: {
-            "extensions": {
-                "routes": [
-                ],
-                "constants": [
-                    {
-                        "key": "DEFAULT_PATH",
-                        "value": "mine",
-                        "priority": "fallback"
-                    }
-                ],
-                "representations": [
-                    {
-                        "key": "browse-object",
-                        "template": browseObjectTemplate,
-                        "gestures": [
-                            "drop"
-                        ],
-                        "uses": [
-                            "view"
-                        ]
-                    },
-                    {
-                        "key": "object-header",
-                        "template": objectHeaderTemplate,
-                        "uses": [
-                            "type"
-                        ]
-                    },
-                    {
-                        "key": "object-header-frame",
-                        "template": objectHeaderFrameTemplate,
-                        "uses": [
-                            "type"
-                        ]
-                    },
-                    {
-                        "key": "menu-arrow",
-                        "template": menuArrowTemplate,
-                        "uses": [
-                            "action"
-                        ],
-                        "gestures": [
-                            "menu"
-                        ]
-                    },
-                    {
-                        "key": "back-arrow",
-                        "uses": [
-                            "context"
-                        ],
-                        "template": backArrowTemplate
-                    },
-                    {
-                        "key": "object-properties",
-                        "template": objectPropertiesTemplate
-                    },
-                    {
-                        "key": "inspector-region",
-                        "template": inspectorRegionTemplate
-                    }
-                ],
-                "services": [
-                    {
-                        "key": "navigationService",
-                        "implementation": NavigationService,
-                        "depends": [
-                            "$window"
-                        ]
-                    }
-                ],
-                "actions": [
-                    {
-                        "key": "navigate",
-                        "implementation": NavigateAction,
-                        "depends": [
-                            "navigationService"
-                        ]
-                    },
-                    {
-                        "key": "window",
-                        "name": "Open In New Tab",
-                        "implementation": NewTabAction,
-                        "description": "Open in a new browser tab",
-                        "category": [
-                            "view-control",
-                            "contextual"
-                        ],
-                        "depends": [
-                            "urlService",
-                            "$window"
-                        ],
-                        "group": "windowing",
-                        "cssClass": "icon-new-window",
-                        "priority": "preferred"
-                    }
-                ],
-                "runs": [
-                    {
-                        "implementation": OrphanNavigationHandler,
-                        "depends": [
-                            "throttle",
-                            "topic",
-                            "navigationService"
-                        ]
-                    }
-                ],
-                "templates": [
-                    {
-                        key: "browseRoot",
-                        template: browseTemplate
-                    },
-                    {
-                        key: "browseObject",
-                        template: browseObjectTemplate
-                    },
-                    {
-                        key: "inspectorRegion",
-                        template: inspectorRegionTemplate
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/commonUI/browse", {
+        "extensions": {
+            "routes": [
+            ],
+            "constants": [
+                {
+                    "key": "DEFAULT_PATH",
+                    "value": "mine",
+                    "priority": "fallback"
+                }
+            ],
+            "representations": [
+                {
+                    "key": "browse-object",
+                    "template": browseObjectTemplate,
+                    "gestures": [
+                        "drop"
+                    ],
+                    "uses": [
+                        "view"
+                    ]
+                },
+                {
+                    "key": "object-header",
+                    "template": objectHeaderTemplate,
+                    "uses": [
+                        "type"
+                    ]
+                },
+                {
+                    "key": "object-header-frame",
+                    "template": objectHeaderFrameTemplate,
+                    "uses": [
+                        "type"
+                    ]
+                },
+                {
+                    "key": "menu-arrow",
+                    "template": menuArrowTemplate,
+                    "uses": [
+                        "action"
+                    ],
+                    "gestures": [
+                        "menu"
+                    ]
+                },
+                {
+                    "key": "back-arrow",
+                    "uses": [
+                        "context"
+                    ],
+                    "template": backArrowTemplate
+                },
+                {
+                    "key": "object-properties",
+                    "template": objectPropertiesTemplate
+                },
+                {
+                    "key": "inspector-region",
+                    "template": inspectorRegionTemplate
+                }
+            ],
+            "services": [
+                {
+                    "key": "navigationService",
+                    "implementation": NavigationService,
+                    "depends": [
+                        "$window"
+                    ]
+                }
+            ],
+            "actions": [
+                {
+                    "key": "navigate",
+                    "implementation": NavigateAction,
+                    "depends": [
+                        "navigationService"
+                    ]
+                },
+                {
+                    "key": "window",
+                    "name": "Open In New Tab",
+                    "implementation": NewTabAction,
+                    "description": "Open in a new browser tab",
+                    "category": [
+                        "view-control",
+                        "contextual"
+                    ],
+                    "depends": [
+                        "urlService",
+                        "$window"
+                    ],
+                    "group": "windowing",
+                    "cssClass": "icon-new-window",
+                    "priority": "preferred"
+                }
+            ],
+            "runs": [
+                {
+                    "implementation": OrphanNavigationHandler,
+                    "depends": [
+                        "throttle",
+                        "topic",
+                        "navigationService"
+                    ]
+                }
+            ],
+            "templates": [
+                {
+                    key: "browseRoot",
+                    template: browseTemplate
+                },
+                {
+                    key: "browseObject",
+                    template: browseObjectTemplate
+                },
+                {
+                    key: "inspectorRegion",
+                    template: inspectorRegionTemplate
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/commonUI/dialog/bundle.js
+++ b/platform/commonUI/dialog/bundle.js
@@ -30,7 +30,8 @@ define([
    "./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,
@@ -41,72 +42,70 @@ define([
    messageTemplate,
    notificationMessageTemplate,
    overlayMessageListTemplate,
-    overlayTemplate
+    overlayTemplate,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/commonUI/dialog",
-        definition: {
-            "extensions": {
-                "services": [
-                    {
-                        "key": "dialogService",
-                        "implementation": DialogService,
-                        "depends": [
-                            "overlayService",
-                            "$q",
-                            "$log",
-                            "$document"
-                        ]
-                    },
-                    {
-                        "key": "overlayService",
-                        "implementation": OverlayService,
-                        "depends": [
-                            "$document",
-                            "$compile",
-                            "$rootScope",
-                            "$timeout"
-                        ]
-                    }
-                ],
-                "templates": [
-                    {
-                        "key": "overlay-dialog",
-                        "template": overlayDialogTemplate
-                    },
-                    {
-                        "key": "overlay-options",
-                        "template": overlayOptionsTemplate
-                    },
-                    {
-                        "key": "form-dialog",
-                        "template": dialogTemplate
-                    },
-                    {
-                        "key": "overlay-blocking-message",
-                        "template": overlayBlockingMessageTemplate
-                    },
-                    {
-                        "key": "message",
-                        "template": messageTemplate
-                    },
-                    {
-                        "key": "notification-message",
-                        "template": notificationMessageTemplate
-                    },
-                    {
-                        "key": "overlay-message-list",
-                        "template": overlayMessageListTemplate
-                    }
-                ],
-                "containers": [
-                    {
-                        "key": "overlay",
-                        "template": overlayTemplate
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/commonUI/dialog", {
+        "extensions": {
+            "services": [
+                {
+                    "key": "dialogService",
+                    "implementation": DialogService,
+                    "depends": [
+                        "overlayService",
+                        "$q",
+                        "$log",
+                        "$document"
+                    ]
+                },
+                {
+                    "key": "overlayService",
+                    "implementation": OverlayService,
+                    "depends": [
+                        "$document",
+                        "$compile",
+                        "$rootScope",
+                        "$timeout"
+                    ]
+                }
+            ],
+            "templates": [
+                {
+                    "key": "overlay-dialog",
+                    "template": overlayDialogTemplate
+                },
+                {
+                    "key": "overlay-options",
+                    "template": overlayOptionsTemplate
+                },
+                {
+                    "key": "form-dialog",
+                    "template": dialogTemplate
+                },
+                {
+                    "key": "overlay-blocking-message",
+                    "template": overlayBlockingMessageTemplate
+                },
+                {
+                    "key": "message",
+                    "template": messageTemplate
+                },
+                {
+                    "key": "notification-message",
+                    "template": notificationMessageTemplate
+                },
+                {
+                    "key": "overlay-message-list",
+                    "template": overlayMessageListTemplate
+                }
+            ],
+            "containers": [
+                {
+                    "key": "overlay",
+                    "template": overlayTemplate
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/commonUI/edit/bundle.js
+++ b/platform/commonUI/edit/bundle.js
@@ -48,7 +48,8 @@ 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,
@@ -77,277 +78,276 @@ define([
    libraryTemplate,
    editObjectTemplate,
    editActionButtonsTemplate,
-    topbarEditTemplate
+    topbarEditTemplate,
+    legacyRegistry
 ) {
-    return {
-        name: "platform/commonUI/edit",
-        definition: {
-            "extensions": {
-                "controllers": [
-                    {
-                        "key": "EditActionController",
-                        "implementation": EditActionController,
-                        "depends": [
-                            "$scope"
-                        ]
-                    },
-                    {
-                        "key": "EditPanesController",
-                        "implementation": EditPanesController,
-                        "depends": [
-                            "$scope"
-                        ]
-                    },
-                    {
-                        "key": "EditObjectController",
-                        "implementation": EditObjectController,
-                        "depends": [
-                            "$scope",
-                            "$location",
-                            "navigationService"
-                        ]
-                    },
-                    {
-                        "key": "CreateMenuController",
-                        "implementation": CreateMenuController,
-                        "depends": [
-                            "$scope"
-                        ]
-                    },
-                    {
-                        "key": "LocatorController",
-                        "implementation": LocatorController,
-                        "depends": [
-                            "$scope",
-                            "$timeout",
-                            "objectService"
-                        ]
-                    }
-                ],
-                "actions": [
-                    {
-                        "key": "compose",
-                        "implementation": EditAndComposeAction
-                    },
-                    {
-                        "key": "edit",
-                        "implementation": EditAction,
-                        "depends": [
-                            "$location",
-                            "navigationService",
-                            "$log"
-                        ],
-                        "description": "Edit",
-                        "category": "view-control",
-                        "cssClass": "major icon-pencil"
-                    },
-                    {
-                        "key": "properties",
-                        "category": [
-                            "contextual",
-                            "view-control"
-                        ],
-                        "implementation": PropertiesAction,
-                        "cssClass": "major icon-pencil",
-                        "name": "Edit Properties...",
-                        "description": "Edit properties of this object.",
-                        "depends": [
-                            "dialogService"
-                        ]
-                    },
-                    {
-                        "key": "save-and-stop-editing",
-                        "category": "save",
-                        "implementation": SaveAndStopEditingAction,
-                        "name": "Save and Finish Editing",
-                        "cssClass": "icon-save labeled",
-                        "description": "Save changes made to these objects.",
-                        "depends": [
-                            "dialogService",
-                            "notificationService"
-                        ]
-                    },
-                    {
-                        "key": "save",
-                        "category": "save",
-                        "implementation": SaveAction,
-                        "name": "Save and Continue Editing",
-                        "cssClass": "icon-save labeled",
-                        "description": "Save changes made to these objects.",
-                        "depends": [
-                            "dialogService",
-                            "notificationService"
-                        ]
-                    },
-                    {
-                        "key": "save-as",
-                        "category": "save",
-                        "implementation": SaveAsAction,
-                        "name": "Save As...",
-                        "cssClass": "icon-save labeled",
-                        "description": "Save changes made to these objects.",
-                        "depends": [
-                            "$injector",
-                            "dialogService",
-                            "copyService",
-                            "notificationService",
-                            "openmct"
-                        ],
-                        "priority": "mandatory"
-                    },
-                    {
-                        "key": "cancel",
-                        "category": "conclude-editing",
-                        "implementation": CancelAction,
-                        // Because we use the name as label for edit buttons and mct-control buttons need
-                        // the label to be set to undefined in order to not apply the labeled CSS rule.
-                        "name": undefined,
-                        "cssClass": "icon-x no-label",
-                        "description": "Discard changes made to these objects.",
-                        "depends": []
-                    }
-                ],
-                "policies": [
-                    {
-                        "category": "action",
-                        "implementation": EditPersistableObjectsPolicy,
-                        "depends": ["openmct"]
-                    },
-                    {
-                        "implementation": CreationPolicy,
-                        "category": "creation"
-                    }
-                ],
-                "templates": [
-                    {
-                        "key": "edit-library",
-                        "template": libraryTemplate
-                    }
-                ],
-                "representations": [
-                    {
-                        "key": "edit-object",
-                        "template": editObjectTemplate,
-                        "uses": [
-                            "view"
-                        ],
-                        "gestures": [
-                            "drop"
-                        ]
-                    },
-                    {
-                        "key": "edit-action-buttons",
-                        "template": editActionButtonsTemplate,
-                        "uses": [
-                            "action"
-                        ]
-                    },
-                    {
-                        "key": "topbar-edit",
-                        "template": topbarEditTemplate
-                    },
-                    {
-                        "key": "create-button",
-                        "template": createButtonTemplate
-                    },
-                    {
-                        "key": "create-menu",
-                        "template": createMenuTemplate,
-                        "uses": [
-                            "action"
-                        ]
-                    }
-                ],
-                "components": [
-                    {
-                        "type": "decorator",
-                        "provides": "capabilityService",
-                        "implementation": TransactionCapabilityDecorator,
-                        "depends": [
-                            "$q",
-                            "transactionManager"
-                        ],
-                        "priority": "fallback"
-                    },
-                    {
-                        "type": "provider",
-                        "provides": "transactionService",
-                        "implementation": TransactionService,
-                        "depends": [
-                            "$q",
-                            "$log",
-                            "cacheService"
-                        ]
-                    },
-                    {
-                        "key": "CreateActionProvider",
-                        "provides": "actionService",
-                        "type": "provider",
-                        "implementation": CreateActionProvider,
-                        "depends": [
-                            "typeService",
-                            "policyService"
-                        ]
-                    },
-                    {
-                        "key": "CreationService",
-                        "provides": "creationService",
-                        "type": "provider",
-                        "implementation": CreationService,
-                        "depends": [
-                            "$q",
-                            "$log"
-                        ]
-                    }

-                ],
-                "representers": [
-                    {
-                        "implementation": EditRepresenter,
-                        "depends": [
-                            "$log"
-                        ]
+    legacyRegistry.register("platform/commonUI/edit", {
+        "extensions": {
+            "controllers": [
+                {
+                    "key": "EditActionController",
+                    "implementation": EditActionController,
+                    "depends": [
+                        "$scope"
+                    ]
+                },
+                {
+                    "key": "EditPanesController",
+                    "implementation": EditPanesController,
+                    "depends": [
+                        "$scope"
+                    ]
+                },
+                {
+                    "key": "EditObjectController",
+                    "implementation": EditObjectController,
+                    "depends": [
+                        "$scope",
+                        "$location",
+                        "navigationService"
+                    ]
+                },
+                {
+                    "key": "CreateMenuController",
+                    "implementation": CreateMenuController,
+                    "depends": [
+                        "$scope"
+                    ]
+                },
+                {
+                    "key": "LocatorController",
+                    "implementation": LocatorController,
+                    "depends": [
+                        "$scope",
+                        "$timeout",
+                        "objectService"
+                    ]
+                }
+            ],
+            "actions": [
+                {
+                    "key": "compose",
+                    "implementation": EditAndComposeAction
+                },
+                {
+                    "key": "edit",
+                    "implementation": EditAction,
+                    "depends": [
+                        "$location",
+                        "navigationService",
+                        "$log"
+                    ],
+                    "description": "Edit",
+                    "category": "view-control",
+                    "cssClass": "major icon-pencil"
+                },
+                {
+                    "key": "properties",
+                    "category": [
+                        "contextual",
+                        "view-control"
+                    ],
+                    "implementation": PropertiesAction,
+                    "cssClass": "major icon-pencil",
+                    "name": "Edit Properties...",
+                    "description": "Edit properties of this object.",
+                    "depends": [
+                        "dialogService"
+                    ]
+                },
+                {
+                    "key": "save-and-stop-editing",
+                    "category": "save",
+                    "implementation": SaveAndStopEditingAction,
+                    "name": "Save and Finish Editing",
+                    "cssClass": "icon-save labeled",
+                    "description": "Save changes made to these objects.",
+                    "depends": [
+                        "dialogService",
+                        "notificationService"
+                    ]
+                },
+                {
+                    "key": "save",
+                    "category": "save",
+                    "implementation": SaveAction,
+                    "name": "Save and Continue Editing",
+                    "cssClass": "icon-save labeled",
+                    "description": "Save changes made to these objects.",
+                    "depends": [
+                        "dialogService",
+                        "notificationService"
+                    ]
+                },
+                {
+                    "key": "save-as",
+                    "category": "save",
+                    "implementation": SaveAsAction,
+                    "name": "Save As...",
+                    "cssClass": "icon-save labeled",
+                    "description": "Save changes made to these objects.",
+                    "depends": [
+                        "$injector",
+                        "dialogService",
+                        "copyService",
+                        "notificationService",
+                        "openmct"
+                    ],
+                    "priority": "mandatory"
+                },
+                {
+                    "key": "cancel",
+                    "category": "conclude-editing",
+                    "implementation": CancelAction,
+                    // Because we use the name as label for edit buttons and mct-control buttons need
+                    // the label to be set to undefined in order to not apply the labeled CSS rule.
+                    "name": undefined,
+                    "cssClass": "icon-x no-label",
+                    "description": "Discard changes made to these objects.",
+                    "depends": []
+                }
+            ],
+            "policies": [
+                {
+                    "category": "action",
+                    "implementation": EditPersistableObjectsPolicy,
+                    "depends": ["openmct"]
+                },
+                {
+                    "implementation": CreationPolicy,
+                    "category": "creation"
+                }
+            ],
+            "templates": [
+                {
+                    "key": "edit-library",
+                    "template": libraryTemplate
+                }
+            ],
+            "representations": [
+                {
+                    "key": "edit-object",
+                    "template": editObjectTemplate,
+                    "uses": [
+                        "view"
+                    ],
+                    "gestures": [
+                        "drop"
+                    ]
+                },
+                {
+                    "key": "edit-action-buttons",
+                    "template": editActionButtonsTemplate,
+                    "uses": [
+                        "action"
+                    ]
+                },
+                {
+                    "key": "topbar-edit",
+                    "template": topbarEditTemplate
+                },
+                {
+                    "key": "create-button",
+                    "template": createButtonTemplate
+                },
+                {
+                    "key": "create-menu",
+                    "template": createMenuTemplate,
+                    "uses": [
+                        "action"
+                    ]
+                }
+            ],
+            "components": [
+                {
+                    "type": "decorator",
+                    "provides": "capabilityService",
+                    "implementation": TransactionCapabilityDecorator,
+                    "depends": [
+                        "$q",
+                        "transactionManager"
+                    ],
+                    "priority": "fallback"
+                },
+                {
+                    "type": "provider",
+                    "provides": "transactionService",
+                    "implementation": TransactionService,
+                    "depends": [
+                        "$q",
+                        "$log",
+                        "cacheService"
+                    ]
+                },
+                {
+                    "key": "CreateActionProvider",
+                    "provides": "actionService",
+                    "type": "provider",
+                    "implementation": CreateActionProvider,
+                    "depends": [
+                        "typeService",
+                        "policyService"
+                    ]
+                },
+                {
+                    "key": "CreationService",
+                    "provides": "creationService",
+                    "type": "provider",
+                    "implementation": CreationService,
+                    "depends": [
+                        "$q",
+                        "$log"
+                    ]
+                }
+
+            ],
+            "representers": [
+                {
+                    "implementation": EditRepresenter,
+                    "depends": [
+                        "$log"
+                    ]
+                }
+            ],
+            "capabilities": [
+                {
+                    "key": "editor",
+                    "name": "Editor Capability",
+                    "description": "Provides transactional editing capabilities",
+                    "implementation": EditorCapability,
+                    "depends": [
+                        "transactionService",
+                        "openmct"
+                    ]
+                }
+            ],
+            "controls": [
+                {
+                    "key": "locator",
+                    "template": locatorTemplate
+                }
+            ],
+            "services": [
+                {
+                    "key": "transactionManager",
+                    "implementation": TransactionManager,
+                    "depends": [
+                        "transactionService"
+                    ]
+                }
+            ],
+            "runs": [
+                {
+                    depends: [
+                        "toolbars[]",
+                        "openmct"
+                    ],
+                    implementation: function (toolbars, openmct) {
+                        toolbars.forEach(openmct.toolbars.addProvider, openmct.toolbars);
                    }
-                ],
-                "capabilities": [
-                    {
-                        "key": "editor",
-                        "name": "Editor Capability",
-                        "description": "Provides transactional editing capabilities",
-                        "implementation": EditorCapability,
-                        "depends": [
-                            "transactionService",
-                            "openmct"
-                        ]
-                    }
-                ],
-                "controls": [
-                    {
-                        "key": "locator",
-                        "template": locatorTemplate
-                    }
-                ],
-                "services": [
-                    {
-                        "key": "transactionManager",
-                        "implementation": TransactionManager,
-                        "depends": [
-                            "transactionService"
-                        ]
-                    }
-                ],
-                "runs": [
-                    {
-                        depends: [
-                            "toolbars[]",
-                            "openmct"
-                        ],
-                        implementation: function (toolbars, openmct) {
-                            toolbars.forEach(openmct.toolbars.addProvider, openmct.toolbars);
-                        }
-                    }
-                ]
-            }
+                }
+            ]
        }
-    };
+    });
 });
--- 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/formats/bundle.js
+++ b/platform/commonUI/formats/bundle.js
@@ -23,57 +23,56 @@
 define([
    "./src/FormatProvider",
    "./src/UTCTimeFormat",
-    "./src/DurationFormat"
+    "./src/DurationFormat",
+    'legacyRegistry'
 ], function (
    FormatProvider,
    UTCTimeFormat,
-    DurationFormat
+    DurationFormat,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/commonUI/formats",
-        definition: {
-            "name": "Format Registry",
-            "description": "Provides a registry for formats, which allow parsing and formatting of values.",
-            "extensions": {
-                "components": [
-                    {
-                        "provides": "formatService",
-                        "type": "provider",
-                        "implementation": FormatProvider,
-                        "depends": [
-                            "formats[]"
-                        ]
-                    }
-                ],
-                "formats": [
-                    {
-                        "key": "utc",
-                        "implementation": UTCTimeFormat
-                    },
-                    {
-                        "key": "duration",
-                        "implementation": DurationFormat
-                    }
-                ],
-                "constants": [
-                    {
-                        "key": "DEFAULT_TIME_FORMAT",
-                        "value": "utc"
-                    }
-                ],
-                "licenses": [
-                    {
-                        "name": "d3",
-                        "version": "3.0.0",
-                        "description": "Incorporates modified code from d3 Time Scales",
-                        "author": "Mike Bostock",
-                        "copyright": "Copyright 2010-2016 Mike Bostock. " +
+    legacyRegistry.register("platform/commonUI/formats", {
+        "name": "Format Registry",
+        "description": "Provides a registry for formats, which allow parsing and formatting of values.",
+        "extensions": {
+            "components": [
+                {
+                    "provides": "formatService",
+                    "type": "provider",
+                    "implementation": FormatProvider,
+                    "depends": [
+                        "formats[]"
+                    ]
+                }
+            ],
+            "formats": [
+                {
+                    "key": "utc",
+                    "implementation": UTCTimeFormat
+                },
+                {
+                    "key": "duration",
+                    "implementation": DurationFormat
+                }
+            ],
+            "constants": [
+                {
+                    "key": "DEFAULT_TIME_FORMAT",
+                    "value": "utc"
+                }
+            ],
+            "licenses": [
+                {
+                    "name": "d3",
+                    "version": "3.0.0",
+                    "description": "Incorporates modified code from d3 Time Scales",
+                    "author": "Mike Bostock",
+                    "copyright": "Copyright 2010-2016 Mike Bostock. " +
                    "All rights reserved.",
-                        "link": "https://github.com/d3/d3/blob/master/LICENSE"
-                    }
-                ]
-            }
+                    "link": "https://github.com/d3/d3/blob/master/LICENSE"
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/commonUI/general/bundle.js
+++ b/platform/commonUI/general/bundle.js
@@ -66,7 +66,8 @@ define([
    "./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",
+    'legacyRegistry'
 ], function (
    UrlService,
    PopupService,
@@ -113,417 +114,415 @@ define([
    objectInspectorTemplate,
    selectorTemplate,
    datetimePickerTemplate,
-    datetimeFieldTemplate
+    datetimeFieldTemplate,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/commonUI/general",
-        definition: {
-            "name": "General UI elements",
-            "description": "General UI elements, meant to be reused across modes",
-            "resources": "res",
-            "extensions": {
-                "services": [
-                    {
-                        "key": "urlService",
-                        "implementation": UrlService,
-                        "depends": [
-                            "$location"
-                        ]
-                    },
-                    {
-                        "key": "popupService",
-                        "implementation": PopupService,
-                        "depends": [
-                            "$document",
-                            "$window"
-                        ]
-                    }
-                ],
-                "runs": [
-                    {
-                        "implementation": StyleSheetLoader,
-                        "depends": [
-                            "stylesheets[]",
-                            "$document",
-                            "THEME",
-                            "ASSETS_PATH"
-                        ]
-                    },
-                    {
-                        "implementation": SplashScreenManager,
-                        "depends": [
-                            "$document"
-                        ]
-                    }
-                ],
-                "filters": [
-                    {
-                        "implementation": ReverseFilter,
-                        "key": "reverse"
-                    }
-                ],
-                "templates": [
-                    {
-                        "key": "bottombar",
-                        "template": bottombarTemplate
-                    },
-                    {
-                        "key": "action-button",
-                        "template": actionButtonTemplate
-                    },
-                    {
-                        "key": "input-filter",
-                        "template": inputFilterTemplate
-                    },
-                    {
-                        "key": "indicator",
-                        "template": indicatorTemplate
-                    },
-                    {
-                        "key": "message-banner",
-                        "template": messageBannerTemplate
-                    },
-                    {
-                        "key": "progress-bar",
-                        "template": progressBarTemplate
-                    },
-                    {
-                        "key": "time-controller",
-                        "template": timeControllerTemplate
-                    }
-                ],
-                "controllers": [
-                    {
-                        "key": "TimeRangeController",
-                        "implementation": TimeRangeController,
-                        "depends": [
-                            "$scope",
-                            "$timeout",
-                            "formatService",
-                            "DEFAULT_TIME_FORMAT",
-                            "now"
-                        ]
-                    },
-                    {
-                        "key": "DateTimePickerController",
-                        "implementation": DateTimePickerController,
-                        "depends": [
-                            "$scope",
-                            "now"
-                        ]
-                    },
-                    {
-                        "key": "DateTimeFieldController",
-                        "implementation": DateTimeFieldController,
-                        "depends": [
-                            "$scope",
-                            "formatService",
-                            "DEFAULT_TIME_FORMAT"
-                        ]
-                    },
-                    {
-                        "key": "TreeNodeController",
-                        "implementation": TreeNodeController,
-                        "depends": [
-                            "$scope",
-                            "$timeout",
-                            "navigationService"
-                        ]
-                    },
-                    {
-                        "key": "ActionGroupController",
-                        "implementation": ActionGroupController,
-                        "depends": [
-                            "$scope"
-                        ]
-                    },
-                    {
-                        "key": "ToggleController",
-                        "implementation": ToggleController
-                    },
-                    {
-                        "key": "ClickAwayController",
-                        "implementation": ClickAwayController,
-                        "depends": [
-                            "$document",
-                            "$timeout"
-                        ]
-                    },
-                    {
-                        "key": "ViewSwitcherController",
-                        "implementation": ViewSwitcherController,
-                        "depends": [
-                            "$scope",
-                            "$timeout"
-                        ]
-                    },
-                    {
-                        "key": "GetterSetterController",
-                        "implementation": GetterSetterController,
-                        "depends": [
-                            "$scope"
-                        ]
-                    },
-                    {
-                        "key": "SelectorController",
-                        "implementation": SelectorController,
-                        "depends": [
-                            "objectService",
-                            "$scope"
-                        ]
-                    },
-                    {
-                        "key": "ObjectInspectorController",
-                        "implementation": ObjectInspectorController,
-                        "depends": [
-                            "$scope",
-                            "objectService"
-                        ]
-                    },
-                    {
-                        "key": "BannerController",
-                        "implementation": BannerController,
-                        "depends": [
-                            "$scope",
-                            "notificationService",
-                            "dialogService"
-                        ]
-                    }
-                ],
-                "directives": [
-                    {
-                        "key": "mctContainer",
-                        "implementation": MCTContainer,
-                        "depends": [
-                            "containers[]"
-                        ]
-                    },
-                    {
-                        "key": "mctDrag",
-                        "implementation": MCTDrag,
-                        "depends": [
-                            "$document",
-                            "agentService"
-                        ]
-                    },
-                    {
-                        "key": "mctSelectable",
-                        "implementation": MCTSelectable,
-                        "depends": [
-                            "openmct"
-                        ]
-                    },
-                    {
-                        "key": "mctClickElsewhere",
-                        "implementation": MCTClickElsewhere,
-                        "depends": [
-                            "$document"
-                        ]
-                    },
-                    {
-                        "key": "mctResize",
-                        "implementation": MCTResize,
-                        "depends": [
-                            "$timeout"
-                        ]
-                    },
-                    {
-                        "key": "mctPopup",
-                        "implementation": MCTPopup,
-                        "depends": [
-                            "$compile",
-                            "popupService"
-                        ]
-                    },
-                    {
-                        "key": "mctScrollX",
-                        "implementation": MCTScroll,
-                        "depends": [
-                            "$parse",
-                            "MCT_SCROLL_X_PROPERTY",
-                            "MCT_SCROLL_X_ATTRIBUTE"
-                        ]
-                    },
-                    {
-                        "key": "mctScrollY",
-                        "implementation": MCTScroll,
-                        "depends": [
-                            "$parse",
-                            "MCT_SCROLL_Y_PROPERTY",
-                            "MCT_SCROLL_Y_ATTRIBUTE"
-                        ]
-                    },
-                    {
-                        "key": "mctSplitPane",
-                        "implementation": MCTSplitPane,
-                        "depends": [
-                            "$parse",
-                            "$log",
-                            "$interval",
-                            "$window"
-                        ]
-                    },
-                    {
-                        "key": "mctSplitter",
-                        "implementation": MCTSplitter
-                    },
-                    {
-                        "key": "mctTree",
-                        "implementation": MCTTree,
-                        "depends": ['gestureService', 'openmct']
-                    },
-                    {
-                        "key": "mctIndicators",
-                        "implementation": MCTIndicators,
-                        "depends": ['openmct']
-                    }
-                ],
-                "constants": [
-                    {
-                        "key": "MCT_SCROLL_X_PROPERTY",
-                        "value": "scrollLeft"
-                    },
-                    {
-                        "key": "MCT_SCROLL_X_ATTRIBUTE",
-                        "value": "mctScrollX"
-                    },
-                    {
-                        "key": "MCT_SCROLL_Y_PROPERTY",
-                        "value": "scrollTop"
-                    },
-                    {
-                        "key": "MCT_SCROLL_Y_ATTRIBUTE",
-                        "value": "mctScrollY"
-                    },
-                    {
-                        "key": "THEME",
-                        "value": "unspecified",
-                        "priority": "fallback"
-                    },
-                    {
-                        "key": "ASSETS_PATH",
-                        "value": ".",
-                        "priority": "fallback"
-                    }
-                ],
-                "containers": [
-                    {
-                        "key": "accordion",
-                        "template": accordionTemplate,
-                        "attributes": [
-                            "label"
-                        ]
-                    }
-                ],
-                "representations": [
-                    {
-                        "key": "tree",
-                        "template": subtreeTemplate,
-                        "uses": [
-                            "composition"
-                        ],
-                        "type": "root",
-                        "priority": "preferred"
-                    },
-                    {
-                        "key": "tree",
-                        "template": treeTemplate
-                    },
-                    {
-                        "key": "subtree",
-                        "template": subtreeTemplate,
-                        "uses": [
-                            "composition"
-                        ]
-                    },
-                    {
-                        "key": "tree-node",
-                        "template": treeNodeTemplate,
-                        "uses": [
-                            "action"
-                        ]
-                    },
-                    {
-                        "key": "label",
-                        "template": labelTemplate,
-                        "uses": [
-                            "type",
-                            "location"
-                        ],
-                        "gestures": [
-                            "drag",
-                            "menu",
-                            "info"
-                        ]
-                    },
-                    {
-                        "key": "node",
-                        "template": labelTemplate,
-                        "uses": [
-                            "type"
-                        ],
-                        "gestures": [
-                            "drag",
-                            "menu"
-                        ]
-                    },
-                    {
-                        "key": "action-group",
-                        "template": actionGroupTemplate,
-                        "uses": [
-                            "action"
-                        ]
-                    },
-                    {
-                        "key": "switcher",
-                        "template": switcherTemplate,
-                        "uses": [
-                            "view"
-                        ]
-                    },
-                    {
-                        "key": "object-inspector",
-                        "template": objectInspectorTemplate
-                    }
-                ],
-                "controls": [
-                    {
-                        "key": "selector",
-                        "template": selectorTemplate
-                    },
-                    {
-                        "key": "datetime-picker",
-                        "template": datetimePickerTemplate
-                    },
-                    {
-                        "key": "datetime-field",
-                        "template": datetimeFieldTemplate
-                    }
-                ],
-                "licenses": [
-                    {
-                        "name": "Normalize.css",
-                        "version": "1.1.2",
-                        "description": "Browser style normalization",
-                        "author": "Nicolas Gallagher, Jonathan Neal",
-                        "website": "http://necolas.github.io/normalize.css/",
-                        "copyright": "Copyright (c) Nicolas Gallagher and Jonathan Neal",
-                        "license": "license-mit",
-                        "link": "https://github.com/necolas/normalize.css/blob/v1.1.2/LICENSE.md"
-                    },
-                    {
-                        "name": "Zepto",
-                        "version": "1.1.6",
-                        "description": "DOM manipulation",
-                        "author": "Thomas Fuchs",
-                        "website": "http://zeptojs.com/",
-                        "copyright": "Copyright (c) 2010-2016 Thomas Fuchs",
-                        "license": "license-mit",
-                        "link": "https://github.com/madrobby/zepto/blob/master/MIT-LICENSE"
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/commonUI/general", {
+        "name": "General UI elements",
+        "description": "General UI elements, meant to be reused across modes",
+        "resources": "res",
+        "extensions": {
+            "services": [
+                {
+                    "key": "urlService",
+                    "implementation": UrlService,
+                    "depends": [
+                        "$location"
+                    ]
+                },
+                {
+                    "key": "popupService",
+                    "implementation": PopupService,
+                    "depends": [
+                        "$document",
+                        "$window"
+                    ]
+                }
+            ],
+            "runs": [
+                {
+                    "implementation": StyleSheetLoader,
+                    "depends": [
+                        "stylesheets[]",
+                        "$document",
+                        "THEME",
+                        "ASSETS_PATH"
+                    ]
+                },
+                {
+                    "implementation": SplashScreenManager,
+                    "depends": [
+                        "$document"
+                    ]
+                }
+            ],
+            "filters": [
+                {
+                    "implementation": ReverseFilter,
+                    "key": "reverse"
+                }
+            ],
+            "templates": [
+                {
+                    "key": "bottombar",
+                    "template": bottombarTemplate
+                },
+                {
+                    "key": "action-button",
+                    "template": actionButtonTemplate
+                },
+                {
+                    "key": "input-filter",
+                    "template": inputFilterTemplate
+                },
+                {
+                    "key": "indicator",
+                    "template": indicatorTemplate
+                },
+                {
+                    "key": "message-banner",
+                    "template": messageBannerTemplate
+                },
+                {
+                    "key": "progress-bar",
+                    "template": progressBarTemplate
+                },
+                {
+                    "key": "time-controller",
+                    "template": timeControllerTemplate
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "TimeRangeController",
+                    "implementation": TimeRangeController,
+                    "depends": [
+                        "$scope",
+                        "$timeout",
+                        "formatService",
+                        "DEFAULT_TIME_FORMAT",
+                        "now"
+                    ]
+                },
+                {
+                    "key": "DateTimePickerController",
+                    "implementation": DateTimePickerController,
+                    "depends": [
+                        "$scope",
+                        "now"
+                    ]
+                },
+                {
+                    "key": "DateTimeFieldController",
+                    "implementation": DateTimeFieldController,
+                    "depends": [
+                        "$scope",
+                        "formatService",
+                        "DEFAULT_TIME_FORMAT"
+                    ]
+                },
+                {
+                    "key": "TreeNodeController",
+                    "implementation": TreeNodeController,
+                    "depends": [
+                        "$scope",
+                        "$timeout",
+                        "navigationService"
+                    ]
+                },
+                {
+                    "key": "ActionGroupController",
+                    "implementation": ActionGroupController,
+                    "depends": [
+                        "$scope"
+                    ]
+                },
+                {
+                    "key": "ToggleController",
+                    "implementation": ToggleController
+                },
+                {
+                    "key": "ClickAwayController",
+                    "implementation": ClickAwayController,
+                    "depends": [
+                        "$document",
+                        "$timeout"
+                    ]
+                },
+                {
+                    "key": "ViewSwitcherController",
+                    "implementation": ViewSwitcherController,
+                    "depends": [
+                        "$scope",
+                        "$timeout"
+                    ]
+                },
+                {
+                    "key": "GetterSetterController",
+                    "implementation": GetterSetterController,
+                    "depends": [
+                        "$scope"
+                    ]
+                },
+                {
+                    "key": "SelectorController",
+                    "implementation": SelectorController,
+                    "depends": [
+                        "objectService",
+                        "$scope"
+                    ]
+                },
+                {
+                    "key": "ObjectInspectorController",
+                    "implementation": ObjectInspectorController,
+                    "depends": [
+                        "$scope",
+                        "objectService"
+                    ]
+                },
+                {
+                    "key": "BannerController",
+                    "implementation": BannerController,
+                    "depends": [
+                        "$scope",
+                        "notificationService",
+                        "dialogService"
+                    ]
+                }
+            ],
+            "directives": [
+                {
+                    "key": "mctContainer",
+                    "implementation": MCTContainer,
+                    "depends": [
+                        "containers[]"
+                    ]
+                },
+                {
+                    "key": "mctDrag",
+                    "implementation": MCTDrag,
+                    "depends": [
+                        "$document",
+                        "agentService"
+                    ]
+                },
+                {
+                    "key": "mctSelectable",
+                    "implementation": MCTSelectable,
+                    "depends": [
+                        "openmct"
+                    ]
+                },
+                {
+                    "key": "mctClickElsewhere",
+                    "implementation": MCTClickElsewhere,
+                    "depends": [
+                        "$document"
+                    ]
+                },
+                {
+                    "key": "mctResize",
+                    "implementation": MCTResize,
+                    "depends": [
+                        "$timeout"
+                    ]
+                },
+                {
+                    "key": "mctPopup",
+                    "implementation": MCTPopup,
+                    "depends": [
+                        "$compile",
+                        "popupService"
+                    ]
+                },
+                {
+                    "key": "mctScrollX",
+                    "implementation": MCTScroll,
+                    "depends": [
+                        "$parse",
+                        "MCT_SCROLL_X_PROPERTY",
+                        "MCT_SCROLL_X_ATTRIBUTE"
+                    ]
+                },
+                {
+                    "key": "mctScrollY",
+                    "implementation": MCTScroll,
+                    "depends": [
+                        "$parse",
+                        "MCT_SCROLL_Y_PROPERTY",
+                        "MCT_SCROLL_Y_ATTRIBUTE"
+                    ]
+                },
+                {
+                    "key": "mctSplitPane",
+                    "implementation": MCTSplitPane,
+                    "depends": [
+                        "$parse",
+                        "$log",
+                        "$interval",
+                        "$window"
+                    ]
+                },
+                {
+                    "key": "mctSplitter",
+                    "implementation": MCTSplitter
+                },
+                {
+                    "key": "mctTree",
+                    "implementation": MCTTree,
+                    "depends": ['gestureService', 'openmct']
+                },
+                {
+                    "key": "mctIndicators",
+                    "implementation": MCTIndicators,
+                    "depends": ['openmct']
+                }
+            ],
+            "constants": [
+                {
+                    "key": "MCT_SCROLL_X_PROPERTY",
+                    "value": "scrollLeft"
+                },
+                {
+                    "key": "MCT_SCROLL_X_ATTRIBUTE",
+                    "value": "mctScrollX"
+                },
+                {
+                    "key": "MCT_SCROLL_Y_PROPERTY",
+                    "value": "scrollTop"
+                },
+                {
+                    "key": "MCT_SCROLL_Y_ATTRIBUTE",
+                    "value": "mctScrollY"
+                },
+                {
+                    "key": "THEME",
+                    "value": "unspecified",
+                    "priority": "fallback"
+                },
+                {
+                    "key": "ASSETS_PATH",
+                    "value": ".",
+                    "priority": "fallback"
+                }
+            ],
+            "containers": [
+                {
+                    "key": "accordion",
+                    "template": accordionTemplate,
+                    "attributes": [
+                        "label"
+                    ]
+                }
+            ],
+            "representations": [
+                {
+                    "key": "tree",
+                    "template": subtreeTemplate,
+                    "uses": [
+                        "composition"
+                    ],
+                    "type": "root",
+                    "priority": "preferred"
+                },
+                {
+                    "key": "tree",
+                    "template": treeTemplate
+                },
+                {
+                    "key": "subtree",
+                    "template": subtreeTemplate,
+                    "uses": [
+                        "composition"
+                    ]
+                },
+                {
+                    "key": "tree-node",
+                    "template": treeNodeTemplate,
+                    "uses": [
+                        "action"
+                    ]
+                },
+                {
+                    "key": "label",
+                    "template": labelTemplate,
+                    "uses": [
+                        "type",
+                        "location"
+                    ],
+                    "gestures": [
+                        "drag",
+                        "menu",
+                        "info"
+                    ]
+                },
+                {
+                    "key": "node",
+                    "template": labelTemplate,
+                    "uses": [
+                        "type"
+                    ],
+                    "gestures": [
+                        "drag",
+                        "menu"
+                    ]
+                },
+                {
+                    "key": "action-group",
+                    "template": actionGroupTemplate,
+                    "uses": [
+                        "action"
+                    ]
+                },
+                {
+                    "key": "switcher",
+                    "template": switcherTemplate,
+                    "uses": [
+                        "view"
+                    ]
+                },
+                {
+                    "key": "object-inspector",
+                    "template": objectInspectorTemplate
+                }
+            ],
+            "controls": [
+                {
+                    "key": "selector",
+                    "template": selectorTemplate
+                },
+                {
+                    "key": "datetime-picker",
+                    "template": datetimePickerTemplate
+                },
+                {
+                    "key": "datetime-field",
+                    "template": datetimeFieldTemplate
+                }
+            ],
+            "licenses": [
+                {
+                    "name": "Normalize.css",
+                    "version": "1.1.2",
+                    "description": "Browser style normalization",
+                    "author": "Nicolas Gallagher, Jonathan Neal",
+                    "website": "http://necolas.github.io/normalize.css/",
+                    "copyright": "Copyright (c) Nicolas Gallagher and Jonathan Neal",
+                    "license": "license-mit",
+                    "link": "https://github.com/necolas/normalize.css/blob/v1.1.2/LICENSE.md"
+                },
+                {
+                    "name": "Zepto",
+                    "version": "1.1.6",
+                    "description": "DOM manipulation",
+                    "author": "Thomas Fuchs",
+                    "website": "http://zeptojs.com/",
+                    "copyright": "Copyright (c) 2010-2016 Thomas Fuchs",
+                    "license": "license-mit",
+                    "link": "https://github.com/madrobby/zepto/blob/master/MIT-LICENSE"
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/commonUI/inspect/bundle.js
+++ b/platform/commonUI/inspect/bundle.js
@@ -27,7 +27,8 @@ define([
    "./res/info-table.html",
    "./res/info-bubble.html",
    "./res/bubble.html",
-    "./res/templates/info-button.html"
+    "./res/templates/info-button.html",
+    'legacyRegistry'
 ], function (
    InfoGesture,
    InfoButtonGesture,
@@ -35,83 +36,81 @@ define([
    infoTableTemplate,
    infoBubbleTemplate,
    bubbleTemplate,
-    infoButtonTemplate
+    infoButtonTemplate,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/commonUI/inspect",
-        definition: {
-            "extensions": {
-                "templates": [
-                    {
-                        "key": "info-table",
-                        "template": infoTableTemplate
-                    },
-                    {
-                        "key": "info-bubble",
-                        "template": infoBubbleTemplate
-                    }
-                ],
-                "containers": [
-                    {
-                        "key": "bubble",
-                        "template": bubbleTemplate,
-                        "attributes": [
-                            "bubbleTitle",
-                            "bubbleLayout"
-                        ],
-                        "alias": "bubble"
-                    }
-                ],
-                "gestures": [
-                    {
-                        "key": "info",
-                        "implementation": InfoGesture,
-                        "depends": [
-                            "$timeout",
-                            "agentService",
-                            "infoService",
-                            "INFO_HOVER_DELAY"
-                        ]
-                    },
-                    {
-                        "key": "infobutton",
-                        "implementation": InfoButtonGesture,
-                        "depends": [
-                            "$document",
-                            "agentService",
-                            "infoService"
-                        ]
-                    }
-                ],
-                "services": [
-                    {
-                        "key": "infoService",
-                        "implementation": InfoService,
-                        "depends": [
-                            "$compile",
-                            "$rootScope",
-                            "popupService",
-                            "agentService"
-                        ]
-                    }
-                ],
-                "constants": [
-                    {
-                        "key": "INFO_HOVER_DELAY",
-                        "value": 2000
-                    }
-                ],
-                "representations": [
-                    {
-                        "key": "info-button",
-                        "template": infoButtonTemplate,
-                        "gestures": [
-                            "infobutton"
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/commonUI/inspect", {
+        "extensions": {
+            "templates": [
+                {
+                    "key": "info-table",
+                    "template": infoTableTemplate
+                },
+                {
+                    "key": "info-bubble",
+                    "template": infoBubbleTemplate
+                }
+            ],
+            "containers": [
+                {
+                    "key": "bubble",
+                    "template": bubbleTemplate,
+                    "attributes": [
+                        "bubbleTitle",
+                        "bubbleLayout"
+                    ],
+                    "alias": "bubble"
+                }
+            ],
+            "gestures": [
+                {
+                    "key": "info",
+                    "implementation": InfoGesture,
+                    "depends": [
+                        "$timeout",
+                        "agentService",
+                        "infoService",
+                        "INFO_HOVER_DELAY"
+                    ]
+                },
+                {
+                    "key": "infobutton",
+                    "implementation": InfoButtonGesture,
+                    "depends": [
+                        "$document",
+                        "agentService",
+                        "infoService"
+                    ]
+                }
+            ],
+            "services": [
+                {
+                    "key": "infoService",
+                    "implementation": InfoService,
+                    "depends": [
+                        "$compile",
+                        "$rootScope",
+                        "popupService",
+                        "agentService"
+                    ]
+                }
+            ],
+            "constants": [
+                {
+                    "key": "INFO_HOVER_DELAY",
+                    "value": 2000
+                }
+            ],
+            "representations": [
+                {
+                    "key": "info-button",
+                    "template": infoButtonTemplate,
+                    "gestures": [
+                        "infobutton"
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/commonUI/mobile/bundle.js
+++ b/platform/commonUI/mobile/bundle.js
@@ -23,45 +23,44 @@
 define([
    "./src/MCTDevice",
    "./src/AgentService",
-    "./src/DeviceClassifier"
+    "./src/DeviceClassifier",
+    'legacyRegistry'
 ], function (
    MCTDevice,
    AgentService,
-    DeviceClassifier
+    DeviceClassifier,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/commonUI/mobile",
-        definition: {
-            "extensions": {
-                "directives": [
-                    {
-                        "key": "mctDevice",
-                        "implementation": MCTDevice,
-                        "depends": [
-                            "agentService"
-                        ]
-                    }
-                ],
-                "services": [
-                    {
-                        "key": "agentService",
-                        "implementation": AgentService,
-                        "depends": [
-                            "$window"
-                        ]
-                    }
-                ],
-                "runs": [
-                    {
-                        "implementation": DeviceClassifier,
-                        "depends": [
-                            "agentService",
-                            "$document"
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/commonUI/mobile", {
+        "extensions": {
+            "directives": [
+                {
+                    "key": "mctDevice",
+                    "implementation": MCTDevice,
+                    "depends": [
+                        "agentService"
+                    ]
+                }
+            ],
+            "services": [
+                {
+                    "key": "agentService",
+                    "implementation": AgentService,
+                    "depends": [
+                        "$window"
+                    ]
+                }
+            ],
+            "runs": [
+                {
+                    "implementation": DeviceClassifier,
+                    "depends": [
+                        "agentService",
+                        "$document"
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/commonUI/notification/bundle.js
+++ b/platform/commonUI/notification/bundle.js
@@ -24,53 +24,52 @@ define([
    "./src/NotificationIndicatorController",
    "./src/NotificationIndicator",
    "./src/NotificationService",
-    "./res/notification-indicator.html"
+    "./res/notification-indicator.html",
+    'legacyRegistry'
 ], function (
    NotificationIndicatorController,
    NotificationIndicator,
    NotificationService,
-    notificationIndicatorTemplate
+    notificationIndicatorTemplate,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/commonUI/notification",
-        definition: {
-            "extensions": {
-                "templates": [
-                    {
-                        "key": "notificationIndicatorTemplate",
-                        "template": notificationIndicatorTemplate
-                    }
-                ],
-                "controllers": [
-                    {
-                        "key": "NotificationIndicatorController",
-                        "implementation": NotificationIndicatorController,
-                        "depends": [
-                            "$scope",
-                            "openmct",
-                            "dialogService"
-                        ]
-                    }
-                ],
-                "indicators": [
-                    {
-                        "implementation": NotificationIndicator,
-                        "priority": "fallback"
-                    }
-                ],
-                "services": [
-                    {
-                        "key": "notificationService",
-                        "implementation": function (openmct) {
-                            return new NotificationService.default(openmct);
-                        },
-                        "depends": [
-                            "openmct"
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/commonUI/notification", {
+        "extensions": {
+            "templates": [
+                {
+                    "key": "notificationIndicatorTemplate",
+                    "template": notificationIndicatorTemplate
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "NotificationIndicatorController",
+                    "implementation": NotificationIndicatorController,
+                    "depends": [
+                        "$scope",
+                        "openmct",
+                        "dialogService"
+                    ]
+                }
+            ],
+            "indicators": [
+                {
+                    "implementation": NotificationIndicator,
+                    "priority": "fallback"
+                }
+            ],
+            "services": [
+                {
+                    "key": "notificationService",
+                    "implementation": function (openmct) {
+                        return new NotificationService.default(openmct);
+                    },
+                    "depends": [
+                        "openmct"
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/commonUI/regions/bundle.js
+++ b/platform/commonUI/regions/bundle.js
@@ -22,34 +22,33 @@

 define([
    './src/InspectorController',
-    './src/EditableRegionPolicy'
+    './src/EditableRegionPolicy',
+    'legacyRegistry'
 ], function (
    InspectorController,
-    EditableRegionPolicy
+    EditableRegionPolicy,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/commonUI/regions",
-        definition: {
-            "extensions": {
-                "controllers": [
-                    {
-                        "key": "InspectorController",
-                        "implementation": InspectorController,
-                        "depends": [
-                            "$scope",
-                            "openmct",
-                            "$document"
-                        ]
-                    }
-                ],
-                "policies": [
-                    {
-                        "category": "region",
-                        "implementation": EditableRegionPolicy
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/commonUI/regions", {
+        "extensions": {
+            "controllers": [
+                {
+                    "key": "InspectorController",
+                    "implementation": InspectorController,
+                    "depends": [
+                        "$scope",
+                        "openmct",
+                        "$document"
+                    ]
+                }
+            ],
+            "policies": [
+                {
+                    "category": "region",
+                    "implementation": EditableRegionPolicy
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/containment/bundle.js
+++ b/platform/containment/bundle.js
@@ -25,52 +25,51 @@ define([
    "./src/CompositionMutabilityPolicy",
    "./src/CompositionModelPolicy",
    "./src/ComposeActionPolicy",
-    "./src/PersistableCompositionPolicy"
+    "./src/PersistableCompositionPolicy",
+    'legacyRegistry'
 ], function (
    CompositionPolicy,
    CompositionMutabilityPolicy,
    CompositionModelPolicy,
    ComposeActionPolicy,
-    PersistableCompositionPolicy
+    PersistableCompositionPolicy,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/containment",
-        definition: {
-            "extensions": {
-                "policies": [
-                    {
-                        "category": "composition",
-                        "implementation": CompositionPolicy,
-                        "message": "Objects of this type cannot contain objects of that type."
-                    },
-                    {
-                        "category": "composition",
-                        "implementation": CompositionMutabilityPolicy,
-                        "message": "Objects of this type cannot be modified."
-                    },
-                    {
-                        "category": "composition",
-                        "implementation": CompositionModelPolicy,
-                        "message": "Objects of this type cannot contain other objects."
-                    },
-                    {
-                        "category": "action",
-                        "implementation": ComposeActionPolicy,
-                        "depends": [
-                            "$injector",
-                            "openmct"
-                        ],
-                        "message": "Objects of this type cannot contain objects of that type."
-                    },
-                    {
-                        "category": "composition",
-                        "implementation": PersistableCompositionPolicy,
-                        "depends": ["openmct"],
-                        "message": "Change cannot be made to composition of non-persistable object"
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/containment", {
+        "extensions": {
+            "policies": [
+                {
+                    "category": "composition",
+                    "implementation": CompositionPolicy,
+                    "message": "Objects of this type cannot contain objects of that type."
+                },
+                {
+                    "category": "composition",
+                    "implementation": CompositionMutabilityPolicy,
+                    "message": "Objects of this type cannot be modified."
+                },
+                {
+                    "category": "composition",
+                    "implementation": CompositionModelPolicy,
+                    "message": "Objects of this type cannot contain other objects."
+                },
+                {
+                    "category": "action",
+                    "implementation": ComposeActionPolicy,
+                    "depends": [
+                        "$injector",
+                        "openmct"
+                    ],
+                    "message": "Objects of this type cannot contain objects of that type."
+                },
+                {
+                    "category": "composition",
+                    "implementation": PersistableCompositionPolicy,
+                    "depends": ["openmct"],
+                    "message": "Change cannot be made to composition of non-persistable object"
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/core/bundle.js
+++ b/platform/core/bundle.js
@@ -49,7 +49,8 @@ define([
    "./src/services/Now",
    "./src/services/Throttle",
    "./src/services/Topic",
-    "./src/services/Instantiate"
+    "./src/services/Instantiate",
+    'legacyRegistry'
 ], function (
    DomainObjectProvider,
    CoreCapabilityProvider,
@@ -79,314 +80,312 @@ define([
    Now,
    Throttle,
    Topic,
-    Instantiate
+    Instantiate,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/core",
-        definition: {
-            "name": "Open MCT Core",
-            "description": "Defines core concepts of Open MCT.",
-            "sources": "src",
-            "configuration": {
-                "paths": {
-                    "uuid": "uuid"
-                }
-            },
-            "extensions": {
-                "components": [
-                    {
-                        "provides": "objectService",
-                        "type": "provider",
-                        "implementation": DomainObjectProvider,
-                        "depends": [
-                            "modelService",
-                            "instantiate"
-                        ]
-                    },
-                    {
-                        "provides": "capabilityService",
-                        "type": "provider",
-                        "implementation": CoreCapabilityProvider,
-                        "depends": [
-                            "capabilities[]",
-                            "$log"
-                        ]
-                    },
-                    {
-                        "provides": "modelService",
-                        "type": "provider",
-                        "implementation": StaticModelProvider,
-                        "depends": [
-                            "models[]",
-                            "$q",
-                            "$log"
-                        ]
-                    },
-                    {
-                        "provides": "modelService",
-                        "type": "aggregator",
-                        "implementation": ModelAggregator,
-                        "depends": [
-                            "$q"
-                        ]
-                    },
-                    {
-                        "provides": "modelService",
-                        "type": "provider",
-                        "implementation": PersistedModelProvider,
-                        "depends": [
-                            "persistenceService",
-                            "$q",
-                            "now",
-                            "PERSISTENCE_SPACE"
-                        ]
-                    },
-                    {
-                        "provides": "modelService",
-                        "type": "decorator",
-                        "implementation": CachingModelDecorator,
-                        "depends": [
-                            "cacheService"
-                        ]
-                    },
-                    {
-                        "provides": "modelService",
-                        "type": "decorator",
-                        "priority": "fallback",
-                        "implementation": MissingModelDecorator
-                    },
-                    {
-                        "provides": "typeService",
-                        "type": "provider",
-                        "implementation": TypeProvider,
-                        "depends": [
-                            "types[]"
-                        ]
-                    },
-                    {
-                        "provides": "actionService",
-                        "type": "provider",
-                        "implementation": ActionProvider,
-                        "depends": [
-                            "actions[]",
-                            "$log"
-                        ]
-                    },
-                    {
-                        "provides": "actionService",
-                        "type": "aggregator",
-                        "implementation": ActionAggregator
-                    },
-                    {
-                        "provides": "actionService",
-                        "type": "decorator",
-                        "implementation": LoggingActionDecorator,
-                        "depends": [
-                            "$log"
-                        ]
-                    },
-                    {
-                        "provides": "viewService",
-                        "type": "provider",
-                        "implementation": ViewProvider,
-                        "depends": [
-                            "views[]",
-                            "$log"
-                        ]
-                    },
-                    {
-                        "provides": "identifierService",
-                        "type": "provider",
-                        "implementation": IdentifierProvider,
-                        "depends": [
-                            "PERSISTENCE_SPACE"
-                        ]
-                    }
-                ],
-                "types": [
-                    {
-                        "properties": [
-                            {
-                                "control": "textfield",
-                                "name": "Title",
-                                "key": "name",
-                                "property": "name",
-                                "pattern": "\\S+",
-                                "required": true,
-                                "cssClass": "l-input-lg"
-                            },
-                            {
-                                "name": "Notes",
-                                "key": "notes",
-                                "property": "notes",
-                                "control": "textarea",
-                                "required": false,
-                                "cssClass": "l-textarea-sm"
-                            }
-                        ]
-                    },
-                    {
-                        "key": "root",
-                        "name": "Root",
-                        "cssClass": "icon-folder"
-                    },
-                    {
-                        "key": "folder",
-                        "name": "Folder",
-                        "cssClass": "icon-folder",
-                        "features": "creation",
-                        "description": "Create folders to organize other objects or links to objects.",
-                        "priority": 1000,
-                        "model": {
-                            "composition": []
-                        }
-                    },
-                    {
-                        "key": "unknown",
-                        "name": "Unknown Type",
-                        "cssClass": "icon-object-unknown"
-                    },
-                    {
-                        "name": "Unknown Type",
-                        "cssClass": "icon-object-unknown"
-                    }
-                ],
-                "capabilities": [
-                    {
-                        "key": "composition",
-                        "implementation": CompositionCapability,
-                        "depends": [
-                            "$injector"
-                        ]
-                    },
-                    {
-                        "key": "relationship",
-                        "implementation": RelationshipCapability,
-                        "depends": [
-                            "$injector"
-                        ]
-                    },
-                    {
-                        "key": "type",
-                        "implementation": TypeCapability,
-                        "depends": [
-                            "typeService"
-                        ]
-                    },
-                    {
-                        "key": "action",
-                        "implementation": ActionCapability,
-                        "depends": [
-                            "$q",
-                            "actionService"
-                        ]
-                    },
-                    {
-                        "key": "view",
-                        "implementation": ViewCapability,
-                        "depends": [
-                            "viewService"
-                        ]
-                    },
-                    {
-                        "key": "persistence",
-                        "implementation": PersistenceCapability,
-                        "depends": [
-                            "cacheService",
-                            "persistenceService",
-                            "identifierService",
-                            "notificationService",
-                            "$q"
-                        ]
-                    },
-                    {
-                        "key": "metadata",
-                        "implementation": MetadataCapability
-                    },
-                    {
-                        "key": "mutation",
-                        "implementation": MutationCapability,
-                        "depends": [
-                            "topic",
-                            "now"
-                        ]
-                    },
-                    {
-                        "key": "delegation",
-                        "implementation": DelegationCapability,
-                        "depends": [
-                            "$q"
-                        ]
-                    },
-                    {
-                        "key": "instantiation",
-                        "implementation": InstantiationCapability,
-                        "depends": [
-                            "$injector",
-                            "identifierService",
-                            "now"
-                        ]
-                    }
-                ],
-                "services": [
-                    {
-                        "key": "cacheService",
-                        "implementation": ModelCacheService
-                    },
-                    {
-                        "key": "now",
-                        "implementation": Now
-                    },
-                    {
-                        "key": "throttle",
-                        "implementation": Throttle,
-                        "depends": [
-                            "$timeout"
-                        ]
-                    },
-                    {
-                        "key": "topic",
-                        "implementation": Topic,
-                        "depends": [
-                            "$log"
-                        ]
-                    },
-                    {
-                        "key": "instantiate",
-                        "implementation": Instantiate,
-                        "depends": [
-                            "capabilityService",
-                            "identifierService",
-                            "cacheService"
-                        ]
-                    }
-                ],
-                "runs": [
-                    {
-                        "implementation": TransactingMutationListener,
-                        "depends": ["topic", "transactionService", "cacheService"]
-                    }
-                ],
-                "constants": [
-                    {
-                        "key": "PERSISTENCE_SPACE",
-                        "value": "mct"
-                    }
-                ],
-                "licenses": [
-                    {
-                        "name": "Math.uuid.js",
-                        "version": "1.4.7",
-                        "description": "Unique identifer generation (code adapted.)",
-                        "author": "Robert Kieffer",
-                        "website": "https://github.com/broofa/node-uuid",
-                        "copyright": "Copyright (c) 2010-2012 Robert Kieffer",
-                        "license": "license-mit",
-                        "link": "http://opensource.org/licenses/MIT"
-                    }
-                ]
+    legacyRegistry.register("platform/core", {
+        "name": "Open MCT Core",
+        "description": "Defines core concepts of Open MCT.",
+        "sources": "src",
+        "configuration": {
+            "paths": {
+                "uuid": "uuid"
            }
+        },
+        "extensions": {
+            "components": [
+                {
+                    "provides": "objectService",
+                    "type": "provider",
+                    "implementation": DomainObjectProvider,
+                    "depends": [
+                        "modelService",
+                        "instantiate"
+                    ]
+                },
+                {
+                    "provides": "capabilityService",
+                    "type": "provider",
+                    "implementation": CoreCapabilityProvider,
+                    "depends": [
+                        "capabilities[]",
+                        "$log"
+                    ]
+                },
+                {
+                    "provides": "modelService",
+                    "type": "provider",
+                    "implementation": StaticModelProvider,
+                    "depends": [
+                        "models[]",
+                        "$q",
+                        "$log"
+                    ]
+                },
+                {
+                    "provides": "modelService",
+                    "type": "aggregator",
+                    "implementation": ModelAggregator,
+                    "depends": [
+                        "$q"
+                    ]
+                },
+                {
+                    "provides": "modelService",
+                    "type": "provider",
+                    "implementation": PersistedModelProvider,
+                    "depends": [
+                        "persistenceService",
+                        "$q",
+                        "now",
+                        "PERSISTENCE_SPACE"
+                    ]
+                },
+                {
+                    "provides": "modelService",
+                    "type": "decorator",
+                    "implementation": CachingModelDecorator,
+                    "depends": [
+                        "cacheService"
+                    ]
+                },
+                {
+                    "provides": "modelService",
+                    "type": "decorator",
+                    "priority": "fallback",
+                    "implementation": MissingModelDecorator
+                },
+                {
+                    "provides": "typeService",
+                    "type": "provider",
+                    "implementation": TypeProvider,
+                    "depends": [
+                        "types[]"
+                    ]
+                },
+                {
+                    "provides": "actionService",
+                    "type": "provider",
+                    "implementation": ActionProvider,
+                    "depends": [
+                        "actions[]",
+                        "$log"
+                    ]
+                },
+                {
+                    "provides": "actionService",
+                    "type": "aggregator",
+                    "implementation": ActionAggregator
+                },
+                {
+                    "provides": "actionService",
+                    "type": "decorator",
+                    "implementation": LoggingActionDecorator,
+                    "depends": [
+                        "$log"
+                    ]
+                },
+                {
+                    "provides": "viewService",
+                    "type": "provider",
+                    "implementation": ViewProvider,
+                    "depends": [
+                        "views[]",
+                        "$log"
+                    ]
+                },
+                {
+                    "provides": "identifierService",
+                    "type": "provider",
+                    "implementation": IdentifierProvider,
+                    "depends": [
+                        "PERSISTENCE_SPACE"
+                    ]
+                }
+            ],
+            "types": [
+                {
+                    "properties": [
+                        {
+                            "control": "textfield",
+                            "name": "Title",
+                            "key": "name",
+                            "property": "name",
+                            "pattern": "\\S+",
+                            "required": true,
+                            "cssClass": "l-input-lg"
+                        },
+                        {
+                            "name": "Notes",
+                            "key": "notes",
+                            "property": "notes",
+                            "control": "textarea",
+                            "required": false,
+                            "cssClass": "l-textarea-sm"
+                        }
+                    ]
+                },
+                {
+                    "key": "root",
+                    "name": "Root",
+                    "cssClass": "icon-folder"
+                },
+                {
+                    "key": "folder",
+                    "name": "Folder",
+                    "cssClass": "icon-folder",
+                    "features": "creation",
+                    "description": "Create folders to organize other objects or links to objects.",
+                    "priority": 1000,
+                    "model": {
+                        "composition": []
+                    }
+                },
+                {
+                    "key": "unknown",
+                    "name": "Unknown Type",
+                    "cssClass": "icon-object-unknown"
+                },
+                {
+                    "name": "Unknown Type",
+                    "cssClass": "icon-object-unknown"
+                }
+            ],
+            "capabilities": [
+                {
+                    "key": "composition",
+                    "implementation": CompositionCapability,
+                    "depends": [
+                        "$injector"
+                    ]
+                },
+                {
+                    "key": "relationship",
+                    "implementation": RelationshipCapability,
+                    "depends": [
+                        "$injector"
+                    ]
+                },
+                {
+                    "key": "type",
+                    "implementation": TypeCapability,
+                    "depends": [
+                        "typeService"
+                    ]
+                },
+                {
+                    "key": "action",
+                    "implementation": ActionCapability,
+                    "depends": [
+                        "$q",
+                        "actionService"
+                    ]
+                },
+                {
+                    "key": "view",
+                    "implementation": ViewCapability,
+                    "depends": [
+                        "viewService"
+                    ]
+                },
+                {
+                    "key": "persistence",
+                    "implementation": PersistenceCapability,
+                    "depends": [
+                        "cacheService",
+                        "persistenceService",
+                        "identifierService",
+                        "notificationService",
+                        "$q"
+                    ]
+                },
+                {
+                    "key": "metadata",
+                    "implementation": MetadataCapability
+                },
+                {
+                    "key": "mutation",
+                    "implementation": MutationCapability,
+                    "depends": [
+                        "topic",
+                        "now"
+                    ]
+                },
+                {
+                    "key": "delegation",
+                    "implementation": DelegationCapability,
+                    "depends": [
+                        "$q"
+                    ]
+                },
+                {
+                    "key": "instantiation",
+                    "implementation": InstantiationCapability,
+                    "depends": [
+                        "$injector",
+                        "identifierService",
+                        "now"
+                    ]
+                }
+            ],
+            "services": [
+                {
+                    "key": "cacheService",
+                    "implementation": ModelCacheService
+                },
+                {
+                    "key": "now",
+                    "implementation": Now
+                },
+                {
+                    "key": "throttle",
+                    "implementation": Throttle,
+                    "depends": [
+                        "$timeout"
+                    ]
+                },
+                {
+                    "key": "topic",
+                    "implementation": Topic,
+                    "depends": [
+                        "$log"
+                    ]
+                },
+                {
+                    "key": "instantiate",
+                    "implementation": Instantiate,
+                    "depends": [
+                        "capabilityService",
+                        "identifierService",
+                        "cacheService"
+                    ]
+                }
+            ],
+            "runs": [
+                {
+                    "implementation": TransactingMutationListener,
+                    "depends": ["topic", "transactionService", "cacheService"]
+                }
+            ],
+            "constants": [
+                {
+                    "key": "PERSISTENCE_SPACE",
+                    "value": "mct"
+                }
+            ],
+            "licenses": [
+                {
+                    "name": "Math.uuid.js",
+                    "version": "1.4.7",
+                    "description": "Unique identifer generation (code adapted.)",
+                    "author": "Robert Kieffer",
+                    "website": "https://github.com/broofa/node-uuid",
+                    "copyright": "Copyright (c) 2010-2012 Robert Kieffer",
+                    "license": "license-mit",
+                    "link": "http://opensource.org/licenses/MIT"
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/entanglement/bundle.js
+++ b/platform/entanglement/bundle.js
@@ -34,7 +34,8 @@ define([
    "./src/services/MoveService",
    "./src/services/LinkService",
    "./src/services/CopyService",
-    "./src/services/LocationService"
+    "./src/services/LocationService",
+    'legacyRegistry'
 ], function (
    MoveAction,
    CopyAction,
@@ -49,154 +50,152 @@ define([
    MoveService,
    LinkService,
    CopyService,
-    LocationService
+    LocationService,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/entanglement",
-        definition: {
-            "name": "Entanglement",
-            "description": "Tools to assist you in entangling the world of WARP.",
-            "configuration": {},
-            "extensions": {
-                "actions": [
-                    {
-                        "key": "move",
-                        "name": "Move",
-                        "description": "Move object to another location.",
-                        "cssClass": "icon-move",
-                        "category": "contextual",
-                        "implementation": MoveAction,
-                        "depends": [
-                            "policyService",
-                            "locationService",
-                            "moveService"
-                        ]
-                    },
-                    {
-                        "key": "copy",
-                        "name": "Duplicate",
-                        "description": "Duplicate object to another location.",
-                        "cssClass": "icon-duplicate",
-                        "category": "contextual",
-                        "implementation": CopyAction,
-                        "depends": [
-                            "$log",
-                            "policyService",
-                            "locationService",
-                            "copyService",
-                            "dialogService",
-                            "notificationService"
-                        ]
-                    },
-                    {
-                        "key": "link",
-                        "name": "Create Link",
-                        "description": "Create Link to object in another location.",
-                        "cssClass": "icon-link",
-                        "category": "contextual",
-                        "implementation": LinkAction,
-                        "depends": [
-                            "policyService",
-                            "locationService",
-                            "linkService"
-                        ]
-                    },
-                    {
-                        "key": "locate",
-                        "name": "Set Primary Location",
-                        "description": "Set a domain object's primary location.",
-                        "cssClass": "",
-                        "category": "contextual",
-                        "implementation": SetPrimaryLocationAction
-                    }
-                ],
-                "components": [
-                    {
-                        "type": "decorator",
-                        "provides": "creationService",
-                        "implementation": LocatingCreationDecorator
-                    },
-                    {
-                        "type": "decorator",
-                        "provides": "objectService",
-                        "implementation": LocatingObjectDecorator,
-                        "depends": [
-                            "$q",
-                            "$log"
-                        ]
-                    }
-                ],
-                "policies": [
-                    {
-                        "category": "action",
-                        "implementation": CrossSpacePolicy
-                    },
-                    {
-                        "category": "action",
-                        "implementation": CopyPolicy
-                    },
-                    {
-                        "category": "action",
-                        "implementation": MovePolicy
-                    }
-                ],
-                "capabilities": [
-                    {
-                        "key": "location",
-                        "name": "Location Capability",
-                        "description": "Provides a capability for retrieving the location of an object based upon it's context.",
-                        "implementation": LocationCapability,
-                        "depends": [
-                            "$q",
-                            "$injector"
-                        ]
-                    }
-                ],
-                "services": [
-                    {
-                        "key": "moveService",
-                        "name": "Move Service",
-                        "description": "Provides a service for moving objects",
-                        "implementation": MoveService,
-                        "depends": [
-                            "openmct",
-                            "linkService",
-                            "$q"
-                        ]
-                    },
-                    {
-                        "key": "linkService",
-                        "name": "Link Service",
-                        "description": "Provides a service for linking objects",
-                        "implementation": LinkService,
-                        "depends": [
-                            "openmct"
-                        ]
-                    },
-                    {
-                        "key": "copyService",
-                        "name": "Copy Service",
-                        "description": "Provides a service for copying objects",
-                        "implementation": CopyService,
-                        "depends": [
-                            "$q",
-                            "policyService",
-                            "openmct"
-                        ]
-                    },
-                    {
-                        "key": "locationService",
-                        "name": "Location Service",
-                        "description": "Provides a service for prompting a user for locations.",
-                        "implementation": LocationService,
-                        "depends": [
-                            "dialogService"
-                        ]
-                    }
-                ],
-                "licenses": []
-            }
+    legacyRegistry.register("platform/entanglement", {
+        "name": "Entanglement",
+        "description": "Tools to assist you in entangling the world of WARP.",
+        "configuration": {},
+        "extensions": {
+            "actions": [
+                {
+                    "key": "move",
+                    "name": "Move",
+                    "description": "Move object to another location.",
+                    "cssClass": "icon-move",
+                    "category": "contextual",
+                    "implementation": MoveAction,
+                    "depends": [
+                        "policyService",
+                        "locationService",
+                        "moveService"
+                    ]
+                },
+                {
+                    "key": "copy",
+                    "name": "Duplicate",
+                    "description": "Duplicate object to another location.",
+                    "cssClass": "icon-duplicate",
+                    "category": "contextual",
+                    "implementation": CopyAction,
+                    "depends": [
+                        "$log",
+                        "policyService",
+                        "locationService",
+                        "copyService",
+                        "dialogService",
+                        "notificationService"
+                    ]
+                },
+                {
+                    "key": "link",
+                    "name": "Create Link",
+                    "description": "Create Link to object in another location.",
+                    "cssClass": "icon-link",
+                    "category": "contextual",
+                    "implementation": LinkAction,
+                    "depends": [
+                        "policyService",
+                        "locationService",
+                        "linkService"
+                    ]
+                },
+                {
+                    "key": "locate",
+                    "name": "Set Primary Location",
+                    "description": "Set a domain object's primary location.",
+                    "cssClass": "",
+                    "category": "contextual",
+                    "implementation": SetPrimaryLocationAction
+                }
+            ],
+            "components": [
+                {
+                    "type": "decorator",
+                    "provides": "creationService",
+                    "implementation": LocatingCreationDecorator
+                },
+                {
+                    "type": "decorator",
+                    "provides": "objectService",
+                    "implementation": LocatingObjectDecorator,
+                    "depends": [
+                        "$q",
+                        "$log"
+                    ]
+                }
+            ],
+            "policies": [
+                {
+                    "category": "action",
+                    "implementation": CrossSpacePolicy
+                },
+                {
+                    "category": "action",
+                    "implementation": CopyPolicy
+                },
+                {
+                    "category": "action",
+                    "implementation": MovePolicy
+                }
+            ],
+            "capabilities": [
+                {
+                    "key": "location",
+                    "name": "Location Capability",
+                    "description": "Provides a capability for retrieving the location of an object based upon it's context.",
+                    "implementation": LocationCapability,
+                    "depends": [
+                        "$q",
+                        "$injector"
+                    ]
+                }
+            ],
+            "services": [
+                {
+                    "key": "moveService",
+                    "name": "Move Service",
+                    "description": "Provides a service for moving objects",
+                    "implementation": MoveService,
+                    "depends": [
+                        "openmct",
+                        "linkService",
+                        "$q"
+                    ]
+                },
+                {
+                    "key": "linkService",
+                    "name": "Link Service",
+                    "description": "Provides a service for linking objects",
+                    "implementation": LinkService,
+                    "depends": [
+                        "openmct"
+                    ]
+                },
+                {
+                    "key": "copyService",
+                    "name": "Copy Service",
+                    "description": "Provides a service for copying objects",
+                    "implementation": CopyService,
+                    "depends": [
+                        "$q",
+                        "policyService",
+                        "openmct"
+                    ]
+                },
+                {
+                    "key": "locationService",
+                    "name": "Location Service",
+                    "description": "Provides a service for prompting a user for locations.",
+                    "implementation": LocationService,
+                    "depends": [
+                        "dialogService"
+                    ]
+                }
+            ],
+            "licenses": []
        }
-    };
+    });
 });
--- a/platform/execution/bundle.js
+++ b/platform/execution/bundle.js
@@ -21,26 +21,25 @@
 *****************************************************************************/

 define([
-    "./src/WorkerService"
+    "./src/WorkerService",
+    'legacyRegistry'
 ], function (
-    WorkerService
+    WorkerService,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/execution",
-        definition: {
-            "extensions": {
-                "services": [
-                    {
-                        "key": "workerService",
-                        "implementation": WorkerService,
-                        "depends": [
-                            "$window",
-                            "workers[]"
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/execution", {
+        "extensions": {
+            "services": [
+                {
+                    "key": "workerService",
+                    "implementation": WorkerService,
+                    "depends": [
+                        "$window",
+                        "workers[]"
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/exporters/bundle.js
+++ b/platform/exporters/bundle.js
@@ -22,44 +22,42 @@

 define([
    "./ExportService",
-    "saveAs"
-], function (ExportService, saveAs) {
+    "saveAs",
+    "legacyRegistry"
+], function (ExportService, saveAs, legacyRegistry) {

-    return {
-        name:"platform/exporters",
-        definition: {
-            extensions: {
-                services: [
-                    {
-                        key: "exportService",
-                        implementation: function () {
-                            return new ExportService(saveAs.saveAs);
-                        }
+    legacyRegistry.register("platform/exporters", {
+        extensions: {
+            services: [
+                {
+                    key: "exportService",
+                    implementation: function () {
+                        return new ExportService(saveAs.saveAs);
                    }
-                ],
-                licenses: [
-                    {
-                        "name": "CSV.js",
-                        "version": "3.6.4",
-                        "author": "Kash Nouroozi",
-                        "description": "Encoder for CSV (comma separated values) export",
-                        "website": "https://github.com/knrz/CSV.js",
-                        "copyright": "Copyright (c) 2014 Kash Nouroozi",
-                        "license": "license-mit",
-                        "link": "https://github.com/knrz/CSV.js/blob/3.6.4/LICENSE"
-                    },
-                    {
-                        "name": "FileSaver.js",
-                        "version": "0.0.2",
-                        "author": "Eli Grey",
-                        "description": "File download initiator (for file exports)",
-                        "website": "https://github.com/eligrey/FileSaver.js/",
-                        "copyright": "Copyright © 2015 Eli Grey.",
-                        "license": "license-mit",
-                        "link": "https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md"
-                    }
-                ]
-            }
+                }
+            ],
+            licenses: [
+                {
+                    "name": "CSV.js",
+                    "version": "3.6.4",
+                    "author": "Kash Nouroozi",
+                    "description": "Encoder for CSV (comma separated values) export",
+                    "website": "https://github.com/knrz/CSV.js",
+                    "copyright": "Copyright (c) 2014 Kash Nouroozi",
+                    "license": "license-mit",
+                    "link": "https://github.com/knrz/CSV.js/blob/3.6.4/LICENSE"
+                },
+                {
+                    "name": "FileSaver.js",
+                    "version": "0.0.2",
+                    "author": "Eli Grey",
+                    "description": "File download initiator (for file exports)",
+                    "website": "https://github.com/eligrey/FileSaver.js/",
+                    "copyright": "Copyright © 2015 Eli Grey.",
+                    "license": "license-mit",
+                    "link": "https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md"
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/features/clock/bundle.js
+++ b/platform/features/clock/bundle.js
@@ -35,7 +35,8 @@ define([
    "./src/actions/StopTimerAction",
    "./src/actions/PauseTimerAction",
    "./res/templates/clock.html",
-    "./res/templates/timer.html"
+    "./res/templates/timer.html",
+    'legacyRegistry'
 ], function (
    MomentTimezone,
    ClockIndicator,
@@ -51,271 +52,269 @@ define([
    StopTimerAction,
    PauseTimerAction,
    clockTemplate,
-    timerTemplate
+    timerTemplate,
+    legacyRegistry
 ) {
-    return {
-        name:"platform/features/clock",
-        definition: {
-            "name": "Clocks/Timers",
-            "descriptions": "Domain objects for displaying current & relative times.",
-            "configuration": {
-                "paths": {
-                    "moment-duration-format": "moment-duration-format"
+    legacyRegistry.register("platform/features/clock", {
+        "name": "Clocks/Timers",
+        "descriptions": "Domain objects for displaying current & relative times.",
+        "configuration": {
+            "paths": {
+                "moment-duration-format": "moment-duration-format"
+            },
+            "shim": {
+                "moment-duration-format": {
+                    "deps": [
+                        "moment"
+                    ]
+                }
+            }
+        },
+        "extensions": {
+            "constants": [
+                {
+                    "key": "CLOCK_INDICATOR_FORMAT",
+                    "value": "YYYY/MM/DD HH:mm:ss"
+                }
+            ],
+            "indicators": [
+                {
+                    "implementation": ClockIndicator,
+                    "depends": [
+                        "tickerService",
+                        "CLOCK_INDICATOR_FORMAT"
+                    ],
+                    "priority": "preferred"
+                }
+            ],
+            "services": [
+                {
+                    "key": "tickerService",
+                    "implementation": TickerService,
+                    "depends": [
+                        "$timeout",
+                        "now"
+                    ]
                },
-                "shim": {
-                    "moment-duration-format": {
-                        "deps": [
-                            "moment"
-                        ]
+                {
+                    "key": "timerService",
+                    "implementation": TimerService,
+                    "depends": ["openmct"]
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "ClockController",
+                    "implementation": ClockController,
+                    "depends": [
+                        "$scope",
+                        "tickerService"
+                    ]
+                },
+                {
+                    "key": "TimerController",
+                    "implementation": TimerController,
+                    "depends": [
+                        "$scope",
+                        "$window",
+                        "now"
+                    ]
+                },
+                {
+                    "key": "RefreshingController",
+                    "implementation": RefreshingController,
+                    "depends": [
+                        "$scope",
+                        "tickerService"
+                    ]
+                }
+            ],
+            "views": [
+                {
+                    "key": "clock",
+                    "type": "clock",
+                    "editable": false,
+                    "template": clockTemplate
+                },
+                {
+                    "key": "timer",
+                    "type": "timer",
+                    "editable": false,
+                    "template": timerTemplate
+                }
+            ],
+            "actions": [
+                {
+                    "key": "timer.follow",
+                    "implementation": FollowTimerAction,
+                    "depends": ["timerService"],
+                    "category": "contextual",
+                    "name": "Follow Timer",
+                    "cssClass": "icon-clock",
+                    "priority": "optional"
+                },
+                {
+                    "key": "timer.start",
+                    "implementation": StartTimerAction,
+                    "depends": [
+                        "now"
+                    ],
+                    "category": "contextual",
+                    "name": "Start",
+                    "cssClass": "icon-play",
+                    "priority": "preferred"
+                },
+                {
+                    "key": "timer.pause",
+                    "implementation": PauseTimerAction,
+                    "depends": [
+                        "now"
+                    ],
+                    "category": "contextual",
+                    "name": "Pause",
+                    "cssClass": "icon-pause",
+                    "priority": "preferred"
+                },
+                {
+                    "key": "timer.restart",
+                    "implementation": RestartTimerAction,
+                    "depends": [
+                        "now"
+                    ],
+                    "category": "contextual",
+                    "name": "Restart at 0",
+                    "cssClass": "icon-refresh",
+                    "priority": "preferred"
+                },
+                {
+                    "key": "timer.stop",
+                    "implementation": StopTimerAction,
+                    "depends": [
+                        "now"
+                    ],
+                    "category": "contextual",
+                    "name": "Stop",
+                    "cssClass": "icon-box",
+                    "priority": "preferred"
+                }
+            ],
+            "types": [
+                {
+                    "key": "clock",
+                    "name": "Clock",
+                    "cssClass": "icon-clock",
+                    "description": "A UTC-based clock that supports a variety of display formats. Clocks can be added to Display Layouts.",
+                    "priority": 101,
+                    "features": [
+                        "creation"
+                    ],
+                    "properties": [
+                        {
+                            "key": "clockFormat",
+                            "name": "Display Format",
+                            "control": "composite",
+                            "items": [
+                                {
+                                    "control": "select",
+                                    "options": [
+                                        {
+                                            "value": "YYYY/MM/DD hh:mm:ss",
+                                            "name": "YYYY/MM/DD hh:mm:ss"
+                                        },
+                                        {
+                                            "value": "YYYY/DDD hh:mm:ss",
+                                            "name": "YYYY/DDD hh:mm:ss"
+                                        },
+                                        {
+                                            "value": "hh:mm:ss",
+                                            "name": "hh:mm:ss"
+                                        }
+                                    ],
+                                    "cssClass": "l-inline"
+                                },
+                                {
+                                    "control": "select",
+                                    "options": [
+                                        {
+                                            "value": "clock12",
+                                            "name": "12hr"
+                                        },
+                                        {
+                                            "value": "clock24",
+                                            "name": "24hr"
+                                        }
+                                    ],
+                                    "cssClass": "l-inline"
+                                }
+                            ]
+                        },
+                        {
+                            "key": "timezone",
+                            "name": "Timezone",
+                            "control": "autocomplete",
+                            "options": MomentTimezone.tz.names()
+                        }
+                    ],
+                    "model": {
+                        "clockFormat": [
+                            "YYYY/MM/DD hh:mm:ss",
+                            "clock12"
+                        ],
+                        "timezone": "UTC"
+                    }
+                },
+                {
+                    "key": "timer",
+                    "name": "Timer",
+                    "cssClass": "icon-timer",
+                    "description": "A timer that counts up or down to a datetime. Timers can be started, stopped and reset whenever needed, and support a variety of display formats. Each Timer displays the same value to all users. Timers can be added to Display Layouts.",
+                    "priority": 100,
+                    "features": [
+                        "creation"
+                    ],
+                    "properties": [
+                        {
+                            "key": "timestamp",
+                            "control": "datetime",
+                            "name": "Target"
+                        },
+                        {
+                            "key": "timerFormat",
+                            "control": "select",
+                            "name": "Display Format",
+                            "options": [
+                                {
+                                    "value": "long",
+                                    "name": "DDD hh:mm:ss"
+                                },
+                                {
+                                    "value": "short",
+                                    "name": "hh:mm:ss"
+                                }
+                            ]
+                        }
+                    ],
+                    "model": {
+                        "timerFormat": "DDD hh:mm:ss"
                    }
                }
-            },
-            "extensions": {
-                "constants": [
-                    {
-                        "key": "CLOCK_INDICATOR_FORMAT",
-                        "value": "YYYY/MM/DD HH:mm:ss"
-                    }
-                ],
-                "indicators": [
-                    {
-                        "implementation": ClockIndicator,
-                        "depends": [
-                            "tickerService",
-                            "CLOCK_INDICATOR_FORMAT"
-                        ],
-                        "priority": "preferred"
-                    }
-                ],
-                "services": [
-                    {
-                        "key": "tickerService",
-                        "implementation": TickerService,
-                        "depends": [
-                            "$timeout",
-                            "now"
-                        ]
-                    },
-                    {
-                        "key": "timerService",
-                        "implementation": TimerService,
-                        "depends": ["openmct"]
-                    }
-                ],
-                "controllers": [
-                    {
-                        "key": "ClockController",
-                        "implementation": ClockController,
-                        "depends": [
-                            "$scope",
-                            "tickerService"
-                        ]
-                    },
-                    {
-                        "key": "TimerController",
-                        "implementation": TimerController,
-                        "depends": [
-                            "$scope",
-                            "$window",
-                            "now"
-                        ]
-                    },
-                    {
-                        "key": "RefreshingController",
-                        "implementation": RefreshingController,
-                        "depends": [
-                            "$scope",
-                            "tickerService"
-                        ]
-                    }
-                ],
-                "views": [
-                    {
-                        "key": "clock",
-                        "type": "clock",
-                        "editable": false,
-                        "template": clockTemplate
-                    },
-                    {
-                        "key": "timer",
-                        "type": "timer",
-                        "editable": false,
-                        "template": timerTemplate
-                    }
-                ],
-                "actions": [
-                    {
-                        "key": "timer.follow",
-                        "implementation": FollowTimerAction,
-                        "depends": ["timerService"],
-                        "category": "contextual",
-                        "name": "Follow Timer",
-                        "cssClass": "icon-clock",
-                        "priority": "optional"
-                    },
-                    {
-                        "key": "timer.start",
-                        "implementation": StartTimerAction,
-                        "depends": [
-                            "now"
-                        ],
-                        "category": "contextual",
-                        "name": "Start",
-                        "cssClass": "icon-play",
-                        "priority": "preferred"
-                    },
-                    {
-                        "key": "timer.pause",
-                        "implementation": PauseTimerAction,
-                        "depends": [
-                            "now"
-                        ],
-                        "category": "contextual",
-                        "name": "Pause",
-                        "cssClass": "icon-pause",
-                        "priority": "preferred"
-                    },
-                    {
-                        "key": "timer.restart",
-                        "implementation": RestartTimerAction,
-                        "depends": [
-                            "now"
-                        ],
-                        "category": "contextual",
-                        "name": "Restart at 0",
-                        "cssClass": "icon-refresh",
-                        "priority": "preferred"
-                    },
-                    {
-                        "key": "timer.stop",
-                        "implementation": StopTimerAction,
-                        "depends": [
-                            "now"
-                        ],
-                        "category": "contextual",
-                        "name": "Stop",
-                        "cssClass": "icon-box",
-                        "priority": "preferred"
-                    }
-                ],
-                "types": [
-                    {
-                        "key": "clock",
-                        "name": "Clock",
-                        "cssClass": "icon-clock",
-                        "description": "A UTC-based clock that supports a variety of display formats. Clocks can be added to Display Layouts.",
-                        "priority": 101,
-                        "features": [
-                            "creation"
-                        ],
-                        "properties": [
-                            {
-                                "key": "clockFormat",
-                                "name": "Display Format",
-                                "control": "composite",
-                                "items": [
-                                    {
-                                        "control": "select",
-                                        "options": [
-                                            {
-                                                "value": "YYYY/MM/DD hh:mm:ss",
-                                                "name": "YYYY/MM/DD hh:mm:ss"
-                                            },
-                                            {
-                                                "value": "YYYY/DDD hh:mm:ss",
-                                                "name": "YYYY/DDD hh:mm:ss"
-                                            },
-                                            {
-                                                "value": "hh:mm:ss",
-                                                "name": "hh:mm:ss"
-                                            }
-                                        ],
-                                        "cssClass": "l-inline"
-                                    },
-                                    {
-                                        "control": "select",
-                                        "options": [
-                                            {
-                                                "value": "clock12",
-                                                "name": "12hr"
-                                            },
-                                            {
-                                                "value": "clock24",
-                                                "name": "24hr"
-                                            }
-                                        ],
-                                        "cssClass": "l-inline"
-                                    }
-                                ]
-                            },
-                            {
-                                "key": "timezone",
-                                "name": "Timezone",
-                                "control": "autocomplete",
-                                "options": MomentTimezone.tz.names()
-                            }
-                        ],
-                        "model": {
-                            "clockFormat": [
-                                "YYYY/MM/DD hh:mm:ss",
-                                "clock12"
-                            ],
-                            "timezone": "UTC"
-                        }
-                    },
-                    {
-                        "key": "timer",
-                        "name": "Timer",
-                        "cssClass": "icon-timer",
-                        "description": "A timer that counts up or down to a datetime. Timers can be started, stopped and reset whenever needed, and support a variety of display formats. Each Timer displays the same value to all users. Timers can be added to Display Layouts.",
-                        "priority": 100,
-                        "features": [
-                            "creation"
-                        ],
-                        "properties": [
-                            {
-                                "key": "timestamp",
-                                "control": "datetime",
-                                "name": "Target"
-                            },
-                            {
-                                "key": "timerFormat",
-                                "control": "select",
-                                "name": "Display Format",
-                                "options": [
-                                    {
-                                        "value": "long",
-                                        "name": "DDD hh:mm:ss"
-                                    },
-                                    {
-                                        "value": "short",
-                                        "name": "hh:mm:ss"
-                                    }
-                                ]
-                            }
-                        ],
-                        "model": {
-                            "timerFormat": "DDD hh:mm:ss"
-                        }
-                    }
-                ],
-                "runs": [{
-                    "implementation": FollowIndicator,
-                    "depends": ["openmct", "timerService"]
-                }],
-                "licenses": [
-                    {
-                        "name": "moment-duration-format",
-                        "version": "1.3.0",
-                        "author": "John Madhavan-Reese",
-                        "description": "Duration parsing/formatting",
-                        "website": "https://github.com/jsmreese/moment-duration-format",
-                        "copyright": "Copyright 2014 John Madhavan-Reese",
-                        "license": "license-mit",
-                        "link": "https://github.com/jsmreese/moment-duration-format/blob/master/LICENSE"
-                    }
-                ]
-            }
+            ],
+            "runs": [{
+                "implementation": FollowIndicator,
+                "depends": ["openmct", "timerService"]
+            }],
+            "licenses": [
+                {
+                    "name": "moment-duration-format",
+                    "version": "1.3.0",
+                    "author": "John Madhavan-Reese",
+                    "description": "Duration parsing/formatting",
+                    "website": "https://github.com/jsmreese/moment-duration-format",
+                    "copyright": "Copyright 2014 John Madhavan-Reese",
+                    "license": "license-mit",
+                    "link": "https://github.com/jsmreese/moment-duration-format/blob/master/LICENSE"
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/features/hyperlink/bundle.js
+++ b/platform/features/hyperlink/bundle.js
@@ -22,99 +22,98 @@

 define([
    './src/HyperlinkController',
+    'legacyRegistry',
    './res/templates/hyperlink.html'
 ], function (
    HyperlinkController,
+    legacyRegistry,
    hyperlinkTemplate
 ) {
-    return {
-        name:"platform/features/hyperlink",
-        definition: {
-            "name": "Hyperlink",
-            "description": "Insert a hyperlink to reference a link",
-            "extensions": {
-                "types": [
-                    {
-                        "key": "hyperlink",
-                        "name": "Hyperlink",
-                        "cssClass": "icon-chain-links",
-                        "description": "A hyperlink to redirect to a different link",
-                        "features": ["creation"],
-                        "properties": [
-                            {
-                                "key": "url",
-                                "name": "URL",
-                                "control": "textfield",
-                                "required": true,
-                                "cssClass": "l-input-lg"
-                            },
+    legacyRegistry.register("platform/features/hyperlink", {
+        "name": "Hyperlink",
+        "description": "Insert a hyperlink to reference a link",
+        "extensions": {
+            "types": [
+                {
+                    "key": "hyperlink",
+                    "name": "Hyperlink",
+                    "cssClass": "icon-chain-links",
+                    "description": "A hyperlink to redirect to a different link",
+                    "features": ["creation"],
+                    "properties": [
+                        {
+                            "key": "url",
+                            "name": "URL",
+                            "control": "textfield",
+                            "required": true,
+                            "cssClass": "l-input-lg"
+                        },

-                            {
-                                "key": "displayText",
-                                "name": "Text to Display",
-                                "control": "textfield",
-                                "required": true,
-                                "cssClass": "l-input-lg"
-                            },
-                            {
-                                "key": "displayFormat",
-                                "name": "Display Format",
-                                "control": "select",
-                                "options": [
-                                    {
-                                        "name": "Link",
-                                        "value": "link"
-                                    },
-                                    {
-                                        "value": "button",
-                                        "name": "Button"
-                                    }
-                                ],
-                                "cssClass": "l-inline"
-                            },
-                            {
-                                "key": "openNewTab",
-                                "name": "Tab to Open Hyperlink",
-                                "control": "select",
-                                "options": [
-                                    {
-                                        "name": "Open in this tab",
-                                        "value": "thisTab"
-                                    },
-                                    {
-                                        "value": "newTab",
-                                        "name": "Open in a new tab"
-                                    }
-                                ],
-                                "cssClass": "l-inline"
+                        {
+                            "key": "displayText",
+                            "name": "Text to Display",
+                            "control": "textfield",
+                            "required": true,
+                            "cssClass": "l-input-lg"
+                        },
+                        {
+                            "key": "displayFormat",
+                            "name": "Display Format",
+                            "control": "select",
+                            "options": [
+                                {
+                                    "name": "Link",
+                                    "value": "link"
+                                },
+                                {
+                                    "value": "button",
+                                    "name": "Button"
+                                }
+                            ],
+                            "cssClass": "l-inline"
+                        },
+                        {
+                            "key": "openNewTab",
+                            "name": "Tab to Open Hyperlink",
+                            "control": "select",
+                            "options": [
+                                {
+                                    "name": "Open in this tab",
+                                    "value": "thisTab"
+                                },
+                                {
+                                    "value": "newTab",
+                                    "name": "Open in a new tab"
+                                }
+                            ],
+                            "cssClass": "l-inline"

-                            }
-                        ],
-                        "model": {
-                            "displayFormat": "link",
-                            "openNewTab": "thisTab",
-                            "removeTitle": true
                        }
+                    ],
+                    "model": {
+                        "displayFormat": "link",
+                        "openNewTab": "thisTab",
+                        "removeTitle": true
+                    }

-                    }
-                ],
-                "views": [
-                    {
-                        "key": "hyperlink",
-                        "type": "hyperlink",
-                        "name": "Hyperlink Display",
-                        "template": hyperlinkTemplate,
-                        "editable": false
-                    }
-                ],
-                "controllers": [
-                    {
-                        "key": "HyperlinkController",
-                        "implementation": HyperlinkController,
-                        "depends": ["$scope"]
-                    }
-                ]
-            }
+                }
+            ],
+            "views": [
+                {
+                    "key": "hyperlink",
+                    "type": "hyperlink",
+                    "name": "Hyperlink Display",
+                    "template": hyperlinkTemplate,
+                    "editable": false
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "HyperlinkController",
+                    "implementation": HyperlinkController,
+                    "depends": ["$scope"]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/features/imagery/bundle.js
+++ b/platform/features/imagery/bundle.js
@@ -24,63 +24,62 @@ define([
    "./src/policies/ImageryViewPolicy",
    "./src/controllers/ImageryController",
    "./src/directives/MCTBackgroundImage",
-    "./res/templates/imagery.html"
+    "./res/templates/imagery.html",
+    'legacyRegistry'
 ], function (
    ImageryViewPolicy,
    ImageryController,
    MCTBackgroundImage,
-    imageryTemplate
+    imageryTemplate,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/features/imagery",
-        definition: {
-            "name": "Plot view for telemetry",
-            "extensions": {
-                "views": [
-                    {
-                        "name": "Imagery",
-                        "key": "imagery",
-                        "cssClass": "icon-image",
-                        "template": imageryTemplate,
-                        "priority": "preferred",
-                        "needs": [
-                            "telemetry"
-                        ],
-                        "editable": false
-                    }
-                ],
-                "policies": [
-                    {
-                        "category": "view",
-                        "implementation": ImageryViewPolicy,
-                        "depends": [
-                            "openmct"
-                        ]
-                    }
-                ],
-                "controllers": [
-                    {
-                        "key": "ImageryController",
-                        "implementation": ImageryController,
-                        "depends": [
-                            "$scope",
-                            "$window",
-                            "$element",
-                            "openmct"
-                        ]
-                    }
-                ],
-                "directives": [
-                    {
-                        "key": "mctBackgroundImage",
-                        "implementation": MCTBackgroundImage,
-                        "depends": [
-                            "$document"
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/features/imagery", {
+        "name": "Plot view for telemetry",
+        "extensions": {
+            "views": [
+                {
+                    "name": "Imagery",
+                    "key": "imagery",
+                    "cssClass": "icon-image",
+                    "template": imageryTemplate,
+                    "priority": "preferred",
+                    "needs": [
+                        "telemetry"
+                    ],
+                    "editable": false
+                }
+            ],
+            "policies": [
+                {
+                    "category": "view",
+                    "implementation": ImageryViewPolicy,
+                    "depends": [
+                        "openmct"
+                    ]
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "ImageryController",
+                    "implementation": ImageryController,
+                    "depends": [
+                        "$scope",
+                        "$window",
+                        "$element",
+                        "openmct"
+                    ]
+                }
+            ],
+            "directives": [
+                {
+                    "key": "mctBackgroundImage",
+                    "implementation": MCTBackgroundImage,
+                    "depends": [
+                        "$document"
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/features/my-items/bundle.js
+++ b/platform/features/my-items/bundle.js
@@ -20,30 +20,32 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-define([], function () {
-    return {
-        name:"platform/features/my-items",
-        definition: {
-            "name": "My Items",
-            "description": "Defines a root named My Items",
-            "extensions": {
-                "roots": [
-                    {
-                        "id": "mine"
+define([
+    'legacyRegistry'
+], function (
+    legacyRegistry
+) {
+
+    legacyRegistry.register("platform/features/my-items", {
+        "name": "My Items",
+        "description": "Defines a root named My Items",
+        "extensions": {
+            "roots": [
+                {
+                    "id": "mine"
+                }
+            ],
+            "models": [
+                {
+                    "id": "mine",
+                    "model": {
+                        "name": "My Items",
+                        "type": "folder",
+                        "composition": [],
+                        "location": "ROOT"
                    }
-                ],
-                "models": [
-                    {
-                        "id": "mine",
-                        "model": {
-                            "name": "My Items",
-                            "type": "folder",
-                            "composition": [],
-                            "location": "ROOT"
-                        }
-                    }
-                ]
-            }
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/features/pages/bundle.js
+++ b/platform/features/pages/bundle.js
@@ -22,56 +22,55 @@

 define([
    "./src/EmbeddedPageController",
-    "./res/iframe.html"
+    "./res/iframe.html",
+    'legacyRegistry'
 ], function (
    EmbeddedPageController,
-    iframeTemplate
+    iframeTemplate,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/features/pages",
-        definition: {
-            "extensions": {
-                "types": [
-                    {
-                        "key": "example.page",
-                        "name": "Web Page",
-                        "cssClass": "icon-page",
-                        "description": "Embed a web page or web-based image in a resizeable window component. Can be added to Display Layouts. Note that the URL being embedded must allow iframing.",
-                        "priority": 50,
-                        "features": [
-                            "creation"
-                        ],
-                        "properties": [
-                            {
-                                "key": "url",
-                                "name": "URL",
-                                "control": "textfield",
-                                "required": true,
-                                "cssClass": "l-input-lg"
-                            }
-                        ]
-                    }
-                ],
-                "views": [
-                    {
-                        "template": iframeTemplate,
-                        "name": "Page",
-                        "type": "example.page",
-                        "key": "example.page",
-                        "editable": false
-                    }
-                ],
-                "controllers": [
-                    {
-                        "key": "EmbeddedPageController",
-                        "implementation": EmbeddedPageController,
-                        "depends": [
-                            "$sce"
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/features/pages", {
+        "extensions": {
+            "types": [
+                {
+                    "key": "example.page",
+                    "name": "Web Page",
+                    "cssClass": "icon-page",
+                    "description": "Embed a web page or web-based image in a resizeable window component. Can be added to Display Layouts. Note that the URL being embedded must allow iframing.",
+                    "priority": 50,
+                    "features": [
+                        "creation"
+                    ],
+                    "properties": [
+                        {
+                            "key": "url",
+                            "name": "URL",
+                            "control": "textfield",
+                            "required": true,
+                            "cssClass": "l-input-lg"
+                        }
+                    ]
+                }
+            ],
+            "views": [
+                {
+                    "template": iframeTemplate,
+                    "name": "Page",
+                    "type": "example.page",
+                    "key": "example.page",
+                    "editable": false
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "EmbeddedPageController",
+                    "implementation": EmbeddedPageController,
+                    "depends": [
+                        "$sce"
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/features/pages/res/iframe.html
+++ b/platform/features/pages/res/iframe.html
@@ -0,0 +1,26 @@
+<!--
+ 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="l-iframe abs">
+<iframe ng-controller="EmbeddedPageController as ctl"
+        ng-src="{{ctl.trust(model.url)}}">
+</iframe>
+</div>
--- a/platform/features/pages/src/EmbeddedPageController.js
+++ b/platform/features/pages/src/EmbeddedPageController.js
@@ -20,26 +20,36 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-import WebPageViewProvider from './WebPageViewProvider.js';
+/**
+ * This bundle adds the Web Page object type, which can be used to embed
+ * other web pages with layouts.
+ * @namespace platform/features/pages
+ */
+define(
+    [],
+    function () {

-export default function plugin() {
-    return function install(openmct) {
-        openmct.objectViews.addProvider(new WebPageViewProvider(openmct));
+        /**
+         * Controller for embedded web pages; serves simply as a
+         * wrapper for `$sce` to mark pages as trusted.
+         * @constructor
+         * @memberof platform/features/pages
+         */
+        function EmbeddedPageController($sce) {
+            this.$sce = $sce;
+        }

-        openmct.types.addType('webPage', {
-            name: "Web Page",
-            description: "Embed a web page or web-based image in a resizeable window component. Note that the URL being embedded must allow iframing.",
-            creatable: true,
-            cssClass: 'icon-page',
-            form: [
-                {
-                    "key": "url",
-                    "name": "URL",
-                    "control": "textfield",
-                    "required": true,
-                    "cssClass": "l-input-lg"
-                }
-            ]
-        });
-    };
-}
+        /**
+         * Alias of `$sce.trustAsResourceUrl`.
+         * @param {string} url the URL to trust
+         * @returns {string} the trusted URL
+         */
+        EmbeddedPageController.prototype.trust = function (url) {
+            return this.$sce.trustAsResourceUrl(url);
+        };
+
+
+        return EmbeddedPageController;
+    }
+
+);
--- a/platform/features/pages/test/EmbeddedPageControllerSpec.js
+++ b/platform/features/pages/test/EmbeddedPageControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2019, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -20,32 +20,37 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-/***************** PLOTLY OVERRIDES */
-.plot-container.plotly {
-    .bglayer .bg {
-        fill: $colorPlotBg !important;
-        fill-opacity: 1 !important;
-        stroke: $colorInteriorBorder;
-        stroke-width: 1 !important;
-    }
+define(
+    ["../src/EmbeddedPageController"],
+    function (EmbeddedPageController) {

-    .cartesianlayer .gridlayer {
-        .x,
-        .y {
-            path {
-                opacity: $opacityPlotHash;
-                stroke: $colorPlotHash !important;
-            }
-        }
-    }
+        describe("The controller for embedded pages", function () {
+            var mockSCE,
+                controller;

-    .xtick,
-    .ytick,
-    .g-xtitle,
-    .g-ytitle {
-        text {
-            fill: $colorPlotFg !important;
-            font-size: 12px !important;
-        }
+            beforeEach(function () {
+                mockSCE = jasmine.createSpyObj(
+                    '$sce',
+                    ["trustAsResourceUrl"]
+                );
+
+                mockSCE.trustAsResourceUrl.and.callFake(function (v) {
+                    return v;
+                });
+
+                controller = new EmbeddedPageController(mockSCE);
+            });
+
+            it("allows URLs to be marked as trusted", function () {
+                var testURL = "http://www.nasa.gov";
+
+                expect(controller.trust(testURL))
+                    .toEqual(testURL);
+
+                expect(mockSCE.trustAsResourceUrl)
+                    .toHaveBeenCalledWith(testURL);
+            });
+
+        });
    }
-}
+);
--- a/platform/features/static-markup/bundle.js
+++ b/platform/features/static-markup/bundle.js
@@ -22,35 +22,35 @@

 define([

-    "./res/markup.html"
+    "./res/markup.html",
+    'legacyRegistry'
 ], function (
-    markupTemplate
+
+    markupTemplate,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/features/static-markup",
-        definition: {
-            "extensions": {
-                "types": [
-                    {
-                        "key": "static.markup",
-                        "name": "Static Markup",
-                        "cssClass": "icon-pencil",
-                        "description": "Static markup sandbox",
-                        "features": [
-                            "creation"
-                        ]
-                    }
-                ],
-                "views": [
-                    {
-                        "template": markupTemplate,
-                        "name": "Static Markup",
-                        "type": "static.markup",
-                        "key": "static.markup"
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/features/static-markup", {
+        "extensions": {
+            "types": [
+                {
+                    "key": "static.markup",
+                    "name": "Static Markup",
+                    "cssClass": "icon-pencil",
+                    "description": "Static markup sandbox",
+                    "features": [
+                        "creation"
+                    ]
+                }
+            ],
+            "views": [
+                {
+                    "template": markupTemplate,
+                    "name": "Static Markup",
+                    "type": "static.markup",
+                    "key": "static.markup"
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/features/timeline/bundle.js
+++ b/platform/features/timeline/bundle.js
@@ -21,32 +21,31 @@
 *****************************************************************************/

 define([
-    "./res/templates/deprecated-timeline-message.html"
+    "./res/templates/deprecated-timeline-message.html",
+    'legacyRegistry'
 ], function (
-    deprecatedTimelineMessage
+    deprecatedTimelineMessage,
+    legacyRegistry
 ) {
-    return {
-        name: 'platform/features/timeline',
-        definition: {
-            extensions: {
-                types: [
-                    {
-                        key: "timeline",
-                        name: "Timeline",
-                        description: "Timeline, Activity and Activity Mode objects have been deprecated and will no longer be supported. (07/18/2018)",
-                        priority: 502
-                    }
-                ],
-                views: [
-                    {
-                        key: "timeline",
-                        name: "Timeline",
-                        type: "timeline",
-                        description: "Timeline, Activity and Activity Mode objects have been deprecated and will no longer be supported. (07/18/2018)",
-                        template: deprecatedTimelineMessage
-                    }
-                ]
-            }
+    legacyRegistry.register('platform/features/timeline', {
+        extensions: {
+            types: [
+                {
+                    key: "timeline",
+                    name: "Timeline",
+                    description: "Timeline, Activity and Activity Mode objects have been deprecated and will no longer be supported. (07/18/2018)",
+                    priority: 502
+                }
+            ],
+            views: [
+                {
+                    key: "timeline",
+                    name: "Timeline",
+                    type: "timeline",
+                    description: "Timeline, Activity and Activity Mode objects have been deprecated and will no longer be supported. (07/18/2018)",
+                    template: deprecatedTimelineMessage
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/forms/bundle.js
+++ b/platform/forms/bundle.js
@@ -45,7 +45,8 @@ define([
    "./res/templates/controls/dialog.html",
    "./res/templates/controls/radio.html",
    "./res/templates/controls/file-input.html",
-    "./res/templates/controls/snap-view.html"
+    "./res/templates/controls/snap-view.html",
+    'legacyRegistry'
 ], function (
    MCTForm,
    MCTControl,
@@ -71,148 +72,146 @@ define([
    dialogTemplate,
    radioTemplate,
    fileInputTemplate,
-    snapViewTemplate
+    snapViewTemplate,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/forms",
-        definition: {
-            "name": "MCT Forms",
-            "description": "Form generator; includes directive and some controls.",
-            "extensions": {
-                "directives": [
-                    {
-                        "key": "mctForm",
-                        "implementation": MCTForm
-                    },
-                    {
-                        "key": "mctControl",
-                        "implementation": MCTControl,
-                        "depends": [
-                            "templateLinker",
-                            "controls[]"
-                        ]
-                    },
-                    {
-                        "key": "mctFileInput",
-                        "implementation": MCTFileInput,
-                        "depends": [
-                            "fileInputService"
-                        ]
-                    }
-                ],
-                "controls": [
-                    {
-                        "key": "autocomplete",
-                        "template": autocompleteTemplate
-                    },
-                    {
-                        "key": "checkbox",
-                        "template": checkboxTemplate
-                    },
-                    {
-                        "key": "radio",
-                        "template": radioTemplate
-                    },
-                    {
-                        "key": "datetime",
-                        "template": datetimeTemplate
-                    },
-                    {
-                        "key": "select",
-                        "template": selectTemplate
-                    },
-                    {
-                        "key": "textfield",
-                        "template": textfieldTemplate
-                    },
-                    {
-                        "key": "numberfield",
-                        "template": numberfieldTemplate
-                    },
-                    {
-                        "key": "textarea",
-                        "template": textareaTemplate
-                    },
-                    {
-                        "key": "button",
-                        "template": buttonTemplate
-                    },
-                    {
-                        "key": "color",
-                        "template": colorTemplate
-                    },
-                    {
-                        "key": "composite",
-                        "template": compositeTemplate
-                    },
-                    {
-                        "key": "menu-button",
-                        "template": menuButtonTemplate
-                    },
-                    {
-                        "key": "dialog-button",
-                        "template": dialogTemplate
-                    },
-                    {
-                        "key": "file-input",
-                        "template": fileInputTemplate
-                    },
-                    {
-                        "key": "snap-view",
-                        "template": snapViewTemplate
-                    }
-                ],
-                "controllers": [
-                    {
-                        "key": "AutocompleteController",
-                        "implementation": AutocompleteController,
-                        "depends": [
-                            "$scope",
-                            "$element"
-                        ]
-                    },
-                    {
-                        "key": "DateTimeController",
-                        "implementation": DateTimeController,
-                        "depends": [
-                            "$scope"
-                        ]
-                    },
-                    {
-                        "key": "CompositeController",
-                        "implementation": CompositeController
-                    },
-                    {
-                        "key": "ColorController",
-                        "implementation": ColorController
-                    },
-                    {
-                        "key": "DialogButtonController",
-                        "implementation": DialogButtonController,
-                        "depends": [
-                            "$scope",
-                            "dialogService"
-                        ]
-                    },
-                    {
-                        "key": "SnapshotPreviewController",
-                        "implementation": SnapshotPreviewController,
-                        "depends": [
-                            "$scope",
-                            "openmct"
-                        ]
-                    }
-                ],
-                "components": [
-                    {
-                        "provides": "fileInputService",
-                        "type": "provider",
-                        "implementation": FileInputService
-                    }
+    legacyRegistry.register("platform/forms", {
+        "name": "MCT Forms",
+        "description": "Form generator; includes directive and some controls.",
+        "extensions": {
+            "directives": [
+                {
+                    "key": "mctForm",
+                    "implementation": MCTForm
+                },
+                {
+                    "key": "mctControl",
+                    "implementation": MCTControl,
+                    "depends": [
+                        "templateLinker",
+                        "controls[]"
+                    ]
+                },
+                {
+                    "key": "mctFileInput",
+                    "implementation": MCTFileInput,
+                    "depends": [
+                        "fileInputService"
+                    ]
+                }
+            ],
+            "controls": [
+                {
+                    "key": "autocomplete",
+                    "template": autocompleteTemplate
+                },
+                {
+                    "key": "checkbox",
+                    "template": checkboxTemplate
+                },
+                {
+                    "key": "radio",
+                    "template": radioTemplate
+                },
+                {
+                    "key": "datetime",
+                    "template": datetimeTemplate
+                },
+                {
+                    "key": "select",
+                    "template": selectTemplate
+                },
+                {
+                    "key": "textfield",
+                    "template": textfieldTemplate
+                },
+                {
+                    "key": "numberfield",
+                    "template": numberfieldTemplate
+                },
+                {
+                    "key": "textarea",
+                    "template": textareaTemplate
+                },
+                {
+                    "key": "button",
+                    "template": buttonTemplate
+                },
+                {
+                    "key": "color",
+                    "template": colorTemplate
+                },
+                {
+                    "key": "composite",
+                    "template": compositeTemplate
+                },
+                {
+                    "key": "menu-button",
+                    "template": menuButtonTemplate
+                },
+                {
+                    "key": "dialog-button",
+                    "template": dialogTemplate
+                },
+                {
+                    "key": "file-input",
+                    "template": fileInputTemplate
+                },
+                {
+                    "key": "snap-view",
+                    "template": snapViewTemplate
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "AutocompleteController",
+                    "implementation": AutocompleteController,
+                    "depends": [
+                        "$scope",
+                        "$element"
+                    ]
+                },
+                {
+                    "key": "DateTimeController",
+                    "implementation": DateTimeController,
+                    "depends": [
+                        "$scope"
+                    ]
+                },
+                {
+                    "key": "CompositeController",
+                    "implementation": CompositeController
+                },
+                {
+                    "key": "ColorController",
+                    "implementation": ColorController
+                },
+                {
+                    "key": "DialogButtonController",
+                    "implementation": DialogButtonController,
+                    "depends": [
+                        "$scope",
+                        "dialogService"
+                    ]
+                },
+                {
+                    "key": "SnapshotPreviewController",
+                    "implementation": SnapshotPreviewController,
+                    "depends": [
+                        "$scope",
+                        "openmct"
+                    ]
+                }
+            ],
+            "components": [
+                {
+                    "provides": "fileInputService",
+                    "type": "provider",
+                    "implementation": FileInputService
+                }

-                ]
-            }
+            ]
        }
-    };
+    });
 });
--- a/platform/framework/bundle.js
+++ b/platform/framework/bundle.js
@@ -20,88 +20,91 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-define([], function () {
+define([

-    return {
-        name:"platform/framework",
-        definition: {
-            "name": "Open MCT Framework Component",
-            "description": "Framework layer for Open MCT; interprets bundle definitions and serves as an intermediary between Require and Angular",
-            "libraries": "lib",
-            "configuration": {
-                "paths": {
-                    "angular": "angular.min"
-                },
-                "shim": {
-                    "angular": {
-                        "exports": "angular"
-                    }
-                }
+    'legacyRegistry'
+], function (
+
+    legacyRegistry
+) {
+
+    legacyRegistry.register("platform/framework", {
+        "name": "Open MCT Framework Component",
+        "description": "Framework layer for Open MCT; interprets bundle definitions and serves as an intermediary between Require and Angular",
+        "libraries": "lib",
+        "configuration": {
+            "paths": {
+                "angular": "angular.min"
            },
-            "extensions": {
-                "licenses": [
-                    {
-                        "name": "Blanket.js",
-                        "version": "1.1.5",
-                        "description": "Code coverage measurement and reporting",
-                        "author": "Alex Seville",
-                        "website": "http://blanketjs.org/",
-                        "copyright": "Copyright (c) 2013 Alex Seville",
-                        "license": "license-mit",
-                        "link": "http://opensource.org/licenses/MIT"
-                    },
-                    {
-                        "name": "Jasmine",
-                        "version": "1.3.1",
-                        "description": "Unit testing",
-                        "author": "Pivotal Labs",
-                        "website": "http://jasmine.github.io/",
-                        "copyright": "Copyright (c) 2008-2011 Pivotal Labs",
-                        "license": "license-mit",
-                        "link": "http://opensource.org/licenses/MIT"
-                    },
-                    {
-                        "name": "RequireJS",
-                        "version": "2.1.22",
-                        "description": "Script loader",
-                        "author": "The Dojo Foundation",
-                        "website": "http://requirejs.org/",
-                        "copyright": "Copyright (c) 2010-2015, The Dojo Foundation",
-                        "license": "license-mit",
-                        "link": "https://github.com/jrburke/requirejs/blob/master/LICENSE"
-                    },
-                    {
-                        "name": "AngularJS",
-                        "version": "1.4.4",
-                        "description": "Client-side web application framework",
-                        "author": "Google",
-                        "website": "http://angularjs.org/",
-                        "copyright": "Copyright (c) 2010-2015 Google, Inc. http://angularjs.org",
-                        "license": "license-mit",
-                        "link": "https://github.com/angular/angular.js/blob/v1.4.4/LICENSE"
-                    },
-                    {
-                        "name": "Angular-Route",
-                        "version": "1.4.4",
-                        "description": "Client-side view routing",
-                        "author": "Google",
-                        "website": "http://angularjs.org/",
-                        "copyright": "Copyright (c) 2010-2015 Google, Inc. http://angularjs.org",
-                        "license": "license-mit",
-                        "link": "https://github.com/angular/angular.js/blob/v1.4.4/LICENSE"
-                    },
-                    {
-                        "name": "ES6-Promise",
-                        "version": "3.0.2",
-                        "description": "Promise polyfill for pre-ECMAScript 6 browsers",
-                        "author": "Yehuda Katz, Tom Dale, Stefan Penner and contributors",
-                        "website": "https://github.com/jakearchibald/es6-promise",
-                        "copyright": "Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors",
-                        "license": "license-mit",
-                        "link": "https://github.com/jakearchibald/es6-promise/blob/master/LICENSE"
-                    }
-                ]
+            "shim": {
+                "angular": {
+                    "exports": "angular"
+                }
            }
+        },
+        "extensions": {
+            "licenses": [
+                {
+                    "name": "Blanket.js",
+                    "version": "1.1.5",
+                    "description": "Code coverage measurement and reporting",
+                    "author": "Alex Seville",
+                    "website": "http://blanketjs.org/",
+                    "copyright": "Copyright (c) 2013 Alex Seville",
+                    "license": "license-mit",
+                    "link": "http://opensource.org/licenses/MIT"
+                },
+                {
+                    "name": "Jasmine",
+                    "version": "1.3.1",
+                    "description": "Unit testing",
+                    "author": "Pivotal Labs",
+                    "website": "http://jasmine.github.io/",
+                    "copyright": "Copyright (c) 2008-2011 Pivotal Labs",
+                    "license": "license-mit",
+                    "link": "http://opensource.org/licenses/MIT"
+                },
+                {
+                    "name": "RequireJS",
+                    "version": "2.1.22",
+                    "description": "Script loader",
+                    "author": "The Dojo Foundation",
+                    "website": "http://requirejs.org/",
+                    "copyright": "Copyright (c) 2010-2015, The Dojo Foundation",
+                    "license": "license-mit",
+                    "link": "https://github.com/jrburke/requirejs/blob/master/LICENSE"
+                },
+                {
+                    "name": "AngularJS",
+                    "version": "1.4.4",
+                    "description": "Client-side web application framework",
+                    "author": "Google",
+                    "website": "http://angularjs.org/",
+                    "copyright": "Copyright (c) 2010-2015 Google, Inc. http://angularjs.org",
+                    "license": "license-mit",
+                    "link": "https://github.com/angular/angular.js/blob/v1.4.4/LICENSE"
+                },
+                {
+                    "name": "Angular-Route",
+                    "version": "1.4.4",
+                    "description": "Client-side view routing",
+                    "author": "Google",
+                    "website": "http://angularjs.org/",
+                    "copyright": "Copyright (c) 2010-2015 Google, Inc. http://angularjs.org",
+                    "license": "license-mit",
+                    "link": "https://github.com/angular/angular.js/blob/v1.4.4/LICENSE"
+                },
+                {
+                    "name": "ES6-Promise",
+                    "version": "3.0.2",
+                    "description": "Promise polyfill for pre-ECMAScript 6 browsers",
+                    "author": "Yehuda Katz, Tom Dale, Stefan Penner and contributors",
+                    "website": "https://github.com/jakearchibald/es6-promise",
+                    "copyright": "Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors",
+                    "license": "license-mit",
+                    "link": "https://github.com/jakearchibald/es6-promise/blob/master/LICENSE"
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/identity/bundle.js
+++ b/platform/identity/bundle.js
@@ -24,64 +24,63 @@ define([
    "./src/IdentityAggregator",
    "./src/IdentityProvider",
    "./src/IdentityCreationDecorator",
-    "./src/IdentityIndicator"
+    "./src/IdentityIndicator",
+    'legacyRegistry'
 ], function (
    IdentityAggregator,
    IdentityProvider,
    IdentityCreationDecorator,
-    IdentityIndicator
+    IdentityIndicator,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/identity",
-        definition: {
-            "extensions": {
-                "components": [
-                    {
-                        "implementation": IdentityAggregator,
-                        "type": "aggregator",
-                        "provides": "identityService",
-                        "depends": [
-                            "$q"
-                        ]
-                    },
-                    {
-                        "implementation": IdentityProvider,
-                        "type": "provider",
-                        "provides": "identityService",
-                        "depends": [
-                            "$q"
-                        ],
-                        "priority": "fallback"
-                    },
-                    {
-                        "type": "decorator",
-                        "provides": "creationService",
-                        "implementation": IdentityCreationDecorator,
-                        "depends": [
-                            "identityService"
-                        ]
-                    }
-                ],
-                "indicators": [
-                    {
-                        "implementation": IdentityIndicator,
-                        "depends": [
-                            "identityService"
-                        ]
-                    }
-                ],
-                "types": [
-                    {
-                        "properties": [
-                            {
-                                "key": "creator",
-                                "name": "Creator"
-                            }
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/identity", {
+        "extensions": {
+            "components": [
+                {
+                    "implementation": IdentityAggregator,
+                    "type": "aggregator",
+                    "provides": "identityService",
+                    "depends": [
+                        "$q"
+                    ]
+                },
+                {
+                    "implementation": IdentityProvider,
+                    "type": "provider",
+                    "provides": "identityService",
+                    "depends": [
+                        "$q"
+                    ],
+                    "priority": "fallback"
+                },
+                {
+                    "type": "decorator",
+                    "provides": "creationService",
+                    "implementation": IdentityCreationDecorator,
+                    "depends": [
+                        "identityService"
+                    ]
+                }
+            ],
+            "indicators": [
+                {
+                    "implementation": IdentityIndicator,
+                    "depends": [
+                        "identityService"
+                    ]
+                }
+            ],
+            "types": [
+                {
+                    "properties": [
+                        {
+                            "key": "creator",
+                            "name": "Creator"
+                        }
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/import-export/bundle.js
+++ b/platform/import-export/bundle.js
@@ -72,8 +72,6 @@ define([
                    ]
                }
            });
-
-            openmct.legacyRegistry.enable('platform/import-export');
        };
    };
 });
--- a/platform/persistence/aggregator/bundle.js
+++ b/platform/persistence/aggregator/bundle.js
@@ -21,26 +21,25 @@
 *****************************************************************************/

 define([
-    "./src/PersistenceAggregator"
+    "./src/PersistenceAggregator",
+    'legacyRegistry'
 ], function (
-    PersistenceAggregator
+    PersistenceAggregator,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/persistence/aggregator",
-        definition: {
-            "extensions": {
-                "components": [
-                    {
-                        "provides": "persistenceService",
-                        "type": "aggregator",
-                        "depends": [
-                            "$q"
-                        ],
-                        "implementation": PersistenceAggregator
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/persistence/aggregator", {
+        "extensions": {
+            "components": [
+                {
+                    "provides": "persistenceService",
+                    "type": "aggregator",
+                    "depends": [
+                        "$q"
+                    ],
+                    "implementation": PersistenceAggregator
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/persistence/couch/bundle.js
+++ b/platform/persistence/couch/bundle.js
@@ -22,57 +22,56 @@

 define([
    "./src/CouchPersistenceProvider",
-    "./src/CouchIndicator"
+    "./src/CouchIndicator",
+    'legacyRegistry'
 ], function (
    CouchPersistenceProvider,
-    CouchIndicator
+    CouchIndicator,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/persistence/couch",
-        definition: {
-            "name": "Couch Persistence",
-            "description": "Adapter to read and write objects using a CouchDB instance.",
-            "extensions": {
-                "components": [
-                    {
-                        "provides": "persistenceService",
-                        "type": "provider",
-                        "implementation": CouchPersistenceProvider,
-                        "depends": [
-                            "$http",
-                            "$q",
-                            "PERSISTENCE_SPACE",
-                            "COUCHDB_PATH"
-                        ]
-                    }
-                ],
-                "constants": [
-                    {
-                        "key": "PERSISTENCE_SPACE",
-                        "value": "mct"
-                    },
-                    {
-                        "key": "COUCHDB_PATH",
-                        "value": "/couch/openmct"
-                    },
-                    {
-                        "key": "COUCHDB_INDICATOR_INTERVAL",
-                        "value": 15000
-                    }
-                ],
-                "indicators": [
-                    {
-                        "implementation": CouchIndicator,
-                        "depends": [
-                            "$http",
-                            "$interval",
-                            "COUCHDB_PATH",
-                            "COUCHDB_INDICATOR_INTERVAL"
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/persistence/couch", {
+        "name": "Couch Persistence",
+        "description": "Adapter to read and write objects using a CouchDB instance.",
+        "extensions": {
+            "components": [
+                {
+                    "provides": "persistenceService",
+                    "type": "provider",
+                    "implementation": CouchPersistenceProvider,
+                    "depends": [
+                        "$http",
+                        "$q",
+                        "PERSISTENCE_SPACE",
+                        "COUCHDB_PATH"
+                    ]
+                }
+            ],
+            "constants": [
+                {
+                    "key": "PERSISTENCE_SPACE",
+                    "value": "mct"
+                },
+                {
+                    "key": "COUCHDB_PATH",
+                    "value": "/couch/openmct"
+                },
+                {
+                    "key": "COUCHDB_INDICATOR_INTERVAL",
+                    "value": 15000
+                }
+            ],
+            "indicators": [
+                {
+                    "implementation": CouchIndicator,
+                    "depends": [
+                        "$http",
+                        "$interval",
+                        "COUCHDB_PATH",
+                        "COUCHDB_INDICATOR_INTERVAL"
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/persistence/elastic/bundle.js
+++ b/platform/persistence/elastic/bundle.js
@@ -23,75 +23,74 @@
 define([
    "./src/ElasticPersistenceProvider",
    "./src/ElasticSearchProvider",
-    "./src/ElasticIndicator"
+    "./src/ElasticIndicator",
+    'legacyRegistry'
 ], function (
    ElasticPersistenceProvider,
    ElasticSearchProvider,
-    ElasticIndicator
+    ElasticIndicator,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/persistence/elastic",
-        definition: {
-            "name": "ElasticSearch Persistence",
-            "description": "Adapter to read and write objects using an ElasticSearch instance.",
-            "extensions": {
-                "components": [
-                    {
-                        "provides": "persistenceService",
-                        "type": "provider",
-                        "implementation": ElasticPersistenceProvider,
-                        "depends": [
-                            "$http",
-                            "$q",
-                            "PERSISTENCE_SPACE",
-                            "ELASTIC_ROOT",
-                            "ELASTIC_PATH"
-                        ]
-                    },
-                    {
-                        "provides": "searchService",
-                        "type": "provider",
-                        "implementation": ElasticSearchProvider,
-                        "depends": [
-                            "$http",
-                            "ELASTIC_ROOT"
-                        ]
-                    }
-                ],
-                "constants": [
-                    {
-                        "key": "PERSISTENCE_SPACE",
-                        "value": "mct"
-                    },
-                    {
-                        "key": "ELASTIC_ROOT",
-                        "value": "http://localhost:9200",
-                        "priority": "fallback"
-                    },
-                    {
-                        "key": "ELASTIC_PATH",
-                        "value": "mct/domain_object",
-                        "priority": "fallback"
-                    },
-                    {
-                        "key": "ELASTIC_INDICATOR_INTERVAL",
-                        "value": 15000,
-                        "priority": "fallback"
-                    }
-                ],
-                "indicators": [
-                    {
-                        "implementation": ElasticIndicator,
-                        "depends": [
-                            "$http",
-                            "$interval",
-                            "ELASTIC_ROOT",
-                            "ELASTIC_INDICATOR_INTERVAL"
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/persistence/elastic", {
+        "name": "ElasticSearch Persistence",
+        "description": "Adapter to read and write objects using an ElasticSearch instance.",
+        "extensions": {
+            "components": [
+                {
+                    "provides": "persistenceService",
+                    "type": "provider",
+                    "implementation": ElasticPersistenceProvider,
+                    "depends": [
+                        "$http",
+                        "$q",
+                        "PERSISTENCE_SPACE",
+                        "ELASTIC_ROOT",
+                        "ELASTIC_PATH"
+                    ]
+                },
+                {
+                    "provides": "searchService",
+                    "type": "provider",
+                    "implementation": ElasticSearchProvider,
+                    "depends": [
+                        "$http",
+                        "ELASTIC_ROOT"
+                    ]
+                }
+            ],
+            "constants": [
+                {
+                    "key": "PERSISTENCE_SPACE",
+                    "value": "mct"
+                },
+                {
+                    "key": "ELASTIC_ROOT",
+                    "value": "http://localhost:9200",
+                    "priority": "fallback"
+                },
+                {
+                    "key": "ELASTIC_PATH",
+                    "value": "mct/domain_object",
+                    "priority": "fallback"
+                },
+                {
+                    "key": "ELASTIC_INDICATOR_INTERVAL",
+                    "value": 15000,
+                    "priority": "fallback"
+                }
+            ],
+            "indicators": [
+                {
+                    "implementation": ElasticIndicator,
+                    "depends": [
+                        "$http",
+                        "$interval",
+                        "ELASTIC_ROOT",
+                        "ELASTIC_INDICATOR_INTERVAL"
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/persistence/local/bundle.js
+++ b/platform/persistence/local/bundle.js
@@ -22,40 +22,39 @@

 define([
    "./src/LocalStoragePersistenceProvider",
-    "./src/LocalStorageIndicator"
+    "./src/LocalStorageIndicator",
+    'legacyRegistry'
 ], function (
    LocalStoragePersistenceProvider,
-    LocalStorageIndicator
+    LocalStorageIndicator,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/persistence/local",
-        definition: {
-            "extensions": {
-                "components": [
-                    {
-                        "provides": "persistenceService",
-                        "type": "provider",
-                        "implementation": LocalStoragePersistenceProvider,
-                        "depends": [
-                            "$window",
-                            "$q",
-                            "PERSISTENCE_SPACE"
-                        ]
-                    }
-                ],
-                "constants": [
-                    {
-                        "key": "PERSISTENCE_SPACE",
-                        "value": "mct"
-                    }
-                ],
-                "indicators": [
-                    {
-                        "implementation": LocalStorageIndicator
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/persistence/local", {
+        "extensions": {
+            "components": [
+                {
+                    "provides": "persistenceService",
+                    "type": "provider",
+                    "implementation": LocalStoragePersistenceProvider,
+                    "depends": [
+                        "$window",
+                        "$q",
+                        "PERSISTENCE_SPACE"
+                    ]
+                }
+            ],
+            "constants": [
+                {
+                    "key": "PERSISTENCE_SPACE",
+                    "value": "mct"
+                }
+            ],
+            "indicators": [
+                {
+                    "implementation": LocalStorageIndicator
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/persistence/queue/bundle.js
+++ b/platform/persistence/queue/bundle.js
@@ -24,59 +24,58 @@ define([
    "./src/QueuingPersistenceCapabilityDecorator",
    "./src/PersistenceQueue",
    "./src/PersistenceFailureController",
-    "./res/templates/persistence-failure-dialog.html"
+    "./res/templates/persistence-failure-dialog.html",
+    'legacyRegistry'
 ], function (
    QueuingPersistenceCapabilityDecorator,
    PersistenceQueue,
    PersistenceFailureController,
-    persistenceFailureDialogTemplate
+    persistenceFailureDialogTemplate,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/persistence/queue",
-        definition: {
-            "extensions": {
-                "components": [
-                    {
-                        "type": "decorator",
-                        "provides": "capabilityService",
-                        "implementation": QueuingPersistenceCapabilityDecorator,
-                        "depends": [
-                            "persistenceQueue"
-                        ]
-                    }
-                ],
-                "services": [
-                    {
-                        "key": "persistenceQueue",
-                        "implementation": PersistenceQueue,
-                        "depends": [
-                            "$q",
-                            "$timeout",
-                            "dialogService",
-                            "PERSISTENCE_QUEUE_DELAY"
-                        ]
-                    }
-                ],
-                "constants": [
-                    {
-                        "key": "PERSISTENCE_QUEUE_DELAY",
-                        "value": 5
-                    }
-                ],
-                "templates": [
-                    {
-                        "key": "persistence-failure-dialog",
-                        "template": persistenceFailureDialogTemplate
-                    }
-                ],
-                "controllers": [
-                    {
-                        "key": "PersistenceFailureController",
-                        "implementation": PersistenceFailureController
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/persistence/queue", {
+        "extensions": {
+            "components": [
+                {
+                    "type": "decorator",
+                    "provides": "capabilityService",
+                    "implementation": QueuingPersistenceCapabilityDecorator,
+                    "depends": [
+                        "persistenceQueue"
+                    ]
+                }
+            ],
+            "services": [
+                {
+                    "key": "persistenceQueue",
+                    "implementation": PersistenceQueue,
+                    "depends": [
+                        "$q",
+                        "$timeout",
+                        "dialogService",
+                        "PERSISTENCE_QUEUE_DELAY"
+                    ]
+                }
+            ],
+            "constants": [
+                {
+                    "key": "PERSISTENCE_QUEUE_DELAY",
+                    "value": 5
+                }
+            ],
+            "templates": [
+                {
+                    "key": "persistence-failure-dialog",
+                    "template": persistenceFailureDialogTemplate
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "PersistenceFailureController",
+                    "implementation": PersistenceFailureController
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/policy/bundle.js
+++ b/platform/policy/bundle.js
@@ -23,47 +23,46 @@
 define([
    "./src/PolicyActionDecorator",
    "./src/PolicyViewDecorator",
-    "./src/PolicyProvider"
+    "./src/PolicyProvider",
+    'legacyRegistry'
 ], function (
    PolicyActionDecorator,
    PolicyViewDecorator,
-    PolicyProvider
+    PolicyProvider,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/policy",
-        definition: {
-            "name": "Policy Service",
-            "description": "Provides support for extension-driven decisions.",
-            "sources": "src",
-            "extensions": {
-                "components": [
-                    {
-                        "type": "decorator",
-                        "provides": "actionService",
-                        "implementation": PolicyActionDecorator,
-                        "depends": [
-                            "policyService"
-                        ]
-                    },
-                    {
-                        "type": "decorator",
-                        "provides": "viewService",
-                        "implementation": PolicyViewDecorator,
-                        "depends": [
-                            "policyService"
-                        ]
-                    },
-                    {
-                        "type": "provider",
-                        "provides": "policyService",
-                        "implementation": PolicyProvider,
-                        "depends": [
-                            "policies[]"
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/policy", {
+        "name": "Policy Service",
+        "description": "Provides support for extension-driven decisions.",
+        "sources": "src",
+        "extensions": {
+            "components": [
+                {
+                    "type": "decorator",
+                    "provides": "actionService",
+                    "implementation": PolicyActionDecorator,
+                    "depends": [
+                        "policyService"
+                    ]
+                },
+                {
+                    "type": "decorator",
+                    "provides": "viewService",
+                    "implementation": PolicyViewDecorator,
+                    "depends": [
+                        "policyService"
+                    ]
+                },
+                {
+                    "type": "provider",
+                    "provides": "policyService",
+                    "implementation": PolicyProvider,
+                    "depends": [
+                        "policies[]"
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/representation/bundle.js
+++ b/platform/representation/bundle.js
@@ -29,7 +29,8 @@ define([
    "./src/gestures/GestureRepresenter",
    "./src/services/DndService",
    "./src/TemplateLinker",
-    "./src/TemplatePrefetcher"
+    "./src/TemplatePrefetcher",
+    'legacyRegistry'
 ], function (
    MCTInclude,
    MCTRepresentation,
@@ -39,106 +40,104 @@ define([
    GestureRepresenter,
    DndService,
    TemplateLinker,
-    TemplatePrefetcher
+    TemplatePrefetcher,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/representation",
-        definition: {
-            "extensions": {
-                "directives": [
-                    {
-                        "key": "mctInclude",
-                        "implementation": MCTInclude,
-                        "depends": [
-                            "templates[]",
-                            "templateLinker"
-                        ]
-                    },
-                    {
-                        "key": "mctRepresentation",
-                        "implementation": MCTRepresentation,
-                        "depends": [
-                            "representations[]",
-                            "views[]",
-                            "representers[]",
-                            "$q",
-                            "templateLinker",
-                            "$log"
-                        ]
-                    }
-                ],
-                "gestures": [
-                    {
-                        "key": "drag",
-                        "implementation": DragGesture,
-                        "depends": [
-                            "$log",
-                            "dndService"
-                        ]
-                    },
-                    {
-                        "key": "drop",
-                        "implementation": DropGesture,
-                        "depends": [
-                            "dndService",
-                            "$q"
-                        ]
-                    }
-                ],
-                "components": [
-                    {
-                        "provides": "gestureService",
-                        "type": "provider",
-                        "implementation": GestureProvider,
-                        "depends": [
-                            "gestures[]"
-                        ]
-                    }
-                ],
-                "representers": [
-                    {
-                        "implementation": GestureRepresenter,
-                        "depends": [
-                            "gestureService"
-                        ]
-                    }
-                ],
-                "services": [
-                    {
-                        "key": "dndService",
-                        "implementation": DndService,
-                        "depends": [
-                            "$log"
-                        ]
-                    },
-                    {
-                        "key": "templateLinker",
-                        "implementation": TemplateLinker,
-                        "depends": [
-                            "$templateRequest",
-                            "$sce",
-                            "$compile",
-                            "$log"
-                        ],
-                        "comment": "For internal use by mct-include and mct-representation."
-                    }
-                ],
-                "runs": [
-                    {
-                        "priority": "mandatory",
-                        "implementation": TemplatePrefetcher,
-                        "depends": [
-                            "templateLinker",
-                            "templates[]",
-                            "views[]",
-                            "representations[]",
-                            "controls[]",
-                            "containers[]"
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/representation", {
+        "extensions": {
+            "directives": [
+                {
+                    "key": "mctInclude",
+                    "implementation": MCTInclude,
+                    "depends": [
+                        "templates[]",
+                        "templateLinker"
+                    ]
+                },
+                {
+                    "key": "mctRepresentation",
+                    "implementation": MCTRepresentation,
+                    "depends": [
+                        "representations[]",
+                        "views[]",
+                        "representers[]",
+                        "$q",
+                        "templateLinker",
+                        "$log"
+                    ]
+                }
+            ],
+            "gestures": [
+                {
+                    "key": "drag",
+                    "implementation": DragGesture,
+                    "depends": [
+                        "$log",
+                        "dndService"
+                    ]
+                },
+                {
+                    "key": "drop",
+                    "implementation": DropGesture,
+                    "depends": [
+                        "dndService",
+                        "$q"
+                    ]
+                }
+            ],
+            "components": [
+                {
+                    "provides": "gestureService",
+                    "type": "provider",
+                    "implementation": GestureProvider,
+                    "depends": [
+                        "gestures[]"
+                    ]
+                }
+            ],
+            "representers": [
+                {
+                    "implementation": GestureRepresenter,
+                    "depends": [
+                        "gestureService"
+                    ]
+                }
+            ],
+            "services": [
+                {
+                    "key": "dndService",
+                    "implementation": DndService,
+                    "depends": [
+                        "$log"
+                    ]
+                },
+                {
+                    "key": "templateLinker",
+                    "implementation": TemplateLinker,
+                    "depends": [
+                        "$templateRequest",
+                        "$sce",
+                        "$compile",
+                        "$log"
+                    ],
+                    "comment": "For internal use by mct-include and mct-representation."
+                }
+            ],
+            "runs": [
+                {
+                    "priority": "mandatory",
+                    "implementation": TemplatePrefetcher,
+                    "depends": [
+                        "templateLinker",
+                        "templates[]",
+                        "views[]",
+                        "representations[]",
+                        "controls[]",
+                        "containers[]"
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/search/bundle.js
+++ b/platform/search/bundle.js
@@ -29,7 +29,8 @@ define([
    "./res/templates/search.html",
    "./res/templates/search-menu.html",
    "raw-loader!./src/services/GenericSearchWorker.js",
-    "raw-loader!./src/services/BareBonesSearchWorker.js"
+    "raw-loader!./src/services/BareBonesSearchWorker.js",
+    'legacyRegistry'
 ], function (
    SearchController,
    SearchMenuController,
@@ -39,100 +40,98 @@ define([
    searchTemplate,
    searchMenuTemplate,
    searchWorkerText,
-    BareBonesSearchWorkerText
+    BareBonesSearchWorkerText,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/search",
-        definition: {
-            "name": "Search",
-            "description": "Allows the user to search through the file tree.",
-            "extensions": {
-                "constants": [
-                    {
-                        "key": "GENERIC_SEARCH_ROOTS",
-                        "value": [
-                            "ROOT"
-                        ],
-                        "priority": "fallback"
-                    },
-                    {
-                        "key": "USE_LEGACY_INDEXER",
-                        "value": false,
-                        "priority": 2
-                    }
-                ],
-                "controllers": [
-                    {
-                        "key": "SearchController",
-                        "implementation": SearchController,
-                        "depends": [
-                            "$scope",
-                            "searchService"
-                        ]
-                    },
-                    {
-                        "key": "SearchMenuController",
-                        "implementation": SearchMenuController,
-                        "depends": [
-                            "$scope",
-                            "types[]"
-                        ]
-                    }
-                ],
-                "representations": [
-                    {
-                        "key": "search-item",
-                        "template": searchItemTemplate
-                    }
-                ],
-                "templates": [
-                    {
-                        "key": "search",
-                        "template": searchTemplate
-                    },
-                    {
-                        "key": "search-menu",
-                        "template": searchMenuTemplate
-                    }
-                ],
-                "components": [
-                    {
-                        "provides": "searchService",
-                        "type": "provider",
-                        "implementation": GenericSearchProvider,
-                        "depends": [
-                            "$q",
-                            "$log",
-                            "modelService",
-                            "workerService",
-                            "topic",
-                            "GENERIC_SEARCH_ROOTS",
-                            "USE_LEGACY_INDEXER",
-                            "openmct"
-                        ]
-                    },
-                    {
-                        "provides": "searchService",
-                        "type": "aggregator",
-                        "implementation": SearchAggregator,
-                        "depends": [
-                            "$q",
-                            "objectService"
-                        ]
-                    }
-                ],
-                "workers": [
-                    {
-                        "key": "bareBonesSearchWorker",
-                        "scriptText": BareBonesSearchWorkerText
-                    },
-                    {
-                        "key": "genericSearchWorker",
-                        "scriptText": searchWorkerText
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/search", {
+        "name": "Search",
+        "description": "Allows the user to search through the file tree.",
+        "extensions": {
+            "constants": [
+                {
+                    "key": "GENERIC_SEARCH_ROOTS",
+                    "value": [
+                        "ROOT"
+                    ],
+                    "priority": "fallback"
+                },
+                {
+                    "key": "USE_LEGACY_INDEXER",
+                    "value": false,
+                    "priority": 2
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "SearchController",
+                    "implementation": SearchController,
+                    "depends": [
+                        "$scope",
+                        "searchService"
+                    ]
+                },
+                {
+                    "key": "SearchMenuController",
+                    "implementation": SearchMenuController,
+                    "depends": [
+                        "$scope",
+                        "types[]"
+                    ]
+                }
+            ],
+            "representations": [
+                {
+                    "key": "search-item",
+                    "template": searchItemTemplate
+                }
+            ],
+            "templates": [
+                {
+                    "key": "search",
+                    "template": searchTemplate
+                },
+                {
+                    "key": "search-menu",
+                    "template": searchMenuTemplate
+                }
+            ],
+            "components": [
+                {
+                    "provides": "searchService",
+                    "type": "provider",
+                    "implementation": GenericSearchProvider,
+                    "depends": [
+                        "$q",
+                        "$log",
+                        "modelService",
+                        "workerService",
+                        "topic",
+                        "GENERIC_SEARCH_ROOTS",
+                        "USE_LEGACY_INDEXER",
+                        "openmct"
+                    ]
+                },
+                {
+                    "provides": "searchService",
+                    "type": "aggregator",
+                    "implementation": SearchAggregator,
+                    "depends": [
+                        "$q",
+                        "objectService"
+                    ]
+                }
+            ],
+            "workers": [
+                {
+                    "key": "bareBonesSearchWorker",
+                    "scriptText": BareBonesSearchWorkerText
+                },
+                {
+                    "key": "genericSearchWorker",
+                    "scriptText": searchWorkerText
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/status/bundle.js
+++ b/platform/status/bundle.js
@@ -23,41 +23,40 @@
 define([
    "./src/StatusRepresenter",
    "./src/StatusCapability",
-    "./src/StatusService"
+    "./src/StatusService",
+    'legacyRegistry'
 ], function (
    StatusRepresenter,
    StatusCapability,
-    StatusService
+    StatusService,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/status",
-        definition: {
-            "extensions": {
-                "representers": [
-                    {
-                        "implementation": StatusRepresenter
-                    }
-                ],
-                "capabilities": [
-                    {
-                        "key": "status",
-                        "implementation": StatusCapability,
-                        "depends": [
-                            "statusService"
-                        ]
-                    }
-                ],
-                "services": [
-                    {
-                        "key": "statusService",
-                        "implementation": StatusService,
-                        "depends": [
-                            "topic"
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/status", {
+        "extensions": {
+            "representers": [
+                {
+                    "implementation": StatusRepresenter
+                }
+            ],
+            "capabilities": [
+                {
+                    "key": "status",
+                    "implementation": StatusCapability,
+                    "depends": [
+                        "statusService"
+                    ]
+                }
+            ],
+            "services": [
+                {
+                    "key": "statusService",
+                    "implementation": StatusService,
+                    "depends": [
+                        "topic"
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/telemetry/bundle.js
+++ b/platform/telemetry/bundle.js
@@ -26,105 +26,104 @@ define([
    "./src/TelemetryCapability",
    "./src/TelemetryFormatter",
    "./src/TelemetrySubscriber",
-    "./src/TelemetryHandler"
+    "./src/TelemetryHandler",
+    'legacyRegistry'
 ], function (
    TelemetryAggregator,
    TelemetryController,
    TelemetryCapability,
    TelemetryFormatter,
    TelemetrySubscriber,
-    TelemetryHandler
+    TelemetryHandler,
+    legacyRegistry
 ) {

-    return {
-        name:"platform/telemetry",
-        definition: {
-            "name": "Data bundle",
-            "description": "Interfaces and infrastructure for real-time and historical data",
-            "configuration": {
-                "paths": {
-                    "moment": "moment.min"
-                },
-                "shim": {
-                    "moment": {
-                        "exports": "moment"
-                    }
-                }
+    legacyRegistry.register("platform/telemetry", {
+        "name": "Data bundle",
+        "description": "Interfaces and infrastructure for real-time and historical data",
+        "configuration": {
+            "paths": {
+                "moment": "moment.min"
            },
-            "extensions": {
-                "components": [
-                    {
-                        "provides": "telemetryService",
-                        "type": "aggregator",
-                        "implementation": TelemetryAggregator,
-                        "depends": [
-                            "$q"
-                        ]
-                    }
-                ],
-                "controllers": [
-                    {
-                        "key": "TelemetryController",
-                        "implementation": TelemetryController,
-                        "depends": [
-                            "$scope",
-                            "$q",
-                            "$timeout",
-                            "$log"
-                        ]
-                    }
-                ],
-                "capabilities": [
-                    {
-                        "key": "telemetry",
-                        "implementation": TelemetryCapability,
-                        "depends": [
-                            "openmct",
-                            "$injector",
-                            "$q",
-                            "$log"
-                        ]
-                    }
-                ],
-                "services": [
-                    {
-                        "key": "telemetryFormatter",
-                        "implementation": TelemetryFormatter,
-                        "depends": [
-                            "formatService",
-                            "DEFAULT_TIME_FORMAT"
-                        ]
-                    },
-                    {
-                        "key": "telemetrySubscriber",
-                        "implementation": TelemetrySubscriber,
-                        "depends": [
-                            "$q",
-                            "$timeout"
-                        ]
-                    },
-                    {
-                        "key": "telemetryHandler",
-                        "implementation": TelemetryHandler,
-                        "depends": [
-                            "$q",
-                            "telemetrySubscriber"
-                        ]
-                    }
-                ],
-                "licenses": [
-                    {
-                        "name": "Moment.js",
-                        "version": "2.11.1",
-                        "author": "Tim Wood, Iskren Chernev, Moment.js contributors",
-                        "description": "Time/date parsing/formatting",
-                        "website": "http://momentjs.com",
-                        "copyright": "Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors",
-                        "license": "license-mit",
-                        "link": "https://raw.githubusercontent.com/moment/moment/develop/LICENSE"
-                    }
-                ]
+            "shim": {
+                "moment": {
+                    "exports": "moment"
+                }
            }
+        },
+        "extensions": {
+            "components": [
+                {
+                    "provides": "telemetryService",
+                    "type": "aggregator",
+                    "implementation": TelemetryAggregator,
+                    "depends": [
+                        "$q"
+                    ]
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "TelemetryController",
+                    "implementation": TelemetryController,
+                    "depends": [
+                        "$scope",
+                        "$q",
+                        "$timeout",
+                        "$log"
+                    ]
+                }
+            ],
+            "capabilities": [
+                {
+                    "key": "telemetry",
+                    "implementation": TelemetryCapability,
+                    "depends": [
+                        "openmct",
+                        "$injector",
+                        "$q",
+                        "$log"
+                    ]
+                }
+            ],
+            "services": [
+                {
+                    "key": "telemetryFormatter",
+                    "implementation": TelemetryFormatter,
+                    "depends": [
+                        "formatService",
+                        "DEFAULT_TIME_FORMAT"
+                    ]
+                },
+                {
+                    "key": "telemetrySubscriber",
+                    "implementation": TelemetrySubscriber,
+                    "depends": [
+                        "$q",
+                        "$timeout"
+                    ]
+                },
+                {
+                    "key": "telemetryHandler",
+                    "implementation": TelemetryHandler,
+                    "depends": [
+                        "$q",
+                        "telemetrySubscriber"
+                    ]
+                }
+            ],
+            "licenses": [
+                {
+                    "name": "Moment.js",
+                    "version": "2.11.1",
+                    "author": "Tim Wood, Iskren Chernev, Moment.js contributors",
+                    "description": "Time/date parsing/formatting",
+                    "website": "http://momentjs.com",
+                    "copyright": "Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors",
+                    "license": "license-mit",
+                    "link": "https://raw.githubusercontent.com/moment/moment/develop/LICENSE"
+                }
+            ]
        }
-    };
+    });
 });
--- a/src/MCT.js
+++ b/src/MCT.js
@@ -22,9 +22,9 @@

 define([
    'EventEmitter',
+    'legacyRegistry',
    'uuid',
-    './BundleRegistry',
-    './installDefaultBundles',
+    './defaultRegistry',
    './api/api',
    './api/overlays/OverlayAPI',
    './selection/Selection',
@@ -50,9 +50,9 @@ define([
    'vue'
 ], function (
    EventEmitter,
+    legacyRegistry,
    uuid,
-    BundleRegistry,
-    installDefaultBundles,
+    defaultRegistry,
    api,
    OverlayAPI,
    Selection,
@@ -215,7 +215,7 @@ define([
         * @memberof module:openmct.MCT#
         * @name objects
         */
-        this.objects = new api.ObjectAPI();
+        this.objects = new api.ObjectAPI(this.types);

        /**
         * An interface for retrieving and interpreting telemetry data associated
@@ -248,8 +248,7 @@ define([

        this.branding = BrandingAPI.default;

-        this.legacyRegistry = new BundleRegistry();
-        installDefaultBundles(this.legacyRegistry);
+        this.legacyRegistry = defaultRegistry;

        // Plugin's that are installed by default

@@ -259,12 +258,11 @@ define([
        this.install(LegacyIndicatorsPlugin());
        this.install(LicensesPlugin.default());
        this.install(RemoveActionPlugin.default());
+        this.install(this.plugins.ImportExport());
        this.install(this.plugins.FolderView());
        this.install(this.plugins.Tabs());
        this.install(this.plugins.FlexibleLayout());
        this.install(this.plugins.GoToOriginalAction());
-        this.install(this.plugins.ImportExport());
-        this.install(this.plugins.WebPage());
    }

    MCT.prototype = Object.create(EventEmitter.prototype);
@@ -363,8 +361,8 @@ define([
            this.legacyExtension('types', legacyDefinition);
        }.bind(this));

-        this.legacyRegistry.register('adapter', this.legacyBundle);
-        this.legacyRegistry.enable('adapter');
+        legacyRegistry.register('adapter', this.legacyBundle);
+        legacyRegistry.enable('adapter');

        this.router.route(/^\/$/, () => {
            this.router.setPath('/browse/');
--- a/src/adapter/bundle.js
+++ b/src/adapter/bundle.js
@@ -21,6 +21,7 @@
 *****************************************************************************/

 define([
+    'legacyRegistry',
    './actions/ActionDialogDecorator',
    './capabilities/AdapterCapability',
    './directives/MCTView',
@@ -38,6 +39,7 @@ define([
    './policies/LegacyCompositionPolicyAdapter',
    './actions/LegacyActionAdapter'
 ], function (
+    legacyRegistry,
    ActionDialogDecorator,
    AdapterCapability,
    MCTView,
@@ -55,164 +57,161 @@ define([
    legacyCompositionPolicyAdapter,
    LegacyActionAdapter
 ) {
-    return {
-        name: 'src/adapter',
-        definition: {
-            "extensions": {
-                "directives": [
-                    {
-                        key: "mctView",
-                        implementation: MCTView,
-                        depends: ["openmct"]
-                    }
-                ],
-                capabilities: [
-                    {
-                        key: "adapter",
-                        implementation: AdapterCapability
-                    }
-                ],
-                services: [
-                    {
-                        key: "instantiate",
-                        priority: "mandatory",
-                        implementation: Instantiate,
-                        depends: [
-                            "capabilityService",
-                            "identifierService",
-                            "cacheService"
-                        ]
-                    }
-                ],
-                components: [
-                    {
-                        type: "decorator",
-                        provides: "capabilityService",
-                        implementation: APICapabilityDecorator,
-                        depends: [
-                            "$injector"
-                        ]
+    legacyRegistry.register('src/adapter', {
+        "extensions": {
+            "directives": [
+                {
+                    key: "mctView",
+                    implementation: MCTView,
+                    depends: ["openmct"]
+                }
+            ],
+            capabilities: [
+                {
+                    key: "adapter",
+                    implementation: AdapterCapability
+                }
+            ],
+            services: [
+                {
+                    key: "instantiate",
+                    priority: "mandatory",
+                    implementation: Instantiate,
+                    depends: [
+                        "capabilityService",
+                        "identifierService",
+                        "cacheService"
+                    ]
+                }
+            ],
+            components: [
+                {
+                    type: "decorator",
+                    provides: "capabilityService",
+                    implementation: APICapabilityDecorator,
+                    depends: [
+                        "$injector"
+                    ]
+                },
+                {
+                    type: "decorator",
+                    provides: "actionService",
+                    implementation: ActionDialogDecorator,
+                    depends: ["openmct"]
+                },
+                {
+                    type: "decorator",
+                    provides: "modelService",
+                    implementation: MissingModelCompatibilityDecorator,
+                    depends: ["openmct"]
+                },
+                {
+                    provides: "objectService",
+                    type: "decorator",
+                    priority: "mandatory",
+                    implementation: LegacyObjectAPIInterceptor,
+                    depends: [
+                        "openmct",
+                        "roots[]",
+                        "instantiate",
+                        "topic"
+                    ]
+                }
+            ],
+            policies: [
+                {
+                    category: "view",
+                    implementation: AdaptedViewPolicy,
+                    depends: ["openmct"]
+                }
+            ],
+            runs: [
+                {
+                    implementation: TypeDeprecationChecker,
+                    depends: ["types[]"]
+                },
+                {
+                    implementation: AlternateCompositionInitializer,
+                    depends: ["openmct"]
+                },
+                {
+                    implementation: function (openmct, $location, $rootScope) {
+                        return new TimeSettingsURLHandler(
+                            openmct.time,
+                            $location,
+                            $rootScope
+                        );
                    },
-                    {
-                        type: "decorator",
-                        provides: "actionService",
-                        implementation: ActionDialogDecorator,
-                        depends: ["openmct"]
-                    },
-                    {
-                        type: "decorator",
-                        provides: "modelService",
-                        implementation: MissingModelCompatibilityDecorator,
-                        depends: ["openmct"]
-                    },
-                    {
-                        provides: "objectService",
-                        type: "decorator",
-                        priority: "mandatory",
-                        implementation: LegacyObjectAPIInterceptor,
-                        depends: [
-                            "openmct",
-                            "roots[]",
-                            "instantiate",
-                            "topic"
-                        ]
-                    }
-                ],
-                policies: [
-                    {
-                        category: "view",
-                        implementation: AdaptedViewPolicy,
-                        depends: ["openmct"]
-                    }
-                ],
-                runs: [
-                    {
-                        implementation: TypeDeprecationChecker,
-                        depends: ["types[]"]
-                    },
-                    {
-                        implementation: AlternateCompositionInitializer,
-                        depends: ["openmct"]
-                    },
-                    {
-                        implementation: function (openmct, $location, $rootScope) {
-                            return new TimeSettingsURLHandler(
-                                openmct.time,
-                                $location,
-                                $rootScope
-                            );
-                        },
-                        depends: ["openmct", "$location", "$rootScope"]
-                    },
-                    {
-                        implementation: LegacyTelemetryProvider,
-                        depends: [
-                            "openmct",
-                            "instantiate"
-                        ]
-                    },
-                    {
-                        implementation: installLegacyViews,
-                        depends: [
-                            "openmct",
-                            "views[]",
-                            "instantiate"
-                        ]
-                    },
-                    {
-                        implementation: RegisterLegacyTypes,
-                        depends: [
-                            "types[]",
-                            "openmct"
-                        ]
-                    },
-                    {
-                        implementation: legacyCompositionPolicyAdapter.default,
-                        depends: [
-                            "openmct"
-                        ]
-                    },
-                    {
-                        implementation: LegacyActionAdapter.default,
-                        depends: [
-                            "openmct",
-                            "actions[]"
-                        ]
-                    }
-                ],
-                licenses: [
-                    {
-                        "name": "almond",
-                        "version": "0.3.3",
-                        "description": "Lightweight RequireJS replacement for builds",
-                        "author": "jQuery Foundation",
-                        "website": "https://github.com/requirejs/almond",
-                        "copyright": "Copyright jQuery Foundation and other contributors, https://jquery.org/",
-                        "license": "license-mit",
-                        "link": "https://github.com/requirejs/almond/blob/master/LICENSE"
-                    },
-                    {
-                        "name": "lodash",
-                        "version": "3.10.1",
-                        "description": "Utility functions",
-                        "author": "Dojo Foundation",
-                        "website": "https://lodash.com",
-                        "copyright": "Copyright 2012-2015 The Dojo Foundation",
-                        "license": "license-mit",
-                        "link": "https://raw.githubusercontent.com/lodash/lodash/3.10.1/LICENSE"
-                    },
-                    {
-                        "name": "EventEmitter3",
-                        "version": "1.2.0",
-                        "description": "Event-driven programming support",
-                        "author": "Arnout Kazemier",
-                        "website": "https://github.com/primus/eventemitter3",
-                        "copyright": "Copyright (c) 2014 Arnout Kazemier",
-                        "license": "license-mit",
-                        "link": "https://github.com/primus/eventemitter3/blob/1.2.0/LICENSE"
-                    }
-                ]
-            }
+                    depends: ["openmct", "$location", "$rootScope"]
+                },
+                {
+                    implementation: LegacyTelemetryProvider,
+                    depends: [
+                        "openmct",
+                        "instantiate"
+                    ]
+                },
+                {
+                    implementation: installLegacyViews,
+                    depends: [
+                        "openmct",
+                        "views[]",
+                        "instantiate"
+                    ]
+                },
+                {
+                    implementation: RegisterLegacyTypes,
+                    depends: [
+                        "types[]",
+                        "openmct"
+                    ]
+                },
+                {
+                    implementation: legacyCompositionPolicyAdapter.default,
+                    depends: [
+                        "openmct"
+                    ]
+                },
+                {
+                    implementation: LegacyActionAdapter.default,
+                    depends: [
+                        "openmct",
+                        "actions[]"
+                    ]
+                }
+            ],
+            licenses: [
+                {
+                    "name": "almond",
+                    "version": "0.3.3",
+                    "description": "Lightweight RequireJS replacement for builds",
+                    "author": "jQuery Foundation",
+                    "website": "https://github.com/requirejs/almond",
+                    "copyright": "Copyright jQuery Foundation and other contributors, https://jquery.org/",
+                    "license": "license-mit",
+                    "link": "https://github.com/requirejs/almond/blob/master/LICENSE"
+                },
+                {
+                    "name": "lodash",
+                    "version": "3.10.1",
+                    "description": "Utility functions",
+                    "author": "Dojo Foundation",
+                    "website": "https://lodash.com",
+                    "copyright": "Copyright 2012-2015 The Dojo Foundation",
+                    "license": "license-mit",
+                    "link": "https://raw.githubusercontent.com/lodash/lodash/3.10.1/LICENSE"
+                },
+                {
+                    "name": "EventEmitter3",
+                    "version": "1.2.0",
+                    "description": "Event-driven programming support",
+                    "author": "Arnout Kazemier",
+                    "website": "https://github.com/primus/eventemitter3",
+                    "copyright": "Copyright (c) 2014 Arnout Kazemier",
+                    "license": "license-mit",
+                    "link": "https://github.com/primus/eventemitter3/blob/1.2.0/LICENSE"
+                }
+            ]
        }
-    }
+    });
 });
--- a/src/adapter/services/LegacyObjectAPIInterceptor.js
+++ b/src/adapter/services/LegacyObjectAPIInterceptor.js
@@ -60,7 +60,8 @@ define([
            var newStyleObject = utils.toNewFormat(legacyObject.getModel(), legacyObject.getId()),
                keystring = utils.makeKeyString(newStyleObject.identifier);

-            this.eventEmitter.emit(keystring + ":*", newStyleObject);
+            this.eventEmitter.emit(keystring + ':$_synchronize_model', newStyleObject);
+            this.eventEmitter.emit(keystring + ':*', newStyleObject);
            this.eventEmitter.emit('mutation', newStyleObject);
        }.bind(this);

--- a/src/api/composition/CompositionCollection.js
+++ b/src/api/composition/CompositionCollection.js
@@ -21,9 +21,11 @@
 *****************************************************************************/

 define([
-    'lodash'
+    'lodash',
+    '../objects/MutableDomainObject'
 ], function (
-    _
+    _,
+    MutableDomainObject
 ) {
    /**
     * A CompositionCollection represents the list of domain objects contained
@@ -60,6 +62,17 @@ define([
        };
        this.onProviderAdd = this.onProviderAdd.bind(this);
        this.onProviderRemove = this.onProviderRemove.bind(this);
+        this.mutables = {};
+
+        if (this.domainObject instanceof MutableDomainObject.default &&
+            this.publicAPI.objects.isMutable(this.domainObject)) {
+            this.returnMutables = true;
+            this.domainObject.$observe('$_destroy', () => {
+                Object.values(this.mutables).forEach(mutable => {
+                    mutable.$destroy();
+                });
+            });
+        }
    }

    /**
@@ -74,9 +87,6 @@ define([
        if (!this.listeners[event]) {
            throw new Error('Event not supported by composition: ' + event);
        }
-        if (!this.mutationListener) {
-            this._synchronize();
-        }
        if (this.provider.on && this.provider.off) {
            if (event === 'add') {
                this.provider.on(
@@ -132,8 +142,6 @@ define([

        this.listeners[event].splice(index, 1);
        if (this.listeners[event].length === 0) {
-            this._destroy();
-
            // Remove provider listener if this is the last callback to
            // be removed.
            if (this.provider.off && this.provider.on) {
@@ -182,6 +190,13 @@ define([
            }
            this.provider.add(this.domainObject, child.identifier);
        } else {
+            if (this.returnMutables && this.publicAPI.objects.isMutable(child)) {
+                let keyString = this.publicAPI.objects.makeKeyString(child.identifier);
+                if (this.publicAPI.objects.isMutable(child)) {
+                    child = this.publicAPI.objects.mutable(child);
+                    this.mutables[keyString] = child;
+                }
+            }
            this.emit('add', child);
        }
    };
@@ -195,6 +210,7 @@ define([
     * @name load
     */
    CompositionCollection.prototype.load = function () {
+        this.cleanUpMutables();
        return this.provider.load(this.domainObject)
            .then(function (children) {
                return Promise.all(children.map((c) => this.publicAPI.objects.get(c)));
@@ -225,6 +241,13 @@ define([
        if (!skipMutate) {
            this.provider.remove(this.domainObject, child.identifier);
        } else {
+            if (this.returnMutables && this.publicAPI.objects.isMutable(child)) {
+                let keyString = this.publicAPI.objects.makeKeyString(child);
+                if (this.mutables[keyString] !== undefined) {
+                    this.mutables[keyString].$destroy();
+                    delete this.mutables[keyString];
+                }
+            }
            this.emit('remove', child);
        }
    };
@@ -271,19 +294,6 @@ define([
        this.remove(child, true);
    };

-    CompositionCollection.prototype._synchronize = function () {
-        this.mutationListener = this.publicAPI.objects.observe(this.domainObject, '*', (newDomainObject) => {
-            this.domainObject = JSON.parse(JSON.stringify(newDomainObject));
-        });
-    };
-
-    CompositionCollection.prototype._destroy = function () {
-        if (this.mutationListener) {
-            this.mutationListener();
-            delete this.mutationListener;
-        }
-    };
-
    /**
     * Emit events.
     * @private
@@ -298,5 +308,11 @@ define([
        });
    };

+    CompositionCollection.prototype.cleanUpMutables = function () {
+        Object.values(this.mutables).forEach(mutable => {
+            mutable.$destroy();
+        });
+    }
+
    return CompositionCollection;
 });
--- a/src/api/contextMenu/ContextMenu.vue
+++ b/src/api/contextMenu/ContextMenu.vue
@@ -1,24 +1,20 @@
 <template>
-<div class="c-menu">
-    <ul>
-        <li
-            v-for="action in actions"
-            :key="action.name"
-            :class="action.cssClass"
-            :title="action.description"
-            @click="action.invoke(objectPath)"
-        >
-            {{ action.name }}
-        </li>
-        <li v-if="actions.length === 0">
-            No actions defined.
-        </li>
-    </ul>
-</div>
+    <div class="c-menu">
+        <ul>
+            <li v-for="action in actions"
+                :key="action.name"
+                :class="action.cssClass"
+                :title="action.description"
+                @click="action.invoke(objectPath)">
+                {{ action.name }}
+            </li>
+            <li v-if="actions.length === 0">No actions defined.</li>
+        </ul>
+    </div>
 </template>

 <script>
-export default {
-    inject: ['actions', 'objectPath']
-}
-</script>
+    export default {
+        inject: ['actions', 'objectPath']
+    }
+</script>
--- a/src/api/objects/MutableDomainObject.js
+++ b/src/api/objects/MutableDomainObject.js
@@ -0,0 +1,105 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2019, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+import _ from 'lodash';
+import utils from './object-utils.js';
+
+const ANY_OBJECT_EVENT = 'mutation';
+
+class MutableDomainObject {
+    constructor(eventEmitter) {
+        Object.defineProperties(this, {
+            _eventEmitter: {
+                value: eventEmitter,
+                // Property should not be serialized
+                enumerable: false
+            },
+            _observers: {
+                value: [],
+                // Property should not be serialized
+                enumerable: false
+            },
+            isMutable: {
+                value: true,
+                // Property should not be serialized
+                enumerable: false
+            }
+        });
+    }
+    $observe(path, callback) {
+        var fullPath = qualifiedEventName(this, path);
+        var eventOff =
+            this._eventEmitter.off.bind(this._eventEmitter, fullPath, callback);
+
+        this._eventEmitter.on(fullPath, callback);
+        this._observers.push(eventOff);
+
+        return eventOff;
+    }
+    $set(path, value) {
+        _.set(this, path, value);
+        _.set(this, 'modified', Date.now());
+
+        //Emit secret synchronization event first, so that all objects are in sync before subsequent events fired.
+        this._eventEmitter.emit(qualifiedEventName(this, '$_synchronize_model'), this);
+
+        //Emit a general "any object" event
+        this._eventEmitter.emit(ANY_OBJECT_EVENT, this);
+        //Emit wildcard event, with path so that callback knows what changed
+        this._eventEmitter.emit(qualifiedEventName(this, '*'), this, path, value);
+
+        //Emit events specific to properties affected
+        let parentPropertiesList = path.split('.');
+        for (let index = parentPropertiesList.length; index > 0; index--) {
+            let parentPropertyPath = parentPropertiesList.slice(0, index).join('.');
+            this._eventEmitter.emit(qualifiedEventName(this, parentPropertyPath), _.get(this, parentPropertyPath));
+        }
+
+        //TODO: Emit events for listeners of child properties when parent changes.
+        // Do it at observer time - also register observers for parent attribute path.
+    }
+    $destroy() {
+        this._observers.forEach(observer => observer());
+        delete this._eventEmitter;
+        delete this._observers;
+        this._eventEmitter.emit(qualifiedEventName(this, '$_destroy'));
+    }
+
+    static createMutable(object, mutationTopic) {
+        let mutable = Object.create(new MutableDomainObject(mutationTopic));
+        Object.assign(mutable, object);
+        mutable.$observe('$_synchronize_model', (updatedObject) => {
+            let clone = JSON.parse(JSON.stringify(updatedObject));
+            let deleted = _.difference(Object.keys(updatedObject), Object.keys(updatedObject));
+            deleted.forEach((propertyName) => delete mutable[propertyName]);
+            Object.assign(mutable, clone);
+        })
+        return mutable;
+    }
+}
+
+function qualifiedEventName(object, eventName) {
+    var keystring = utils.makeKeyString(object.identifier);
+
+    return [keystring, eventName].join(':');
+}
+
+export default MutableDomainObject;
--- a/src/api/objects/MutableObject.js
+++ b/src/api/objects/MutableObject.js
@@ -1,102 +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([
-    './object-utils.js',
-    'lodash'
-], function (
-    utils,
-    _
-) {
-    var ANY_OBJECT_EVENT = "mutation";
-
-    /**
-     * The MutableObject wraps a DomainObject and provides getters and
-     * setters for
-     * @param eventEmitter
-     * @param object
-     * @interface MutableObject
-     */
-    function MutableObject(eventEmitter, object) {
-        this.eventEmitter = eventEmitter;
-        this.object = object;
-        this.unlisteners = [];
-    }
-
-    function qualifiedEventName(object, eventName) {
-        var keystring = utils.makeKeyString(object.identifier);
-
-        return [keystring, eventName].join(':');
-    }
-
-    MutableObject.prototype.stopListening = function () {
-        this.unlisteners.forEach(function (unlisten) {
-            unlisten();
-        });
-        this.unlisteners = [];
-    };
-
-    /**
-     * Observe changes to this domain object.
-     * @param {string} path the property to observe
-     * @param {Function} callback a callback to invoke when new values for
-     *        this property are observed
-     * @method on
-     * @memberof module:openmct.MutableObject#
-     */
-    MutableObject.prototype.on = function (path, callback) {
-        var fullPath = qualifiedEventName(this.object, path);
-        var eventOff =
-            this.eventEmitter.off.bind(this.eventEmitter, fullPath, callback);
-
-        this.eventEmitter.on(fullPath, callback);
-        this.unlisteners.push(eventOff);
-    };
-
-    /**
-     * Modify this domain object.
-     * @param {string} path the property to modify
-     * @param {*} value the new value for this property
-     * @method set
-     * @memberof module:openmct.MutableObject#
-     */
-    MutableObject.prototype.set = function (path, value) {
-        _.set(this.object, path, value);
-        _.set(this.object, 'modified', Date.now());
-
-        var handleRecursiveMutation = function (newObject) {
-            this.object = newObject;
-        }.bind(this);
-
-        //Emit wildcard event
-        this.eventEmitter.emit(qualifiedEventName(this.object, '*'), this.object);
-        //Emit a general "any object" event
-        this.eventEmitter.emit(ANY_OBJECT_EVENT, this.object);
-
-        this.eventEmitter.on(qualifiedEventName(this.object, '*'), handleRecursiveMutation);
-        //Emit event specific to property
-        this.eventEmitter.emit(qualifiedEventName(this.object, path), value);
-        this.eventEmitter.off(qualifiedEventName(this.object, '*'), handleRecursiveMutation);
-    };
-
-    return MutableObject;
-});
--- a/src/api/objects/ObjectAPI.js
+++ b/src/api/objects/ObjectAPI.js
@@ -23,14 +23,14 @@
 define([
    'lodash',
    './object-utils',
-    './MutableObject',
+    './MutableDomainObject',
    './RootRegistry',
    './RootObjectProvider',
    'EventEmitter'
 ], function (
    _,
    utils,
-    MutableObject,
+    MutableDomainObject,
    RootRegistry,
    RootObjectProvider,
    EventEmitter
@@ -43,7 +43,8 @@ define([
     * @memberof module:openmct
     */

-    function ObjectAPI() {
+    function ObjectAPI(typeRegistry) {
+        this.typeRegistry = typeRegistry;
        this.eventEmitter = new EventEmitter();
        this.providers = {};
        this.rootRegistry = new RootRegistry();
@@ -157,6 +158,19 @@ define([
        return provider.get(identifier);
    };

+    /**
+     * Will fetch object, returning it as a MutableDomainObject IF the object is mutable.
+     */
+    ObjectAPI.prototype.getAsMutable = function (identifier) {
+        return this.get(identifier).then((object) => {
+            if (this.isMutable(object)) {
+                return this.mutable(object);
+            } else {
+                return object;
+            }
+        });
+    }
+
    ObjectAPI.prototype.delete = function () {
        throw new Error('Delete not implemented');
    };
@@ -177,6 +191,20 @@ define([
        this.rootRegistry.addRoot(key);
    };

+    ObjectAPI.prototype.mutable = function (object) {
+        if (!this.isMutable) {
+            throw `Error: Attempted to create mutable from immutable object ${object.name}`;
+        }
+        return MutableDomainObject.default.createMutable(object, this.eventEmitter);
+    }
+
+    ObjectAPI.prototype.isMutable = function (object) {
+        // Checking for mutability is a bit broken right now. This is an 80% solution,
+        // but does not work in many cases.
+        const type = this.typeRegistry.get(object.type);
+        return type && type.definition.creatable === true;
+    }
+
    /**
     * Modify a domain object.
     * @param {module:openmct.DomainObject} object the object to mutate
@@ -186,9 +214,17 @@ define([
     * @memberof module:openmct.ObjectAPI#
     */
    ObjectAPI.prototype.mutate = function (domainObject, path, value) {
-        var mutableObject =
-            new MutableObject(this.eventEmitter, domainObject);
-        return mutableObject.set(path, value);
+        if (!this.isMutable(domainObject)) {
+            throw `Error: Attempted to mutate immutable object ${domainObject.name}`;
+        }
+        console.warn('DEPRECATION WARNING: The .mutate() function in the Object API is now deprecated. Please use mutable() ');
+        if (domainObject instanceof MutableDomainObject.default) {
+            domainObject.$set(path, value);
+        } else {
+            let mutable = this.mutable(domainObject);
+            mutable.$set(path, value);
+            mutable.$destroy();
+        }
    };

    /**
@@ -201,10 +237,14 @@ define([
     * @memberof module:openmct.ObjectAPI#
     */
    ObjectAPI.prototype.observe = function (domainObject, path, callback) {
-        var mutableObject =
-            new MutableObject(this.eventEmitter, domainObject);
-        mutableObject.on(path, callback);
-        return mutableObject.stopListening.bind(mutableObject);
+        console.warn('DEPRECATION WARNING: The .observe() function in the Object API is now deprecated. Please use mutable() ');
+        if (domainObject instanceof MutableDomainObject.default) {
+            return domainObject.$observe(path, callback);
+        } else {
+            let mutable = this.mutable(domainObject);
+            mutable.$observe(path, callback);
+            return () => mutable.$destroy();
+        }
    };

    /**
--- a/src/api/objects/ObjectAPISpec.js
+++ b/src/api/objects/ObjectAPISpec.js
@@ -0,0 +1,121 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2019, 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([
+    './ObjectAPI'
+], function (
+    ObjectAPI
+) {
+    fdescribe('The Object API', function () {
+        describe('Mutable Object', function () {
+            let testObject;
+            let mutable;
+            let objectAPI;
+
+            beforeEach(function () {
+                objectAPI = new ObjectAPI();
+                testObject = {
+                    identifier: {
+                        namespace: 'test-namespace',
+                        key: 'test-key'
+                    },
+                    otherAttribute: 'other-attribute-value',
+                    objectAttribute: {
+                        embeddedObject: {
+                            embeddedKey: 'embedded-value'
+                        }
+                    }
+                };
+                mutable = objectAPI.mutable(testObject);
+            });
+
+            it('retains own properties', function () {
+                expect(mutable.hasOwnProperty('identifier')).toBe(true);
+                expect(mutable.hasOwnProperty('otherAttribute')).toBe(true);
+                expect(mutable.identifier).toEqual(testObject.identifier);
+                expect(mutable.otherAttribute).toEqual(testObject.otherAttribute);
+            });
+
+            it('is identical to original object when serialized', function () {
+                expect(JSON.stringify(mutable)).toEqual(JSON.stringify(testObject));
+            });
+
+            it('is identical to original object when serialized', function () {
+                expect(JSON.stringify(mutable)).toEqual(JSON.stringify(testObject));
+            });
+
+            describe('uses events', function () {
+                let testObjectDuplicate;
+                let mutableSecondInstance;
+
+                beforeEach(function () {
+                    // Duplicate object to guarantee we are not sharing object instance, which would invalidate test
+                    testObjectDuplicate = JSON.parse(JSON.stringify(testObject));
+                    mutableSecondInstance = objectAPI.mutable(testObjectDuplicate);
+                });
+
+                it('to stay synchronized when mutated', function () {
+                    mutable.$set('otherAttribute', 'new-attribute-value');
+                    expect(mutableSecondInstance.otherAttribute).toBe('new-attribute-value');
+                });
+
+                it('to indicate when a property changes', function () {
+                    let mutationCallback = jasmine.createSpy('mutation-callback');
+
+                    return new Promise(function (resolve) {
+                        mutationCallback.and.callFake(resolve);
+                        mutableSecondInstance.observe('otherAttribute', mutationCallback);
+                        mutable.$set('otherAttribute', 'some-new-value')
+                    }).then(function () {
+                        expect(mutationCallback).toHaveBeenCalledWith('some-new-value');
+                    });
+                });
+
+                it('to indicate when a child property has changed', function () {
+                    let embeddedKeyCallback = jasmine.createSpy('embeddedKeyCallback');
+                    let embeddedObjectCallback = jasmine.createSpy('embeddedObjectCallback');
+                    let objectAttributeCallback = jasmine.createSpy('objectAttribute');
+
+                    return new Promise(function (resolve) {
+                        objectAttributeCallback.and.callFake(resolve);
+
+                        mutableSecondInstance.observe('objectAttribute.embeddedObject.embeddedKey', embeddedKeyCallback);
+                        mutableSecondInstance.observe('objectAttribute.embeddedObject', embeddedObjectCallback);
+                        mutableSecondInstance.observe('objectAttribute', objectAttributeCallback);
+
+                        mutable.$set('objectAttribute.embeddedObject.embeddedKey', 'updated-embedded-value');
+                    }).then(function () {
+                        expect(embeddedKeyCallback).toHaveBeenCalledWith('updated-embedded-value');
+                        expect(embeddedObjectCallback).toHaveBeenCalledWith({
+                            embeddedKey: 'updated-embedded-value'
+                        });
+                        expect(objectAttributeCallback).toHaveBeenCalledWith({
+                            embeddedObject: {
+                                embeddedKey: 'updated-embedded-value'
+                            }
+                        });
+                    });
+                });
+            });
+        });
+    })
+});
--- a/src/api/overlays/ProgressDialog.js
+++ b/src/api/overlays/ProgressDialog.js
@@ -1,31 +1,25 @@
-import ProgressDialogComponent from './components/ProgressDialogComponent.vue';
+import ProgressComponent from '../../ui/components/ProgressBar.vue';
 import Overlay from './Overlay';
 import Vue from 'vue';

 var component;

 class ProgressDialog extends Overlay {
-    constructor({progressPerc, progressText, iconClass, message, title, hint, timestamp, ...options}) {
+    constructor({progressPerc, progressText, ...options}) {
+
        component = new Vue({
-            provide: {
-                iconClass,
-                message,
-                title,
-                hint,
-                timestamp
-            },
            components: {
-                ProgressDialogComponent: ProgressDialogComponent
+                ProgressComponent: ProgressComponent
            },
            data() {
                return {
                    model: {
                        progressPerc: progressPerc || 0,
-                        progressText
+                        progressText: progressText
                    }
                }
            },
-            template: '<progress-dialog-component :model="model"></progress-dialog-component>'
+            template: '<progress-component :model="model"></progress-component>'
        }).$mount();

        super({
--- a/src/api/overlays/components/DialogComponent.vue
+++ b/src/api/overlays/components/DialogComponent.vue
@@ -1,36 +1,27 @@
 <template>
-<div class="c-message">
-    <!--Uses flex-row -->
-    <div
-        class="c-message__icon"
-        :class="['u-icon-bg-color-' + iconClass]"
-    ></div>
-    <div class="c-message__text">
-        <!-- Uses flex-column -->
-        <div
-            v-if="title"
-            class="c-message__title"
-        >
-            {{ title }}
-        </div>
+    <div class="c-message">
+        <!--Uses flex-row -->
+        <div class="c-message__icon"
+             :class="['u-icon-bg-color-' + iconClass]"></div>
+        <div class="c-message__text">
+            <!-- Uses flex-column -->
+            <div class="c-message__title"
+                 v-if="title">
+                {{title}}
+            </div>

-        <div
-            v-if="hint"
-            class="c-message__hint"
-        >
-            {{ hint }}
-            <span v-if="timestamp">[{{ timestamp }}]</span>
-        </div>
+            <div class="c-message__hint"
+                 v-if="hint">
+                {{hint}}
+                <span v-if="timestamp">[{{timestamp}}]</span>
+            </div>

-        <div
-            v-if="message"
-            class="c-message__action-text"
-        >
-            {{ message }}
+            <div class="c-message__action-text"
+                 v-if="message">
+                {{message}}
+            </div>
        </div>
-        <slot></slot>
    </div>
-</div>
 </template>

 <style lang="scss">
@@ -53,7 +44,7 @@

        &__icon {
            // Holds a background SVG graphic
-            $s: 80px;
+            $s: 50px;
            flex: 0 0 auto;
            min-width: $s;
            min-height: $s;
@@ -70,13 +61,9 @@
        }

        // __text elements
+        &__title,
        &__action-text {
-            font-size: 1.2em;
-        }
-
-        &__title {
-            font-size: 1.5em;
-            font-weight: bold;
+            font-size: 1.2em; // TEMP
        }

        &--simple {
--- a/src/api/overlays/components/OverlayComponent.vue
+++ b/src/api/overlays/components/OverlayComponent.vue
@@ -1,39 +1,25 @@
 <template>
-<div class="c-overlay">
-    <div
-        class="c-overlay__blocker"
-        @click="destroy"
-    ></div>
-    <div class="c-overlay__outer">
-        <button
-            v-if="dismissable"
-            class="c-click-icon c-overlay__close-button icon-x-in-circle"
-            @click="destroy"
-        ></button>
-        <div
-            ref="element"
-            class="c-overlay__contents"
-            tabindex="0"
-        ></div>
-        <div
-            v-if="buttons"
-            class="c-overlay__button-bar"
-        >
-            <button
-                v-for="(button, index) in buttons"
-                ref="buttons"
-                :key="index"
-                class="c-button"
-                tabindex="0"
-                :class="{'c-button--major': focusIndex===index}"
-                @focus="focusIndex=index"
-                @click="buttonClickHandler(button.callback)"
-            >
-                {{ button.label }}
+    <div class="c-overlay">
+        <div class="c-overlay__blocker"
+            @click="destroy">
+        </div>
+        <div class="c-overlay__outer">
+            <button class="c-click-icon c-overlay__close-button icon-x-in-circle"
+                v-if="dismissable"
+                @click="destroy">
            </button>
+            <div class="c-overlay__contents" ref="element"></div>
+            <div class="c-overlay__button-bar" v-if="buttons">
+                <button class="c-button"
+                        v-for="(button, index) in buttons"
+                        :key="index"
+                        :class="{'c-button--major': button.emphasis}"
+                        @click="buttonClickHandler(button.callback)">
+                    {{button.label}}
+                </button>
+            </div>
        </div>
    </div>
-</div>
 </template>

 <style lang="scss">
@@ -83,7 +69,6 @@
            flex: 1 1 auto;
            display: flex;
            flex-direction: column;
-            outline: none;
            overflow: hidden;
        }

@@ -149,7 +134,7 @@
                box-shadow: rgba(black, 0.5) 0 2px 25px;
            }
        }
-
+        
        .l-overlay-fullscreen {
            // Used by About > Licenses display
            .c-overlay__outer {
@@ -185,50 +170,21 @@
 </style>

 <script>
-export default {
-    data: function () {
-        return {
-            focusIndex: -1
-        };
-    },
-    inject: ['dismiss', 'element', 'buttons', 'dismissable'],
-    mounted() {
-        const element = this.$refs.element;
-        element.appendChild(this.element);
-        const elementForFocus = this.getElementForFocus() || element;
-        this.$nextTick(() => {
-            elementForFocus.focus();
-        });
-    },
-    methods: {
-        destroy: function () {
-            if (this.dismissable) {
-                this.dismiss();
-            }
+    export default {
+        inject: ['dismiss', 'element', 'buttons', 'dismissable'],
+        mounted() {
+            this.$refs.element.appendChild(this.element);
        },
-        buttonClickHandler: function (method) {
-            method();
-            this.$emit('destroy');
-        },
-        getElementForFocus: function () {
-            const defaultElement = this.$refs.element;
-            if (!this.$refs.buttons) {
-                return defaultElement;
-            }
-
-            const focusButton = this.$refs.buttons.filter((button, index) => {
-                if (this.buttons[index].emphasis) {
-                    this.focusIndex = index;
+        methods: {
+            destroy: function () {
+                if (this.dismissable) {
+                    this.dismiss();
                }
-                return this.buttons[index].emphasis;
-            });
-
-            if (!focusButton.length) {
-                return defaultElement;
+            },
+            buttonClickHandler: function (method) {
+                method();
+                this.$emit('destroy');
            }
-
-            return focusButton[0];
        }
    }
-}
 </script>
--- a/src/api/overlays/components/ProgressDialogComponent.vue
+++ b/src/api/overlays/components/ProgressDialogComponent.vue
@@ -1,27 +0,0 @@
-<template>
-<dialog-component>
-    <progress-component :model="model" />
-</dialog-component>
-</template>
-
-<style lang="scss">
-</style>
-
-<script>
-import ProgressComponent from '../../../ui/components/ProgressBar.vue';
-import DialogComponent from './DialogComponent.vue';
-
-export default {
-    components: {
-        DialogComponent: DialogComponent,
-        ProgressComponent: ProgressComponent
-    },
-    inject:['iconClass', 'title', 'hint', 'timestamp', 'message'],
-    props: {
-        model: {
-            type: Object,
-            required: true
-        }
-    }
-}
-</script>
--- a/src/installDefaultBundles.js
+++ b/src/installDefaultBundles.js
@@ -19,41 +19,12 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-const DEFAULTS = [
-    'src/adapter',
-    'platform/framework',
-    'platform/core',
-    'platform/representation',
-    'platform/commonUI/about',
-    'platform/commonUI/browse',
-    'platform/commonUI/edit',
-    'platform/commonUI/dialog',
-    'platform/commonUI/formats',
-    'platform/commonUI/general',
-    'platform/commonUI/inspect',
-    'platform/commonUI/mobile',
-    'platform/commonUI/notification',
-    'platform/containment',
-    'platform/execution',
-    'platform/exporters',
-    'platform/telemetry',
-    'platform/features/clock',
-    'platform/features/imagery',
-    'platform/features/hyperlink',
-    'platform/features/timeline',
-    'platform/forms',
-    'platform/identity',
-    'platform/persistence/aggregator',
-    'platform/persistence/queue',
-    'platform/policy',
-    'platform/entanglement',
-    'platform/search',
-    'platform/status',
-    'platform/commonUI/regions'
-];

 define([
+    'legacyRegistry',
+
    '../src/adapter/bundle',
+
    '../example/eventGenerator/bundle',
    '../example/export/bundle',
    '../example/forms/bundle',
@@ -66,6 +37,7 @@ define([
    '../example/profiling/bundle',
    '../example/scratchpad/bundle',
    '../example/styleguide/bundle',
+
    '../platform/commonUI/about/bundle',
    '../platform/commonUI/browse/bundle',
    '../platform/commonUI/dialog/bundle',
@@ -84,6 +56,7 @@ define([
    '../platform/features/clock/bundle',
    '../platform/features/imagery/bundle',
    '../platform/features/my-items/bundle',
+    '../platform/features/pages/bundle',
    '../platform/features/hyperlink/bundle',
    '../platform/features/static-markup/bundle',
    '../platform/features/timeline/bundle',
@@ -101,23 +74,45 @@ define([
    '../platform/search/bundle',
    '../platform/status/bundle',
    '../platform/telemetry/bundle'
-], function () {
-    const LEGACY_BUNDLES = Array.from(arguments);
+], function (legacyRegistry) {

-    return function installDefaultBundles(bundleRegistry) {
-        registerLegacyBundles(LEGACY_BUNDLES);
-        enableDefaultBundles();
+    var DEFAULTS = [
+        'src/adapter',
+        'platform/framework',
+        'platform/core',
+        'platform/representation',
+        'platform/commonUI/about',
+        'platform/commonUI/browse',
+        'platform/commonUI/edit',
+        'platform/commonUI/dialog',
+        'platform/commonUI/formats',
+        'platform/commonUI/general',
+        'platform/commonUI/inspect',
+        'platform/commonUI/mobile',
+        'platform/commonUI/notification',
+        'platform/containment',
+        'platform/execution',
+        'platform/exporters',
+        'platform/telemetry',
+        'platform/features/clock',
+        'platform/features/imagery',
+        'platform/features/pages',
+        'platform/features/hyperlink',
+        'platform/features/timeline',
+        'platform/forms',
+        'platform/identity',
+        'platform/persistence/aggregator',
+        'platform/persistence/queue',
+        'platform/policy',
+        'platform/entanglement',
+        'platform/search',
+        'platform/status',
+        'platform/commonUI/regions'
+    ];

-        function registerLegacyBundles(bundles) {
-            bundles.forEach((bundle, i) => {
-                bundleRegistry.register(bundle.name, bundle.definition);
-            });
-        }
+    DEFAULTS.forEach(function (bundlePath) {
+        legacyRegistry.enable(bundlePath);
+    });

-        function enableDefaultBundles() {
-            DEFAULTS.forEach(function (bundlePath) {
-                bundleRegistry.enable(bundlePath);
-            });
-        }
-    };
+    return legacyRegistry;
 });
--- a/src/plugins/LADTable/LADTableSetViewProvider.js
+++ b/src/plugins/LADTable/LADTableSetViewProvider.js
@@ -38,13 +38,12 @@ define([
            canEdit: function (domainObject) {
                return domainObject.type === 'LadTableSet';
            },
-            view: function (domainObject, objectPath) {
+            view: function (domainObject, isEditing, objectPath) {
                let component;

                return {
                    show: function (element) {
                        component =  new Vue({
-                            el: element,
                            components: {
                                LadTableSet: LadTableSet.default
                            },
@@ -53,6 +52,7 @@ define([
                                domainObject,
                                objectPath
                            },
+                            el: element,
                            template: '<lad-table-set></lad-table-set>'
                        });
                    },
--- a/src/plugins/LADTable/LADTableViewProvider.js
+++ b/src/plugins/LADTable/LADTableViewProvider.js
@@ -38,13 +38,12 @@ define([
            canEdit: function (domainObject) {
                return domainObject.type === 'LadTable';
            },
-            view: function (domainObject, objectPath) {
+            view: function (domainObject, isEditing, objectPath) {
                let component;

                return {
                    show: function (element) {
                        component =  new Vue({
-                            el: element,
                            components: {
                                LadTableComponent: LadTableComponent.default
                            },
@@ -53,6 +52,7 @@ define([
                                domainObject,
                                objectPath
                            },
+                            el: element,
                            template: '<lad-table-component></lad-table-component>'
                        });
                    },
--- a/src/plugins/LADTable/components/LADRow.vue
+++ b/src/plugins/LADTable/components/LADRow.vue
@@ -22,13 +22,13 @@
 *****************************************************************************/

 <template>
-<tr @contextmenu.prevent="showContextMenu">
-    <td>{{ name }}</td>
-    <td>{{ timestamp }}</td>
-    <td :class="valueClass">
-        {{ value }}
-    </td>
-</tr>
+    <tr @contextmenu.prevent="showContextMenu">
+        <td>{{domainObject.name}}</td>
+        <td>{{timestamp}}</td>
+        <td :class="valueClass">
+            {{value}}
+        </td>
+    </tr>
 </template>

 <style lang="scss">
@@ -44,41 +44,56 @@ const CONTEXT_MENU_ACTIONS = [

 export default {
    inject: ['openmct', 'objectPath'],
-    props: {
-        domainObject: {
-            type: Object,
-            required: true
-        }
-    },
+    props: ['domainObject'],
    data() {
        let currentObjectPath = this.objectPath.slice();
        currentObjectPath.unshift(this.domainObject);

        return {
-            name: this.domainObject.name,
            timestamp: '---',
            value: '---',
            valueClass: '',
            currentObjectPath
        }
    },
+    methods: {
+        updateValues(datum) {
+            this.timestamp = this.formats[this.timestampKey].format(datum);
+            this.value = this.formats[this.valueKey].format(datum);
+
+            var limit = this.limitEvaluator.evaluate(datum, this.valueMetadata);
+
+            if (limit) {
+                this.valueClass = limit.cssClass;
+            } else {
+                this.valueClass = '';
+            }
+        },
+        updateTimeSystem(timeSystem) {
+            this.value = '---';
+            this.timestamp = '---';
+            this.valueClass = '';
+            this.timestampKey = timeSystem.key;
+
+            this.openmct
+                .telemetry
+                .request(this.domainObject, {strategy: 'latest'})
+                .then((array) => this.updateValues(array[array.length - 1]));
+
+        },
+        showContextMenu(event) {
+           this.openmct.contextMenu._showContextMenuForObjectPath(this.currentObjectPath, event.x, event.y, CONTEXT_MENU_ACTIONS);
+        }
+    },
    mounted() {
        this.metadata = this.openmct.telemetry.getMetadata(this.domainObject);
        this.formats = this.openmct.telemetry.getFormatMap(this.metadata);
        this.keyString = this.openmct.objects.makeKeyString(this.domainObject.identifier);

-        this.limitEvaluator = this.openmct
+        this.limitEvaluator = openmct
            .telemetry
            .limitEvaluator(this.domainObject);

-        this.stopWatchingMutation = this.openmct
-            .objects
-            .observe(
-                this.domainObject,
-                '*',
-                this.updateName
-            );
-
        this.openmct.time.on('timeSystem', this.updateTimeSystem);

        this.timestampKey = this.openmct.time.timeSystem().key;
@@ -99,41 +114,8 @@ export default {
            .then((array) => this.updateValues(array[array.length - 1]));
    },
    destroyed() {
-        this.stopWatchingMutation();
        this.unsubscribe();
        this.openmct.off('timeSystem', this.updateTimeSystem);
-    },
-    methods: {
-        updateValues(datum) {
-            this.timestamp = this.formats[this.timestampKey].format(datum);
-            this.value = this.formats[this.valueKey].format(datum);
-
-            var limit = this.limitEvaluator.evaluate(datum, this.valueMetadata);
-
-            if (limit) {
-                this.valueClass = limit.cssClass;
-            } else {
-                this.valueClass = '';
-            }
-        },
-        updateName(name) {
-            this.name = name;
-        },
-        updateTimeSystem(timeSystem) {
-            this.value = '---';
-            this.timestamp = '---';
-            this.valueClass = '';
-            this.timestampKey = timeSystem.key;
-
-            this.openmct
-                .telemetry
-                .request(this.domainObject, {strategy: 'latest'})
-                .then((array) => this.updateValues(array[array.length - 1]));
-
-        },
-        showContextMenu(event) {
-            this.openmct.contextMenu._showContextMenuForObjectPath(this.currentObjectPath, event.x, event.y, CONTEXT_MENU_ACTIONS);
-        }
    }
 }
 </script>
--- a/src/plugins/LADTable/components/LADTable.vue
+++ b/src/plugins/LADTable/components/LADTable.vue
@@ -30,16 +30,17 @@
        </tr>
    </thead>
    <tbody>
-        <lad-row
+        <lad-row 
            v-for="item in items"
            :key="item.key"
-            :domain-object="item.domainObject"
-        />
+            :domainObject="item.domainObject">
+        </lad-row>
    </tbody>
 </table>
 </template>

 <script>
+import lodash from 'lodash';
 import LadRow from './LADRow.vue';

 export default {
@@ -52,18 +53,6 @@ export default {
            items: []
        }
    },
-    mounted() {
-        this.composition = this.openmct.composition.get(this.domainObject);
-        this.composition.on('add', this.addItem);
-        this.composition.on('remove', this.removeItem);
-        this.composition.on('reorder', this.reorder);
-        this.composition.load();
-    },
-    destroyed() {
-        this.composition.off('add', this.addItem);
-        this.composition.off('remove', this.removeItem);
-        this.composition.off('reorder', this.reorder);
-    },
    methods: {
        addItem(domainObject) {
            let item = {};
@@ -83,6 +72,18 @@ export default {
                this.$set(this.items, reorderEvent.newIndex, oldItems[reorderEvent.oldIndex]);
            });
        }
+    },
+    mounted() {
+        this.composition = this.openmct.composition.get(this.domainObject);
+        this.composition.on('add', this.addItem);
+        this.composition.on('remove', this.removeItem);
+        this.composition.on('reorder', this.reorder);
+        this.composition.load();
+    },
+    destroyed() {
+        this.composition.off('add', this.addItem);
+        this.composition.off('remove', this.removeItem);
+        this.composition.off('reorder', this.reorder);
    }
 }
 </script>
--- a/src/plugins/LADTable/components/LadTableSet.vue
+++ b/src/plugins/LADTable/components/LadTableSet.vue
@@ -21,34 +21,29 @@
 *****************************************************************************/

 <template>
-<table class="c-table c-lad-table">
-    <thead>
-        <tr>
-            <th>Name</th>
-            <th>Timestamp</th>
-            <th>Value</th>
-        </tr>
-    </thead>
-    <tbody>
-        <template
-            v-for="primary in primaryTelemetryObjects"
-        >
-            <tr
-                :key="primary.key"
-                class="c-table__group-header"
-            >
-                <td colspan="10">
-                    {{ primary.domainObject.name }}
-                </td>
+    <table class="c-table c-lad-table">
+        <thead>
+            <tr>
+                <th>Name</th>
+                <th>Timestamp</th>
+                <th>Value</th>
            </tr>
-            <lad-row
-                v-for="secondary in secondaryTelemetryObjects[primary.key]"
-                :key="secondary.key"
-                :domain-object="secondary.domainObject"
-            />
-        </template>
-    </tbody>
-</table>
+        </thead>
+        <tbody>
+            <template
+                v-for="primary in primaryTelemetryObjects">
+                <tr class="c-table__group-header"
+                    :key="primary.key">
+                    <td colspan="10">{{primary.domainObject.name}}</td>
+                </tr>
+                <lad-row
+                    v-for="secondary in secondaryTelemetryObjects[primary.key]"
+                    :key="secondary.key"
+                    :domainObject="secondary.domainObject">
+                </lad-row>
+            </template>
+        </tbody>
+    </table>
 </template>

 <style lang="scss">
@@ -56,9 +51,10 @@
 </style>

 <script>
-import LadRow from './LADRow.vue';
+    import lodash from 'lodash';
+    import LadRow from './LADRow.vue';

-export default {
+    export default {
    inject: ['openmct', 'domainObject'],
    components: {
        LadRow
@@ -70,22 +66,6 @@ export default {
            compositions: []
        }
    },
-    mounted() {
-        this.composition = this.openmct.composition.get(this.domainObject);
-        this.composition.on('add', this.addPrimary);
-        this.composition.on('remove', this.removePrimary);
-        this.composition.on('reorder', this.reorderPrimary);
-        this.composition.load();
-    },
-    destroyed() {
-        this.composition.off('add', this.addPrimary);
-        this.composition.off('remove', this.removePrimary);
-        this.composition.off('reorder', this.reorderPrimary);
-        this.compositions.forEach(c => {
-            c.composition.off('add', c.addCallback);
-            c.composition.off('remove', c.removeCallback);
-        });
-    },
    methods: {
        addPrimary(domainObject) {
            let primary = {};
@@ -95,7 +75,7 @@ export default {
            this.$set(this.secondaryTelemetryObjects, primary.key, []);
            this.primaryTelemetryObjects.push(primary);

-            let composition = this.openmct.composition.get(primary.domainObject),
+            let composition = openmct.composition.get(primary.domainObject),
                addCallback = this.addSecondary(primary),
                removeCallback = this.removeSecondary(primary);

@@ -108,7 +88,7 @@ export default {
        removePrimary(identifier) {
            let index = _.findIndex(this.primaryTelemetryObjects, (primary) => this.openmct.objects.makeKeyString(identifier) === primary.key),
                primary = this.primaryTelemetryObjects[index];
-
+            
            this.$set(this.secondaryTelemetryObjects, primary.key, undefined);
            this.primaryTelemetryObjects.splice(index,1);
            primary = undefined;
@@ -127,7 +107,7 @@ export default {

                let array = this.secondaryTelemetryObjects[primary.key];
                array.push(secondary);
-
+    
                this.$set(this.secondaryTelemetryObjects, primary.key, array);
            }
        },
@@ -141,6 +121,23 @@ export default {
                this.$set(this.secondaryTelemetryObjects, primary.key, array);
            }
        }
+    },
+    mounted() {
+        this.composition = this.openmct.composition.get(this.domainObject);
+        this.composition.on('add', this.addPrimary);
+        this.composition.on('remove', this.removePrimary);
+        this.composition.on('reorder', this.reorderPrimary);
+        this.composition.load();
+    },
+    destroyed() {
+        this.composition.off('add', this.addPrimary);
+        this.composition.off('remove', this.removePrimary);
+        this.composition.off('reorder', this.reorderPrimary);
+        this.compositions.forEach(c => {
+            c.composition.off('add', c.addCallback);
+            c.composition.off('remove', c.removeCallback);
+        });
    }
 }
 </script>
+  
--- a/src/plugins/clearData/components/globalClearIndicator.vue
+++ b/src/plugins/clearData/components/globalClearIndicator.vue
@@ -1,9 +1,9 @@
 <template>
-<div class="c-indicator c-indicator--clickable icon-clear-data s-status-caution">
-    <span class="label c-indicator__label">
-        <button @click="globalClearEmit">Clear Data</button>
-    </span>
-</div>
+    <div class="c-indicator c-indicator--clickable icon-clear-data s-status-caution">
+        <span class="label c-indicator__label">
+            <button @click="globalClearEmit">Clear Data</button>
+        </span>
+    </div>
 </template>

 <script>
--- a/src/plugins/displayLayout/AlphanumericFormatViewProvider.js
+++ b/src/plugins/displayLayout/AlphanumericFormatViewProvider.js
@@ -46,7 +46,7 @@ define([

                return selection.every(isTelemetryObject);
            },
-            view: function (domainObject, objectPath) {
+            view: function (domainObject, isEditing, objectPath) {
                let component;
                return {
                    show: function (element) {
@@ -55,11 +55,11 @@ define([
                                openmct,
                                objectPath
                            },
-                            el: element,
                            components: {
                                AlphanumericFormatView: AlphanumericFormatView.default
                            },
-                            template: '<alphanumeric-format-view></alphanumeric-format-view>'
+                            template: '<alphanumeric-format-view></alphanumeric-format-view>',
+                            el: element
                        });
                    },
                    destroy: function () {
--- a/src/plugins/displayLayout/components/AlphanumericFormatView.vue
+++ b/src/plugins/displayLayout/components/AlphanumericFormatView.vue
@@ -21,78 +21,70 @@
 *****************************************************************************/

 <template>
-<div
-    v-if="isEditing"
-    class="c-properties"
->
-    <div class="c-properties__header">
-        Alphanumeric Format
+    <div class="c-properties" v-if="isEditing">
+        <div class="c-properties__header">Alphanumeric Format</div>
+        <ul class="c-properties__section">
+            <li class="c-properties__row">
+                <div class="c-properties__label" title="Printf formatting for the selected telemetry">
+                    <label for="telemetryPrintfFormat">Format</label>
+                </div>
+                <div class="c-properties__value">
+                    <input id="telemetryPrintfFormat"
+                        type="text"
+                        @change="formatTelemetry"
+                        :value="telemetryFormat"
+                        :placeholder="nonMixedFormat ? '' : 'Mixed'"
+                    >
+                </div>
+            </li>
+        </ul>
    </div>
-    <ul class="c-properties__section">
-        <li class="c-properties__row">
-            <div
-                class="c-properties__label"
-                title="Printf formatting for the selected telemetry"
-            >
-                <label for="telemetryPrintfFormat">Format</label>
-            </div>
-            <div class="c-properties__value">
-                <input
-                    id="telemetryPrintfFormat"
-                    type="text"
-                    :value="telemetryFormat"
-                    :placeholder="nonMixedFormat ? '' : 'Mixed'"
-                    @change="formatTelemetry"
-                >
-            </div>
-        </li>
-    </ul>
-</div>
 </template>

 <script>
-export default {
-    inject: ['openmct'],
-    data() {
-        return {
-            isEditing: this.openmct.editor.isEditing(),
-            telemetryFormat: undefined,
-            nonMixedFormat: false
-        }
-    },
-    mounted() {
-        this.openmct.editor.on('isEditing', this.toggleEdit);
-        this.openmct.selection.on('change', this.handleSelection);
-        this.handleSelection(this.openmct.selection.get());
-    },
-    destroyed() {
-        this.openmct.editor.off('isEditing', this.toggleEdit);
-        this.openmct.selection.off('change', this.handleSelection);
-    },
-    methods: {
-        toggleEdit(isEditing) {
-            this.isEditing = isEditing;
-        },
-        formatTelemetry(event) {
-            let newFormat = event.currentTarget.value;
-            this.openmct.selection.get().forEach(selectionPath => {
-                selectionPath[0].context.updateTelemetryFormat(newFormat);
-            });
-            this.telemetryFormat = newFormat;
-        },
-        handleSelection(selection) {
-            if (selection.length === 0 || selection[0].length < 2) {
-                return;
+    export default {
+        inject: ['openmct'],
+        data() {
+            let selectionPath = this.openmct.selection.get()[0];
+            return {
+                isEditing: this.openmct.editor.isEditing(),
+                telemetryFormat: undefined,
+                nonMixedFormat: false
            }
+        },
+        methods: {
+            toggleEdit(isEditing) {
+                this.isEditing = isEditing;
+            },
+            formatTelemetry(event) {
+                let newFormat = event.currentTarget.value;
+                this.openmct.selection.get().forEach(selectionPath => {
+                    selectionPath[0].context.updateTelemetryFormat(newFormat);    
+                });
+                this.telemetryFormat = newFormat;
+            },
+            handleSelection(selection) {
+                if (selection.length === 0 || selection[0].length < 2) {
+                    return;
+                }

-            let format = selection[0][0].context.layoutItem.format;
-            this.nonMixedFormat = selection.every(selectionPath => {
-                return selectionPath[0].context.layoutItem.format === format;
-            });
+                let format = selection[0][0].context.layoutItem.format;
+                this.nonMixedFormat = selection.every(selectionPath => {
+                    return selectionPath[0].context.layoutItem.format === format;
+                });

-            this.telemetryFormat = this.nonMixedFormat ? format : '';
+                this.telemetryFormat = this.nonMixedFormat ? format : '';
+            }
+        },
+        mounted() {
+            this.openmct.editor.on('isEditing', this.toggleEdit);
+            this.openmct.selection.on('change', this.handleSelection);
+            this.handleSelection(this.openmct.selection.get());
+        },
+        destroyed() {
+            this.openmct.editor.off('isEditing', this.toggleEdit);
+            this.openmct.selection.off('change', this.handleSelection);
        }
    }
-}

-</script>
+</script>
--- a/src/plugins/displayLayout/components/BoxView.vue
+++ b/src/plugins/displayLayout/components/BoxView.vue
@@ -21,18 +21,15 @@
 *****************************************************************************/

 <template>
-<layout-frame
-    :item="item"
-    :grid-size="gridSize"
-    @move="(gridDelta) => $emit('move', gridDelta)"
-    @endMove="() => $emit('endMove')"
->
-    <div
-        class="c-box-view"
-        :style="style"
-    ></div>
-</layout-frame>
-</template>
+    <layout-frame :item="item"
+                  :grid-size="gridSize"
+                  @move="(gridDelta) => $emit('move', gridDelta)"
+                  @endMove="() => $emit('endMove')">
+        <div class="c-box-view"
+             :style="style">
+        </div>
+    </layout-frame>
+ </template>

 <style lang="scss">
    @import '~styles/sass-base';
@@ -47,70 +44,60 @@
    }
 </style>

-<script>
-import LayoutFrame from './LayoutFrame.vue'
+ <script>
+    import LayoutFrame from './LayoutFrame.vue'

-export default {
-    makeDefinition() {
-        return {
-            fill: '#717171',
-            stroke: 'transparent',
-            x: 1,
-            y: 1,
-            width: 10,
-            height: 5
-        };
-    },
-    inject: ['openmct'],
-    components: {
-        LayoutFrame
-    },
-    props: {
-        item: {
-            type: Object,
-            required: true
-        },
-        gridSize: {
-            type: Array,
-            required: true,
-            validator: (arr) => arr && arr.length === 2
-                && arr.every(el => typeof el === 'number')
-        },
-        index: {
-            type: Number,
-            required: true
-        },
-        initSelect: Boolean
-    },
-    computed: {
-        style() {
+    export default {
+        makeDefinition() {
            return {
-                backgroundColor: this.item.fill,
-                border: '1px solid ' + this.item.stroke
+                fill: '#717171',
+                stroke: 'transparent',
+                x: 1,
+                y: 1,
+                width: 10, 
+                height: 5
            };
-        }
-    },
-    watch: {
-        index(newIndex) {
-            if (!this.context) {
-                return;
+        },
+        inject: ['openmct'],
+        components: {
+            LayoutFrame
+        },
+        props: {
+            item: Object,
+            gridSize: Array,
+            index: Number,
+            initSelect: Boolean
+        },
+        computed: {
+            style() {
+                return {
+                    backgroundColor: this.item.fill,
+                    border: '1px solid ' + this.item.stroke
+                };
            }
+        },
+        watch: {
+            index(newIndex) {
+                if (!this.context) {
+                    return;
+                }

-            this.context.index = newIndex;
-        }
-    },
-    mounted() {
-        this.context = {
-            layoutItem: this.item,
-            index: this.index
-        };
-        this.removeSelectable = this.openmct.selection.selectable(
-            this.$el, this.context, this.initSelect);
-    },
-    destroyed() {
-        if (this.removeSelectable) {
-            this.removeSelectable();
+                this.context.index = newIndex;
+            }
+        },
+        mounted() {
+            this.context = {
+                layoutItem: this.item,
+                index: this.index
+            };
+            this.removeSelectable = this.openmct.selection.selectable(
+                this.$el, this.context, this.initSelect);
+        },
+        destroyed() {
+            if (this.removeSelectable) {
+                this.removeSelectable();
+            }
        }
    }
-}
-</script>
+ </script>
+ 
--- a/src/plugins/displayLayout/components/DisplayLayout.vue
+++ b/src/plugins/displayLayout/components/DisplayLayout.vue
@@ -21,49 +21,42 @@
 *****************************************************************************/

 <template>
-<div
-    class="l-layout"
-    :class="{
-        'is-multi-selected': selectedLayoutItems.length > 1
-    }"
-    @dragover="handleDragOver"
-    @click.capture="bypassSelection"
-    @drop="handleDrop"
->
-    <!-- Background grid -->
-    <div class="l-layout__grid-holder c-grid">
-        <div
-            v-if="gridSize[0] >= 3"
-            class="c-grid__x l-grid l-grid-x"
-            :style="[{ backgroundSize: gridSize[0] + 'px 100%' }]"
-        ></div>
-        <div
-            v-if="gridSize[1] >= 3"
-            class="c-grid__y l-grid l-grid-y"
-            :style="[{ backgroundSize: '100%' + gridSize[1] + 'px' }]"
-        ></div>
+    <div class="l-layout"
+         @dragover="handleDragOver"
+         @click.capture="bypassSelection"
+         @drop="handleDrop"
+         :class="{
+            'is-multi-selected': selectedLayoutItems.length > 1
+            }">
+        <!-- Background grid -->
+        <div class="l-layout__grid-holder c-grid">
+            <div class="c-grid__x l-grid l-grid-x"
+                 v-if="gridSize[0] >= 3"
+                 :style="[{ backgroundSize: gridSize[0] + 'px 100%' }]">
+            </div>
+            <div class="c-grid__y l-grid l-grid-y"
+                 v-if="gridSize[1] >= 3"
+                 :style="[{ backgroundSize: '100%' + gridSize[1] + 'px' }]"></div>
+        </div>
+        <component v-for="(item, index) in layoutItems"
+                   :is="item.type"
+                   :item="item"
+                   :key="item.id"
+                   :gridSize="gridSize"
+                   :initSelect="initSelectIndex === index"
+                   :index="index"
+                   :multiSelect="selectedLayoutItems.length > 1"
+                   @move="move"
+                   @endMove="endMove"
+                   @endLineResize='endLineResize'
+                   @formatChanged='updateTelemetryFormat'>
+        </component>
+        <edit-marquee v-if='showMarquee'
+                      :gridSize="gridSize"
+                      :selectedLayoutItems="selectedLayoutItems"
+                      @endResize="endResize">
+        </edit-marquee>
    </div>
-    <component
-        :is="item.type"
-        v-for="(item, index) in layoutItems"
-        :key="item.id"
-        :item="item"
-        :grid-size="gridSize"
-        :init-select="initSelectIndex === index"
-        :index="index"
-        :multi-select="selectedLayoutItems.length > 1"
-        @move="move"
-        @endMove="endMove"
-        @endLineResize="endLineResize"
-        @formatChanged="updateTelemetryFormat"
-    />
-    <edit-marquee
-        v-if="showMarquee"
-        :grid-size="gridSize"
-        :selected-layout-items="selectedLayoutItems"
-        @endResize="endResize"
-    />
-</div>
 </template>

 <style lang="scss">
@@ -142,455 +135,447 @@
 </style>

 <script>
-import uuid from 'uuid';
+    import uuid from 'uuid';

-import SubobjectView from './SubobjectView.vue'
-import TelemetryView from './TelemetryView.vue'
-import BoxView from './BoxView.vue'
-import TextView from './TextView.vue'
-import LineView from './LineView.vue'
-import ImageView from './ImageView.vue'
-import EditMarquee from './EditMarquee.vue'
+    import SubobjectView from './SubobjectView.vue'
+    import TelemetryView from './TelemetryView.vue'
+    import BoxView from './BoxView.vue'
+    import TextView from './TextView.vue'
+    import LineView from './LineView.vue'
+    import ImageView from './ImageView.vue'
+    import EditMarquee from './EditMarquee.vue'

-const ITEM_TYPE_VIEW_MAP = {
-    'subobject-view': SubobjectView,
-    'telemetry-view': TelemetryView,
-    'box-view': BoxView,
-    'line-view': LineView,
-    'text-view': TextView,
-    'image-view': ImageView
-};
-const ORDERS = {
-    top: Number.POSITIVE_INFINITY,
-    up: 1,
-    down: -1,
-    bottom: Number.NEGATIVE_INFINITY
-};
-const DRAG_OBJECT_TRANSFER_PREFIX = 'openmct/domain-object/';
+    const ITEM_TYPE_VIEW_MAP = {
+        'subobject-view': SubobjectView,
+        'telemetry-view': TelemetryView,
+        'box-view': BoxView,
+        'line-view': LineView,
+        'text-view': TextView,
+        'image-view': ImageView
+    };
+    const ORDERS = {
+        top: Number.POSITIVE_INFINITY,
+        up: 1,
+        down: -1,
+        bottom: Number.NEGATIVE_INFINITY
+    };
+    const DRAG_OBJECT_TRANSFER_PREFIX = 'openmct/domain-object/';

-let components = ITEM_TYPE_VIEW_MAP;
-components['edit-marquee'] = EditMarquee;
+    let components = ITEM_TYPE_VIEW_MAP;
+    components['edit-marquee'] = EditMarquee;

-function getItemDefinition(itemType, ...options) {
-    let itemView = ITEM_TYPE_VIEW_MAP[itemType];
+    function getItemDefinition(itemType, ...options) {
+        let itemView = ITEM_TYPE_VIEW_MAP[itemType];

-    if (!itemView) {
-        throw `Invalid itemType: ${itemType}`;
+        if (!itemView) {
+            throw `Invalid itemType: ${itemType}`;
+        }
+
+        return itemView.makeDefinition(...options);
    }

-    return itemView.makeDefinition(...options);
-}
-
-export default {
-    components: components,
-    props: {
-        domainObject: {
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        let domainObject = JSON.parse(JSON.stringify(this.domainObject));
-        return {
-            internalDomainObject: domainObject,
-            initSelectIndex: undefined,
-            selection: []
-        };
-    },
-    computed: {
-        gridSize() {
-            return this.internalDomainObject.configuration.layoutGrid;
+    export default {
+        data() {
+            return {
+                internalDomainObject: this.domainObject,
+                initSelectIndex: undefined,
+                selection: []
+            };
        },
-        layoutItems() {
-            return this.internalDomainObject.configuration.items;
-        },
-        selectedLayoutItems() {
-            return this.layoutItems.filter(item => {
-                return this.itemIsInCurrentSelection(item);
-            });
-        },
-        showMarquee() {
-            let selectionPath = this.selection[0];
-            let singleSelectedLine = this.selection.length === 1 &&
-                    selectionPath[0].context.layoutItem && selectionPath[0].context.layoutItem.type === 'line-view';
-            return selectionPath && selectionPath.length > 1 && !singleSelectedLine;
-        }
-    },
-    inject: ['openmct', 'options', 'objectPath'],
-    mounted() {
-        this.unlisten = this.openmct.objects.observe(this.internalDomainObject, '*', function (obj) {
-            this.internalDomainObject = JSON.parse(JSON.stringify(obj));
-        }.bind(this));
-        this.openmct.selection.on('change', this.setSelection);
-        this.initializeItems();
-        this.composition = this.openmct.composition.get(this.internalDomainObject);
-        this.composition.on('add', this.addChild);
-        this.composition.on('remove', this.removeChild);
-        this.composition.load();
-    },
-    destroyed: function () {
-        this.openmct.selection.off('change', this.setSelection);
-        this.composition.off('add', this.addChild);
-        this.composition.off('remove', this.removeChild);
-        this.unlisten();
-    },
-    methods: {
-        addElement(itemType, element) {
-            this.addItem(itemType + '-view', element);
-        },
-        setSelection(selection) {
-            this.selection = selection;
-        },
-        itemIsInCurrentSelection(item) {
-            return this.selection.some(selectionPath =>
-                selectionPath[0].context.layoutItem && selectionPath[0].context.layoutItem.id === item.id);
-        },
-        bypassSelection($event) {
-            if (this.dragInProgress) {
-                if ($event) {
-                    $event.stopImmediatePropagation();
-                }
-                this.dragInProgress = false;
-                return;
-            }
-        },
-        endLineResize(item, updates) {
-            this.dragInProgress = true;
-            let index = this.layoutItems.indexOf(item);
-            Object.assign(item, updates);
-            this.mutate(`configuration.items[${index}]`, item);
-        },
-        endResize(scaleWidth, scaleHeight, marqueeStart, marqueeOffset) {
-            this.dragInProgress = true;
-            this.layoutItems.forEach(item => {
-                if (this.itemIsInCurrentSelection(item)) {
-                    let itemXInMarqueeSpace = item.x - marqueeStart.x;
-                    let itemXInMarqueeSpaceAfterScale = Math.round(itemXInMarqueeSpace * scaleWidth);
-                    item.x = itemXInMarqueeSpaceAfterScale + marqueeOffset.x + marqueeStart.x;
-
-                    let itemYInMarqueeSpace = item.y - marqueeStart.y;
-                    let itemYInMarqueeSpaceAfterScale = Math.round(itemYInMarqueeSpace * scaleHeight);
-                    item.y = itemYInMarqueeSpaceAfterScale + marqueeOffset.y + marqueeStart.y;
-
-                    if (item.x2) {
-                        let itemX2InMarqueeSpace = item.x2 - marqueeStart.x;
-                        let itemX2InMarqueeSpaceAfterScale = Math.round(itemX2InMarqueeSpace * scaleWidth);
-                        item.x2 = itemX2InMarqueeSpaceAfterScale + marqueeOffset.x + marqueeStart.x;
-                    } else {
-                        item.width = Math.round(item.width * scaleWidth);
-                    }
-
-                    if (item.y2) {
-                        let itemY2InMarqueeSpace = item.y2 - marqueeStart.y;
-                        let itemY2InMarqueeSpaceAfterScale = Math.round(itemY2InMarqueeSpace * scaleHeight);
-                        item.y2 = itemY2InMarqueeSpaceAfterScale + marqueeOffset.y + marqueeStart.y;
-                    } else {
-                        item.height = Math.round(item.height * scaleHeight);
-                    }
-                }
-            });
-            this.mutate("configuration.items", this.layoutItems);
-        },
-        move(gridDelta) {
-            this.dragInProgress = true;
-
-            if (!this.initialPositions) {
-                this.initialPositions = {};
-                _.cloneDeep(this.selectedLayoutItems).forEach(selectedItem => {
-                    if (selectedItem.type === 'line-view') {
-                        this.initialPositions[selectedItem.id] = [selectedItem.x, selectedItem.y, selectedItem.x2, selectedItem.y2];
-                        this.startingMinX2 = this.startingMinX2 !== undefined ? Math.min(this.startingMinX2, selectedItem.x2) : selectedItem.x2;
-                        this.startingMinY2 = this.startingMinY2 !== undefined ? Math.min(this.startingMinY2, selectedItem.y2) : selectedItem.y2;
-                    } else {
-                        this.initialPositions[selectedItem.id] = [selectedItem.x, selectedItem.y];
-                    }
-
-                    this.startingMinX = this.startingMinX !== undefined ? Math.min(this.startingMinX, selectedItem.x) : selectedItem.x;
-                    this.startingMinY = this.startingMinY !== undefined ? Math.min(this.startingMinY, selectedItem.y) : selectedItem.y;
+        computed: {
+            gridSize() {
+                return this.internalDomainObject.configuration.layoutGrid;
+            },
+            layoutItems() {
+                return this.internalDomainObject.configuration.items;
+            },
+            selectedLayoutItems() {
+                return this.layoutItems.filter(item => {
+                    return this.itemIsInCurrentSelection(item);
                });
+            },
+            showMarquee() {
+                let selectionPath = this.selection[0];
+                let singleSelectedLine = this.selection.length === 1 &&
+                    selectionPath[0].context.layoutItem && selectionPath[0].context.layoutItem.type === 'line-view';
+                return selectionPath && selectionPath.length > 1 && !singleSelectedLine;
            }
-
-            this.layoutItems.forEach(item => {
-                if (this.initialPositions[item.id]) {
-                    this.updateItemPosition(item, gridDelta);
-                }
-            });
        },
-        updateItemPosition(item, gridDelta) {
-            let startingPosition = this.initialPositions[item.id];
-            let [startingX, startingY, startingX2, startingY2] = startingPosition;
-
-            if (this.startingMinX + gridDelta[0] >= 0) {
-                if (item.x2 !== undefined) {
-                    if (this.startingMinX2 + gridDelta[0] >= 0) {
-                        item.x = startingX + gridDelta[0];
+        inject: ['openmct', 'options', 'objectPath'],
+        props: ['domainObject'],
+        components: components,
+        methods: {
+            addElement(itemType, element) {
+                this.addItem(itemType + '-view', element);
+            },
+            setSelection(selection) {
+                this.selection = selection;
+            },
+            itemIsInCurrentSelection(item) {
+                return this.selection.some(selectionPath =>
+                    selectionPath[0].context.layoutItem && selectionPath[0].context.layoutItem.id === item.id);
+            },
+            bypassSelection($event) {
+                if (this.dragInProgress) {
+                    if ($event) {
+                        $event.stopImmediatePropagation();
                    }
-                } else {
-                    item.x = startingX + gridDelta[0];
+                    this.dragInProgress = false;
+                    return;
                }
-            }
+            },
+            endLineResize(item, updates) {
+                this.dragInProgress = true;
+                let index = this.layoutItems.indexOf(item);
+                Object.assign(item, updates);
+                this.mutate(`configuration.items[${index}]`, item);
+            },
+            endResize(scaleWidth, scaleHeight, marqueeStart, marqueeOffset) {
+                this.dragInProgress = true;
+                this.layoutItems.forEach(item => {
+                    if (this.itemIsInCurrentSelection(item)) {
+                        let itemXInMarqueeSpace = item.x - marqueeStart.x;
+                        let itemXInMarqueeSpaceAfterScale = Math.round(itemXInMarqueeSpace * scaleWidth);
+                        item.x = itemXInMarqueeSpaceAfterScale + marqueeOffset.x + marqueeStart.x;

-            if (this.startingMinY + gridDelta[1] >= 0) {
-                if (item.y2 !== undefined) {
-                    if (this.startingMinY2 + gridDelta[1] >= 0) {
-                        item.y = startingY + gridDelta[1];
+                        let itemYInMarqueeSpace = item.y - marqueeStart.y;
+                        let itemYInMarqueeSpaceAfterScale = Math.round(itemYInMarqueeSpace * scaleHeight);
+                        item.y = itemYInMarqueeSpaceAfterScale + marqueeOffset.y + marqueeStart.y;
+
+                        if (item.x2) {
+                            let itemX2InMarqueeSpace = item.x2 - marqueeStart.x;
+                            let itemX2InMarqueeSpaceAfterScale = Math.round(itemX2InMarqueeSpace * scaleWidth);
+                            item.x2 = itemX2InMarqueeSpaceAfterScale + marqueeOffset.x + marqueeStart.x;
+                        } else {
+                            item.width = Math.round(item.width * scaleWidth);
+                        }
+
+                        if (item.y2) {
+                            let itemY2InMarqueeSpace = item.y2 - marqueeStart.y;
+                            let itemY2InMarqueeSpaceAfterScale = Math.round(itemY2InMarqueeSpace * scaleHeight);
+                            item.y2 = itemY2InMarqueeSpaceAfterScale + marqueeOffset.y + marqueeStart.y;
+                        } else {
+                            item.height = Math.round(item.height * scaleHeight);
+                        }
                    }
-                } else {
-                    item.y = startingY + gridDelta[1];
-                }
-            }
+                });
+                this.mutate("configuration.items", this.layoutItems);
+            },
+            move(gridDelta) {
+                this.dragInProgress = true;

-            if (item.x2 !== undefined && this.startingMinX2 + gridDelta[0] >= 0 && this.startingMinX + gridDelta[0] >= 0) {
-                item.x2 = startingX2 + gridDelta[0];
-            }
+                if (!this.initialPositions) {
+                    this.initialPositions = {};
+                    _.cloneDeep(this.selectedLayoutItems).forEach(selectedItem => {
+                        if (selectedItem.type === 'line-view') {
+                            this.initialPositions[selectedItem.id] = [selectedItem.x, selectedItem.y, selectedItem.x2, selectedItem.y2];
+                            this.startingMinX2 = this.startingMinX2 !== undefined ? Math.min(this.startingMinX2, selectedItem.x2) : selectedItem.x2;
+                            this.startingMinY2 = this.startingMinY2 !== undefined ? Math.min(this.startingMinY2, selectedItem.y2) : selectedItem.y2;
+                        } else {
+                            this.initialPositions[selectedItem.id] = [selectedItem.x, selectedItem.y];
+                        }

-            if (item.y2 !== undefined && this.startingMinY2 + gridDelta[1] >= 0 && this.startingMinY + gridDelta[1] >= 0) {
-                item.y2 = startingY2 + gridDelta[1];
-            }
-        },
-        endMove() {
-            this.mutate('configuration.items', this.layoutItems);
-            this.initialPositions = undefined;
-            this.startingMinX = undefined;
-            this.startingMinY = undefined;
-            this.startingMinX2 = undefined;
-            this.startingMinY2 = undefined;
-        },
-        mutate(path, value) {
-            this.openmct.objects.mutate(this.internalDomainObject, path, value);
-        },
-        handleDrop($event) {
-            if (!$event.dataTransfer.types.includes('openmct/domain-object-path')) {
-                return;
-            }
-
-            $event.preventDefault();
-
-            let domainObject = JSON.parse($event.dataTransfer.getData('openmct/domain-object-path'))[0];
-            let elementRect = this.$el.getBoundingClientRect();
-            let droppedObjectPosition = [
-                Math.floor(($event.pageX - elementRect.left) / this.gridSize[0]),
-                Math.floor(($event.pageY - elementRect.top) / this.gridSize[1])
-            ];
-
-            if (this.isTelemetry(domainObject)) {
-                this.addItem('telemetry-view', domainObject, droppedObjectPosition);
-            } else {
-                let identifier = this.openmct.objects.makeKeyString(domainObject.identifier);
-
-                if (!this.objectViewMap[identifier]) {
-                    this.addItem('subobject-view', domainObject, droppedObjectPosition);
-                } else {
-                    let prompt = this.openmct.overlays.dialog({
-                        iconClass: 'alert',
-                        message: "This item is already in layout and will not be added again.",
-                        buttons: [
-                            {
-                                label: 'OK',
-                                callback: function () {
-                                    prompt.dismiss();
-                                }
-                            }
-                        ]
+                        this.startingMinX = this.startingMinX !== undefined ? Math.min(this.startingMinX, selectedItem.x) : selectedItem.x;
+                        this.startingMinY = this.startingMinY !== undefined ? Math.min(this.startingMinY, selectedItem.y) : selectedItem.y;
                    });
                }
-            }
-        },
-        containsObject(identifier) {
-            return _.get(this.internalDomainObject, 'composition')
-                .some(childId => this.openmct.objects.areIdsEqual(childId, identifier));
-        },
-        handleDragOver($event) {
-            // Get the ID of the dragged object
-            let draggedKeyString = $event.dataTransfer.types
-                .filter(type => type.startsWith(DRAG_OBJECT_TRANSFER_PREFIX))
-                .map(type => type.substring(DRAG_OBJECT_TRANSFER_PREFIX.length))[0];

-                // If the layout already contains the given object, then shortcut the default dragover behavior and
-                // potentially allow drop. Display layouts allow drag drop of duplicate telemetry objects.
-            if (this.containsObject(draggedKeyString)) {
+                let layoutItems = this.layoutItems.map(item => {
+                    if (this.initialPositions[item.id]) {
+                        this.updateItemPosition(item, gridDelta);
+                    }
+                    return item;
+                });
+            },
+            updateItemPosition(item, gridDelta) {
+                let startingPosition = this.initialPositions[item.id];
+                let [startingX, startingY, startingX2, startingY2] = startingPosition;
+
+                if (this.startingMinX + gridDelta[0] >= 0) {
+                    if (item.x2 !== undefined) {
+                        if (this.startingMinX2 + gridDelta[0] >= 0) {
+                            item.x = startingX + gridDelta[0];
+                        }
+                    } else {
+                        item.x = startingX + gridDelta[0];
+                    }
+                }
+
+                if (this.startingMinY + gridDelta[1] >= 0) {
+                    if (item.y2 !== undefined) {
+                        if (this.startingMinY2 + gridDelta[1] >= 0) {
+                            item.y = startingY + gridDelta[1];
+                        }
+                    } else {
+                        item.y = startingY + gridDelta[1];
+                    }
+                }
+
+                if (item.x2 !== undefined && this.startingMinX2 + gridDelta[0] >= 0 && this.startingMinX + gridDelta[0] >= 0) {
+                    item.x2 = startingX2 + gridDelta[0];
+                }
+
+                if (item.y2 !== undefined && this.startingMinY2 + gridDelta[1] >= 0 && this.startingMinY + gridDelta[1] >= 0) {
+                    item.y2 = startingY2 + gridDelta[1];
+                }
+            },
+            endMove() {
+                this.mutate('configuration.items', this.layoutItems);
+                this.initialPositions = undefined;
+                this.startingMinX = undefined;
+                this.startingMinY = undefined;
+                this.startingMinX2 = undefined;
+                this.startingMinY2 = undefined;
+            },
+            mutate(path, value) {
+                this.openmct.objects.mutate(this.internalDomainObject, path, value);
+            },
+            handleDrop($event) {
+                if (!$event.dataTransfer.types.includes('openmct/domain-object-path')) {
+                    return;
+                }
+
                $event.preventDefault();
-            }
-        },
-        isTelemetry(domainObject) {
-            if (this.openmct.telemetry.isTelemetryObject(domainObject) &&
+
+                let domainObject = JSON.parse($event.dataTransfer.getData('openmct/domain-object-path'))[0];
+                let elementRect = this.$el.getBoundingClientRect();
+                let droppedObjectPosition = [
+                    Math.floor(($event.pageX - elementRect.left) / this.gridSize[0]),
+                    Math.floor(($event.pageY - elementRect.top) / this.gridSize[1])
+                ];
+
+                if (this.isTelemetry(domainObject)) {
+                    this.addItem('telemetry-view', domainObject, droppedObjectPosition);
+                } else {
+                    let identifier = this.openmct.objects.makeKeyString(domainObject.identifier);
+
+                    if (!this.objectViewMap[identifier]) {
+                        this.addItem('subobject-view', domainObject, droppedObjectPosition);
+                    } else {
+                        let prompt = this.openmct.overlays.dialog({
+                            iconClass: 'alert',
+                            message: "This item is already in layout and will not be added again.",
+                            buttons: [
+                                {
+                                    label: 'OK',
+                                    callback: function () {
+                                        prompt.dismiss();
+                                    }
+                                }
+                            ]
+                        });
+                    }
+                }
+            },
+            containsObject(identifier) {
+                return _.get(this.internalDomainObject, 'composition')
+                    .some(childId => this.openmct.objects.areIdsEqual(childId, identifier));
+            },
+            handleDragOver($event) {
+                // Get the ID of the dragged object
+                let draggedKeyString = $event.dataTransfer.types
+                    .filter(type => type.startsWith(DRAG_OBJECT_TRANSFER_PREFIX))
+                    .map(type => type.substring(DRAG_OBJECT_TRANSFER_PREFIX.length))[0];
+                
+                // If the layout already contains the given object, then shortcut the default dragover behavior and 
+                // potentially allow drop. Display layouts allow drag drop of duplicate telemetry objects.
+                if (this.containsObject(draggedKeyString)){
+                    $event.preventDefault();
+                }
+            },
+            isTelemetry(domainObject) {
+                if (this.openmct.telemetry.isTelemetryObject(domainObject) && 
                    !this.options.showAsView.includes(domainObject.type)) {
-                return true;
-            } else {
-                return false;
-            }
-        },
-        addItem(itemType, ...options) {
-            let item = getItemDefinition(itemType, this.openmct, this.gridSize, ...options);
-            item.type = itemType;
-            item.id = uuid();
-            this.trackItem(item);
-            this.layoutItems.push(item);
-            this.openmct.objects.mutate(this.internalDomainObject, "configuration.items", this.layoutItems);
-            this.initSelectIndex = this.layoutItems.length - 1;
-        },
-        trackItem(item) {
-            if (!item.identifier) {
-                return;
-            }
-
-            let keyString = this.openmct.objects.makeKeyString(item.identifier);
-
-            if (item.type === "telemetry-view") {
-                let count = this.telemetryViewMap[keyString] || 0;
-                this.telemetryViewMap[keyString] = ++count;
-            } else if (item.type === "subobject-view") {
-                this.objectViewMap[keyString] = true;
-            }
-        },
-        removeItem(selectedItems) {
-            let indices = [];
-            this.initSelectIndex = -1;
-            selectedItems.forEach(selectedItem => {
-                indices.push(selectedItem[0].context.index);
-                this.untrackItem(selectedItem[0].context.layoutItem);
-            });
-            _.pullAt(this.layoutItems, indices);
-            this.mutate("configuration.items", this.layoutItems);
-            this.$el.click();
-        },
-        untrackItem(item) {
-            if (!item.identifier) {
-                return;
-            }
-
-            let keyString = this.openmct.objects.makeKeyString(item.identifier);
-
-            if (item.type === 'telemetry-view') {
-                let count = --this.telemetryViewMap[keyString];
-
-                if (count === 0) {
-                    delete this.telemetryViewMap[keyString];
-                    this.removeFromComposition(keyString);
-                }
-            } else if (item.type === 'subobject-view') {
-                delete this.objectViewMap[keyString];
-                this.removeFromComposition(keyString);
-            }
-        },
-        removeFromComposition(keyString) {
-            let composition = _.get(this.internalDomainObject, 'composition');
-            composition = composition.filter(identifier => {
-                return this.openmct.objects.makeKeyString(identifier) !== keyString;
-            });
-            this.mutate("composition", composition);
-        },
-        initializeItems() {
-            this.telemetryViewMap = {};
-            this.objectViewMap = {};
-            this.layoutItems.forEach(this.trackItem);
-        },
-        addChild(child) {
-            let identifier = this.openmct.objects.makeKeyString(child.identifier);
-            if (this.isTelemetry(child)) {
-                if (!this.telemetryViewMap[identifier]) {
-                    this.addItem('telemetry-view', child);
-                }
-            } else if (!this.objectViewMap[identifier]) {
-                this.addItem('subobject-view', child);
-            }
-        },
-        removeChild(identifier) {
-            let keyString = this.openmct.objects.makeKeyString(identifier);
-
-            if (this.objectViewMap[keyString]) {
-                delete this.objectViewMap[keyString];
-                this.removeFromConfiguration(keyString);
-            } else if (this.telemetryViewMap[keyString]) {
-                delete this.telemetryViewMap[keyString];
-                this.removeFromConfiguration(keyString);
-            }
-        },
-        removeFromConfiguration(keyString) {
-            let layoutItems = this.layoutItems.filter(item => {
-                if (!item.identifier) {
                    return true;
                } else {
-                    return this.openmct.objects.makeKeyString(item.identifier) !== keyString;
+                    return false;
+                }
+            },
+            addItem(itemType, ...options) {
+                let item = getItemDefinition(itemType, this.openmct, this.gridSize, ...options);
+                item.type = itemType;
+                item.id = uuid();
+                this.trackItem(item);
+                this.layoutItems.push(item);
+                this.openmct.objects.mutate(this.internalDomainObject, "configuration.items", this.layoutItems);
+                this.initSelectIndex = this.layoutItems.length - 1;
+            },
+            trackItem(item) {
+                if (!item.identifier) {
+                    return;
                }
-            });
-            this.mutate("configuration.items", layoutItems);
-            this.$el.click();
-        },
-        orderItem(position, selectedItems) {
-            let delta = ORDERS[position];
-            let indices = [];
-            let items = [];

-            Object.assign(items, this.layoutItems);
-            this.selectedLayoutItems.forEach(selectedItem => {
-                indices.push(this.layoutItems.indexOf(selectedItem));
-            });
-            indices.sort((a, b) => a - b);
+                let keyString = this.openmct.objects.makeKeyString(item.identifier);

-            if (position === 'top' || position === 'up') {
-                indices.reverse();
-            }
+                if (item.type === "telemetry-view") {
+                    let count = this.telemetryViewMap[keyString] || 0;
+                    this.telemetryViewMap[keyString] = ++count;
+                } else if (item.type === "subobject-view") {
+                    this.objectViewMap[keyString] = true;
+                }
+            },
+            removeItem(selectedItems) {
+                let indices = [];
+                this.initSelectIndex = -1;
+                selectedItems.forEach(selectedItem => {
+                    indices.push(selectedItem[0].context.index);
+                    this.untrackItem(selectedItem[0].context.layoutItem);
+                });
+                _.pullAt(this.layoutItems, indices);
+                this.mutate("configuration.items", this.layoutItems);
+                this.$el.click();
+            },
+            untrackItem(item) {
+                if (!item.identifier) {
+                    return;
+                }

-            if (position === 'top' || position === 'bottom') {
-                this.moveToTopOrBottom(position, indices, items, delta);
-            } else {
-                this.moveUpOrDown(position, indices, items, delta);
-            }
+                let keyString = this.openmct.objects.makeKeyString(item.identifier);

-            this.mutate('configuration.items', this.layoutItems);
-        },
-        moveUpOrDown(position, indices, items, delta) {
-            let previousItemIndex = -1;
-            let newIndex = -1;
+                if (item.type === 'telemetry-view') {
+                    let count = --this.telemetryViewMap[keyString];

-            indices.forEach((itemIndex, index) => {
-                let isAdjacentItemSelected = position === 'up' ?
-                    itemIndex + 1 === previousItemIndex :
-                    itemIndex - 1 === previousItemIndex;
-
-                if (index > 0 && isAdjacentItemSelected) {
-                    if (position === 'up') {
-                        newIndex -= 1;
-                    } else {
-                        newIndex += 1;
+                    if (count === 0) {
+                        delete this.telemetryViewMap[keyString];
+                        this.removeFromComposition(keyString);
                    }
-                } else {
-                    newIndex = Math.max(Math.min(itemIndex + delta, this.layoutItems.length - 1), 0);
+                } else if (item.type === 'subobject-view') {
+                    delete this.objectViewMap[keyString];
+                    this.removeFromComposition(keyString);
                }
-
-                previousItemIndex = itemIndex;
-                this.updateItemOrder(newIndex, itemIndex, items);
-            });
-        },
-        moveToTopOrBottom(position, indices, items, delta) {
-            let newIndex = -1;
-
-            indices.forEach((itemIndex, index) => {
-                if (index === 0) {
-                    newIndex = Math.max(Math.min(itemIndex + delta, this.layoutItems.length - 1), 0);
-                } else {
-                    if (position === 'top') {
-                        newIndex -= 1;
-                    } else {
-                        newIndex += 1;
+            },
+            removeFromComposition(keyString) {
+                let composition = _.get(this.internalDomainObject, 'composition');
+                composition = composition.filter(identifier => {
+                    return this.openmct.objects.makeKeyString(identifier) !== keyString;
+                });
+                this.mutate("composition", composition);
+            },
+            initializeItems() {
+                this.telemetryViewMap = {};
+                this.objectViewMap = {};
+                this.layoutItems.forEach(this.trackItem);
+            },
+            addChild(child) {
+                let identifier = this.openmct.objects.makeKeyString(child.identifier);
+                if (this.isTelemetry(child)) {
+                    if (!this.telemetryViewMap[identifier]) {
+                        this.addItem('telemetry-view', child);
                    }
+                } else if (!this.objectViewMap[identifier]) {
+                    this.addItem('subobject-view', child);
+                }
+            },
+            removeChild(identifier) {
+                let keyString = this.openmct.objects.makeKeyString(identifier);
+
+                if (this.objectViewMap[keyString]) {
+                    delete this.objectViewMap[keyString];
+                    this.removeFromConfiguration(keyString);
+                } else if (this.telemetryViewMap[keyString]) {
+                    delete this.telemetryViewMap[keyString];
+                    this.removeFromConfiguration(keyString);
+                }
+            },
+            removeFromConfiguration(keyString) {
+                let layoutItems = this.layoutItems.filter(item => {
+                    if (!item.identifier) {
+                        return true;
+                    } else {
+                        return this.openmct.objects.makeKeyString(item.identifier) !== keyString;
+                    }
+                });
+                this.mutate("configuration.items", layoutItems);
+                this.$el.click();
+            },
+            orderItem(position, selectedItems) {
+                let delta = ORDERS[position];
+                let indices = [];
+                let newIndex = -1;
+                let items = [];
+
+                Object.assign(items, this.layoutItems);
+                this.selectedLayoutItems.forEach(selectedItem => {
+                    indices.push(this.layoutItems.indexOf(selectedItem));
+                });
+                indices.sort((a, b) => a - b);
+
+                if (position === 'top' || position === 'up') {
+                    indices.reverse();
                }

-                this.updateItemOrder(newIndex, itemIndex, items);
-            });
-        },
-        updateItemOrder(newIndex, itemIndex, items) {
-            if (newIndex !== itemIndex) {
-                this.layoutItems.splice(itemIndex, 1);
-                this.layoutItems.splice(newIndex, 0, items[itemIndex]);
+                if (position === 'top' || position === 'bottom') {
+                    this.moveToTopOrBottom(position, indices, items, delta);
+                } else {
+                    this.moveUpOrDown(position, indices, items, delta);
+                }
+
+                this.mutate('configuration.items', this.layoutItems);
+            },
+            moveUpOrDown(position, indices, items, delta) {
+                let previousItemIndex = -1;
+                let newIndex = -1;
+
+                indices.forEach((itemIndex, index) => {
+                    let isAdjacentItemSelected = position === 'up' ?
+                        itemIndex + 1 === previousItemIndex :
+                        itemIndex - 1 === previousItemIndex;
+
+                    if (index > 0 && isAdjacentItemSelected) {
+                        if (position === 'up') {
+                            newIndex -= 1;
+                        } else {
+                            newIndex += 1;
+                        }
+                    } else {
+                        newIndex = Math.max(Math.min(itemIndex + delta, this.layoutItems.length - 1), 0);
+                    }
+
+                    previousItemIndex = itemIndex;
+                    this.updateItemOrder(newIndex, itemIndex, items);
+                });
+            },
+            moveToTopOrBottom(position, indices, items, delta) {
+                let newIndex = -1;
+
+                indices.forEach((itemIndex, index) => {
+                    if (index === 0) {
+                        newIndex = Math.max(Math.min(itemIndex + delta, this.layoutItems.length - 1), 0);
+                    } else {
+                        if (position === 'top') {
+                            newIndex -= 1;
+                        } else {
+                            newIndex += 1;
+                        }
+                    }
+
+                    this.updateItemOrder(newIndex, itemIndex, items);
+                });
+            },
+            updateItemOrder(newIndex, itemIndex, items) {
+                if (newIndex !== itemIndex) {
+                    this.layoutItems.splice(itemIndex, 1);
+                    this.layoutItems.splice(newIndex, 0, items[itemIndex]);
+                }
+            },
+            updateTelemetryFormat(item, format) {
+                let index = _.findIndex(this.layoutItems, item);
+                item.format = format;
+                this.mutate(`configuration.items[${index}]`, item);
            }
        },
-        updateTelemetryFormat(item, format) {
-            let index = _.findIndex(this.layoutItems, item);
-            item.format = format;
-            this.mutate(`configuration.items[${index}]`, item);
+        mounted() {
+            this.openmct.selection.on('change', this.setSelection);
+            this.initializeItems();
+            this.composition = this.openmct.composition.get(this.internalDomainObject);
+            this.composition.on('add', this.addChild);
+            this.composition.on('remove', this.removeChild);
+            this.composition.load();
+        },
+        destroyed: function () {
+            this.openmct.selection.off('change', this.setSelection);
+            this.composition.off('add', this.addChild);
+            this.composition.off('remove', this.removeChild);
        }
    }
-}
 </script>
--- a/src/plugins/displayLayout/components/EditMarquee.vue
+++ b/src/plugins/displayLayout/components/EditMarquee.vue
@@ -21,28 +21,17 @@
 *****************************************************************************/

 <template>
-<!-- Resize handles -->
-<div
-    class="c-frame-edit"
-    :style="marqueeStyle"
->
-    <div
-        class="c-frame-edit__handle c-frame-edit__handle--nw"
-        @mousedown="startResize([1,1], [-1,-1], $event)"
-    ></div>
-    <div
-        class="c-frame-edit__handle c-frame-edit__handle--ne"
-        @mousedown="startResize([0,1], [1,-1], $event)"
-    ></div>
-    <div
-        class="c-frame-edit__handle c-frame-edit__handle--sw"
-        @mousedown="startResize([1,0], [-1,1], $event)"
-    ></div>
-    <div
-        class="c-frame-edit__handle c-frame-edit__handle--se"
-        @mousedown="startResize([0,0], [1,1], $event)"
-    ></div>
-</div>
+        <!-- Resize handles -->
+        <div class="c-frame-edit" :style="style">
+            <div class="c-frame-edit__handle c-frame-edit__handle--nw"
+                 @mousedown="startResize([1,1], [-1,-1], $event)"></div>
+            <div class="c-frame-edit__handle c-frame-edit__handle--ne"
+                 @mousedown="startResize([0,1], [1,-1], $event)"></div>
+            <div class="c-frame-edit__handle c-frame-edit__handle--sw"
+                 @mousedown="startResize([1,0], [-1,1], $event)"></div>
+            <div class="c-frame-edit__handle c-frame-edit__handle--se"
+                 @mousedown="startResize([0,0], [1,1], $event)"></div>
+        </div>
 </template>

 <style lang="scss">
@@ -106,146 +95,139 @@


 <script>
-import LayoutDrag from './../LayoutDrag'
-
-export default {
-    inject: ['openmct'],
-    props: {
-        selectedLayoutItems: {
-            type: Array,
-            default: undefined
-        },
-        gridSize: {
-            type: Array,
-            required: true,
-            validator: (arr) => arr && arr.length === 2
-                && arr.every(el => typeof el === 'number')
-        }
-    },
-    data() {
-        return {
-            dragPosition: undefined
-        }
-    },
-    computed: {
-        marqueePosition() {
-            let x = Number.POSITIVE_INFINITY;
-            let y = Number.POSITIVE_INFINITY;
-            let width = Number.NEGATIVE_INFINITY;
-            let height = Number.NEGATIVE_INFINITY;
-
-            this.selectedLayoutItems.forEach(item => {
-                if (item.x2 !== undefined) {
-                    let lineWidth = Math.abs(item.x - item.x2);
-                    let lineMinX = Math.min(item.x, item.x2);
-                    x = Math.min(lineMinX, x);
-                    width = Math.max(lineWidth + lineMinX, width);
-                } else {
-                    x = Math.min(item.x, x);
-                    width = Math.max(item.width + item.x, width);
-                }
-
-                if (item.y2 !== undefined) {
-                    let lineHeight = Math.abs(item.y - item.y2);
-                    let lineMinY = Math.min(item.y, item.y2);
-                    y = Math.min(lineMinY, y);
-                    height = Math.max(lineHeight + lineMinY, height);
-                } else {
-                    y = Math.min(item.y, y);
-                    height = Math.max(item.height + item.y, height);
-                }
-            });
-
-            if (this.dragPosition) {
-                [x, y] = this.dragPosition.position;
-                [width, height] = this.dragPosition.dimensions;
-            } else {
-                width = width - x;
-                height = height - y;
-            }
+    import LayoutDrag from './../LayoutDrag'

+    export default {
+        inject: ['openmct'],
+        props: {
+            selectedLayoutItems: Array,
+            gridSize: Array
+        },        
+        data() {
            return {
-                x: x,
-                y: y,
-                width: width,
-                height: height
+                dragPosition: undefined
            }
        },
-        marqueeStyle() {
-            return {
-                left: (this.gridSize[0] * this.marqueePosition.x) + 'px',
-                top: (this.gridSize[1] * this.marqueePosition.y) + 'px',
-                width: (this.gridSize[0] * this.marqueePosition.width) + 'px',
-                height: (this.gridSize[1] * this.marqueePosition.height) + 'px'
-            };
-        }
-    },
-    methods: {
-        updatePosition(event) {
-            let currentPosition = [event.pageX, event.pageY];
-            this.initialPosition = this.initialPosition || currentPosition;
-            this.delta = currentPosition.map(function (value, index) {
-                return value - this.initialPosition[index];
-            }.bind(this));
+        computed: {
+            style() {
+                let x = Number.POSITIVE_INFINITY;
+                let y = Number.POSITIVE_INFINITY;
+                let width = Number.NEGATIVE_INFINITY;
+                let height = Number.NEGATIVE_INFINITY;
+
+                this.selectedLayoutItems.forEach(item => {
+                    if (item.x2 !== undefined) {
+                        let lineWidth = Math.abs(item.x - item.x2);
+                        let lineMinX = Math.min(item.x, item.x2);
+                        x = Math.min(lineMinX, x);
+                        width = Math.max(lineWidth + lineMinX, width);
+                    } else {
+                        x = Math.min(item.x, x);
+                        width = Math.max(item.width + item.x, width);
+                    }
+
+                    if (item.y2 !== undefined) {
+                        let lineHeight = Math.abs(item.y - item.y2);
+                        let lineMinY = Math.min(item.y, item.y2);
+                        y = Math.min(lineMinY, y);
+                        height = Math.max(lineHeight + lineMinY, height);
+                    } else {
+                        y = Math.min(item.y, y);
+                        height = Math.max(item.height + item.y, height);
+                    }
+                });
+
+                if (this.dragPosition) {
+                    [x, y] = this.dragPosition.position;
+                    [width, height] = this.dragPosition.dimensions;
+                } else {
+                    width = width - x;
+                    height = height - y;
+                }
+
+                this.marqueePosition = {
+                    x: x,
+                    y: y,
+                    width: width,
+                    height: height
+                }
+                return this.getMarqueeStyle(x, y, width, height);
+            }
        },
-        startResize(posFactor, dimFactor, event) {
-            document.body.addEventListener('mousemove', this.continueResize);
-            document.body.addEventListener('mouseup', this.endResize);
-            this.marqueeStartPosition = {
-                position: [this.marqueePosition.x, this.marqueePosition.y],
-                dimensions: [this.marqueePosition.width, this.marqueePosition.height]
-            };
-            this.updatePosition(event);
-            this.activeDrag = new LayoutDrag(this.marqueeStartPosition, posFactor, dimFactor, this.gridSize);
-            event.preventDefault();
-        },
-        continueResize(event) {
-            event.preventDefault();
-            this.updatePosition(event);
-            this.dragPosition = this.activeDrag.getAdjustedPositionAndDimensions(this.delta);
-        },
-        endResize(event) {
-            document.body.removeEventListener('mousemove', this.continueResize);
-            document.body.removeEventListener('mouseup', this.endResize);
-            this.continueResize(event);
+        methods: {
+            getMarqueeStyle(x, y, width, height) {
+                return {
+                    left: (this.gridSize[0] * x) + 'px',
+                    top: (this.gridSize[1] * y) + 'px',
+                    width: (this.gridSize[0] * width) + 'px',
+                    height: (this.gridSize[1] * height) + 'px'
+                };
+            },
+            updatePosition(event) {
+                let currentPosition = [event.pageX, event.pageY];
+                this.initialPosition = this.initialPosition || currentPosition;
+                this.delta = currentPosition.map(function (value, index) {
+                    return value - this.initialPosition[index];
+                }.bind(this));
+            },
+            startResize(posFactor, dimFactor, event) {
+                document.body.addEventListener('mousemove', this.continueResize);
+                document.body.addEventListener('mouseup', this.endResize);
+                this.marqueeStartPosition = {
+                    position: [this.marqueePosition.x, this.marqueePosition.y],
+                    dimensions: [this.marqueePosition.width, this.marqueePosition.height]
+                };
+                this.updatePosition(event);
+                this.activeDrag = new LayoutDrag(this.marqueeStartPosition, posFactor, dimFactor, this.gridSize);
+                event.preventDefault();
+            },
+            continueResize(event) {
+                event.preventDefault();
+                this.updatePosition(event);
+                this.dragPosition = this.activeDrag.getAdjustedPositionAndDimensions(this.delta);
+            },
+            endResize(event) {
+                document.body.removeEventListener('mousemove', this.continueResize);
+                document.body.removeEventListener('mouseup', this.endResize);
+                this.continueResize(event);

-            let marqueeStartWidth = this.marqueeStartPosition.dimensions[0];
-            let marqueeStartHeight = this.marqueeStartPosition.dimensions[1];
-            let marqueeStartX = this.marqueeStartPosition.position[0];
-            let marqueeStartY = this.marqueeStartPosition.position[1];
+                let marqueeStartWidth = this.marqueeStartPosition.dimensions[0];
+                let marqueeStartHeight = this.marqueeStartPosition.dimensions[1];
+                let marqueeStartX = this.marqueeStartPosition.position[0];
+                let marqueeStartY = this.marqueeStartPosition.position[1];

-            let marqueeEndX = this.dragPosition.position[0];
-            let marqueeEndY = this.dragPosition.position[1];
-            let marqueeEndWidth = this.dragPosition.dimensions[0];
-            let marqueeEndHeight = this.dragPosition.dimensions[1];
+                let marqueeEndX = this.dragPosition.position[0];
+                let marqueeEndY = this.dragPosition.position[1];
+                let marqueeEndWidth = this.dragPosition.dimensions[0];
+                let marqueeEndHeight = this.dragPosition.dimensions[1];

-            let scaleWidth =  marqueeEndWidth / marqueeStartWidth;
-            let scaleHeight =  marqueeEndHeight / marqueeStartHeight;
+                let scaleWidth =  marqueeEndWidth / marqueeStartWidth;
+                let scaleHeight =  marqueeEndHeight / marqueeStartHeight;

-            let marqueeStart = {
-                x: marqueeStartX,
-                y: marqueeStartY,
-                height: marqueeStartWidth,
-                width: marqueeStartHeight
-            };
-            let marqueeEnd = {
-                x: marqueeEndX,
-                y: marqueeEndY,
-                width: marqueeEndWidth,
-                height: marqueeEndHeight
-            };
-            let marqueeOffset = {
-                x: marqueeEnd.x - marqueeStart.x,
-                y: marqueeEnd.y - marqueeStart.y
-            };
+                let marqueeStart = {
+                    x: marqueeStartX,
+                    y: marqueeStartY,
+                    height: marqueeStartWidth,
+                    width: marqueeStartHeight
+                };
+                let marqueeEnd = {
+                    x: marqueeEndX,
+                    y: marqueeEndY,
+                    width: marqueeEndWidth,
+                    height: marqueeEndHeight
+                };
+                let marqueeOffset = {
+                    x: marqueeEnd.x - marqueeStart.x,
+                    y: marqueeEnd.y - marqueeStart.y
+                };

-            this.$emit('endResize', scaleWidth, scaleHeight, marqueeStart, marqueeOffset);
-            this.dragPosition = undefined;
-            this.initialPosition = undefined;
-            this.marqueeStartPosition = undefined;
-            this.delta = undefined;
-            event.preventDefault();
+                this.$emit('endResize', scaleWidth, scaleHeight, marqueeStart, marqueeOffset);
+                this.dragPosition = undefined;
+                this.initialPosition = undefined;
+                this.marqueeStartPosition = undefined;
+                this.delta = undefined;
+                event.preventDefault();
+            }
        }
    }
-}
 </script>
--- a/src/plugins/displayLayout/components/ImageView.vue
+++ b/src/plugins/displayLayout/components/ImageView.vue
@@ -21,18 +21,15 @@
 *****************************************************************************/

 <template>
-<layout-frame
-    :item="item"
-    :grid-size="gridSize"
-    @move="(gridDelta) => $emit('move', gridDelta)"
-    @endMove="() => $emit('endMove')"
->
-    <div
-        class="c-image-view"
-        :style="style"
-    ></div>
-</layout-frame>
-</template>
+    <layout-frame :item="item"
+                  :grid-size="gridSize"
+                  @move="(gridDelta) => $emit('move', gridDelta)"
+                  @endMove="() => $emit('endMove')">
+        <div class="c-image-view"
+             :style="style">
+        </div>
+    </layout-frame>
+ </template>

 <style lang="scss">
    @import '~styles/sass-base';
@@ -49,70 +46,59 @@
    }
 </style>

-<script>
-import LayoutFrame from './LayoutFrame.vue'
+ <script>
+    import LayoutFrame from './LayoutFrame.vue'

-export default {
-    makeDefinition(openmct, gridSize, element) {
-        return {
-            stroke: 'transparent',
-            x: 1,
-            y: 1,
-            width: 10,
-            height: 5,
-            url: element.url
-        };
-    },
-    inject: ['openmct'],
-    components: {
-        LayoutFrame
-    },
-    props: {
-        item: {
-            type: Object,
-            required: true
-        },
-        gridSize: {
-            type: Array,
-            required: true,
-            validator: (arr) => arr && arr.length === 2
-                && arr.every(el => typeof el === 'number')
-        },
-        index: {
-            type: Number,
-            required: true
-        },
-        initSelect: Boolean
-    },
-    computed: {
-        style() {
+    export default {
+        makeDefinition(openmct, gridSize, element) {
            return {
-                backgroundImage: 'url(' + this.item.url + ')',
-                border: '1px solid ' + this.item.stroke
-            }
-        }
-    },
-    watch: {
-        index(newIndex) {
-            if (!this.context) {
-                return;
+                stroke: 'transparent',
+                x: 1,
+                y: 1,
+                width: 10,
+                height: 5,
+                url: element.url
+            };
+        },
+        inject: ['openmct'],
+        props: {
+            item: Object,
+            gridSize: Array,
+            index: Number,
+            initSelect: Boolean
+        },
+        components: {
+            LayoutFrame
+        },
+        computed: {
+            style() {
+                return {
+                    backgroundImage: 'url(' + this.item.url + ')',
+                    border: '1px solid ' + this.item.stroke
+                }
            }
+        },
+        watch: {
+            index(newIndex) {
+                if (!this.context) {
+                    return;
+                }

-            this.context.index = newIndex;
-        }
-    },
-    mounted() {
-        this.context = {
-            layoutItem: this.item,
-            index: this.index
-        };
-        this.removeSelectable = this.openmct.selection.selectable(
-            this.$el, this.context, this.initSelect);
-    },
-    destroyed() {
-        if (this.removeSelectable) {
-            this.removeSelectable();
+                this.context.index = newIndex;
+            }
+        },
+        mounted() {
+            this.context = {
+                layoutItem: this.item,
+                index: this.index
+            };
+            this.removeSelectable = this.openmct.selection.selectable(
+                this.$el, this.context, this.initSelect);
+        },
+        destroyed() {
+            if (this.removeSelectable) {
+                this.removeSelectable();
+            }
        }
    }
-}
-</script>
+ </script>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrew Henry	f8884cef62	Removing star listeners	2019-11-27 14:38:01 -08:00
Andrew Henry	3262b810b3	More bug fixes	2019-11-25 11:59:39 -08:00
Andrew Henry	790a929d66	Change instances of openmct.objects.get to openmct.objects.getAsMutable	2019-11-25 11:41:35 -08:00
Andrew Henry	2920e58b07	Fixing bugs	2019-11-25 11:25:11 -08:00
Andrew Henry	1613975048	Fixing more bugs	2019-11-11 14:13:36 -08:00
Andrew Henry	dae58e0ad9	Fix issue that was deleting Vue reactive propertiees whenever objects were mutated	2019-11-11 13:43:37 -08:00
Andrew Henry	a5826f5d45	Merged from TCR + fixed error in filters view that prevented composition changes	2019-11-11 11:33:22 -08:00
Andrew Henry	4480956bab	Clear listeners in selection	2019-10-04 15:53:49 -07:00
Andrew Henry	dd4d55b422	WIP	2019-06-19 11:07:41 -07:00
Andrew Henry	705ec5b753	WIP	2019-06-10 08:44:00 -07:00
Andrew Henry	48177082f1	Hide mutable object properties	2019-06-07 16:38:36 -07:00
Andrew Henry	4c65062ce9	Implemented object sync in tree	2019-05-24 08:57:14 -07:00
Andrew Henry	c4d9b1cf41	Rolled out new mutation API to table configuration	2019-05-23 09:28:47 -07:00
Andrew Henry	56dbbd894a	Updates to platform	2019-05-23 09:28:22 -07:00
Andrew Henry	f3d14be034	Updates to API, deleted old API	2019-05-23 09:28:04 -07:00
Andrew Henry	018f3e7749	First pass at API changes	2019-05-22 15:36:21 -07:00