Filter indicators styling

- Reverting mistakenly changed file;
2019-06-25 16:07:34 -07:00 · 2019-06-25 16:04:14 -07:00 · 2019-06-25 16:02:38 -07:00 · 2019-06-24 16:06:36 -07:00 · 2019-06-21 16:05:49 -07:00 · 2019-06-20 15:59:38 -07:00
340 changed files with 16552 additions and 13291 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/res/dialog-launch.html
+++ b/example/notifications/res/dialog-launch.html
@@ -1,9 +1,9 @@
 <span class="h-indicator" ng-controller="DialogLaunchController">
    <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <div class="c-indicator c-indicator--clickable icon-box-with-arrow s-status-available"><span class="label c-indicator__label">
-        <button ng-click="launchProgress(true)">Known</button>
-        <button ng-click="launchProgress(false)">Unknown</button>
-        <button ng-click="launchError()">Error</button>
-        <button ng-click="launchInfo()">Info</button>
+    <div class="ls-indicator icon-box-with-arrow s-status-available"><span class="label">
+        <a ng-click="launchProgress(true)">Known</a>
+        <a ng-click="launchProgress(false)">Unknown</a>
+        <a ng-click="launchError()">Error</a>
+        <a ng-click="launchInfo()">Info</a>
    </span></div>
 </span>
--- a/example/notifications/res/notification-launch.html
+++ b/example/notifications/res/notification-launch.html
@@ -1,9 +1,9 @@
 <span class="h-indicator" ng-controller="NotificationLaunchController">
    <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <div class="c-indicator c-indicator--clickable icon-bell s-status-available"><span class="label c-indicator__label">
-        <button ng-click="newInfo()">Success</button>
-        <button ng-click="newError()">Error</button>
-        <button ng-click="newAlert()">Alert</button>
-        <button ng-click="newProgress()">Progress</button>
+    <div class="ls-indicator icon-bell s-status-available"><span class="label">
+        <a ng-click="newInfo()">Success</a>
+        <a ng-click="newError()">Error</a>
+        <a ng-click="newAlert()">Alert</a>
+        <a ng-click="newProgress()">Progress</a>
    </span></div>
 </span>
--- 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/index.html
+++ b/index.html
@@ -27,9 +27,11 @@
        <meta name="apple-mobile-web-app-capable" content="yes">
        <title></title>
        <script src="dist/openmct.js"></script>
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96" type="image/x-icon">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32" type="image/x-icon">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16" type="image/x-icon">
+        <link rel="stylesheet" href="dist/styles/openmct.css">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16">
+        <link rel="shortcut icon" href="dist/favicons/favicon.ico">
    </head>
    <body>
    </body>
@@ -48,6 +50,7 @@
        openmct.install(openmct.plugins.Generator());
        openmct.install(openmct.plugins.ExampleImagery());
        openmct.install(openmct.plugins.UTCTimeSystem());
+        openmct.install(openmct.plugins.ImportExport());
        openmct.install(openmct.plugins.AutoflowView({
            type: "telemetry.panel"
        }));
@@ -77,10 +80,13 @@
        }));
        openmct.install(openmct.plugins.SummaryWidget());
        openmct.install(openmct.plugins.Notebook());
+        openmct.install(openmct.plugins.FolderView());
+        openmct.install(openmct.plugins.Tabs());
+        openmct.install(openmct.plugins.FlexibleLayout());
        openmct.install(openmct.plugins.LADTable());
        openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay']));
        openmct.install(openmct.plugins.ObjectMigration());
-        openmct.install(openmct.plugins.ClearData(['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked']));
+        openmct.install(openmct.plugins.GoToOriginalAction());
        openmct.start();
    </script>
 </html>
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -23,9 +23,9 @@
 /*global module,process*/

 const devMode = process.env.NODE_ENV !== 'production';
-const browsers = [process.env.NODE_ENV === 'debug' ? 'ChromeDebugging' : 'ChromeHeadless'];

 module.exports = (config) => {
+
    const webpackConfig = require('./webpack.config.js');
    delete webpackConfig.output;

@@ -50,17 +50,11 @@ module.exports = (config) => {
            'coverage',
            'html'
        ],
-        browsers: browsers,
-        customLaunchers: {
-            ChromeDebugging: {
-                base: 'Chrome',
-                flags: ['--remote-debugging-port=9222'],
-                debug: true
-            }
-        },
+        browsers: ['ChromeHeadless'],
        colors: true,
        logLevel: config.LOG_INFO,
        autoWatch: true,
+
        coverageReporter: {
            dir: process.env.CIRCLE_ARTIFACTS ?
                process.env.CIRCLE_ARTIFACTS + '/coverage' :
@@ -72,18 +66,22 @@ module.exports = (config) => {
                }
            }
        },
+
        // HTML test reporting.
        htmlReporter: {
            outputDir: "dist/reports/tests",
            preserveDescribeNesting: true,
            foldAll: false
        },
+
        preprocessors: {
            // add webpack as preprocessor
-            'platform/**/*Spec.js': [ 'webpack', 'sourcemap' ],
-            'src/**/*Spec.js': [ 'webpack', 'sourcemap' ]
+            'platform/**/*Spec.js': [ 'webpack' ],
+            'src/**/*Spec.js': [ 'webpack' ]
        },
+
        webpack: webpackConfig,
+
        webpackMiddleware: {
            stats: 'errors-only',
            logLevel: 'warn'
@@ -91,3 +89,4 @@ module.exports = (config) => {
        singleRun: true
    });
 }
+
--- a/openmct.js
+++ b/openmct.js
@@ -19,7 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global module*/
+/*global module,BUILD_CONSTANTS*/

 const matcher = /\/openmct.js$/;
 if (document.currentScript) {
--- a/package.json
+++ b/package.json
@@ -1,10 +1,9 @@
 {
  "name": "openmct",
-  "version": "1.0.0-beta",
+  "version": "0.14.0-SNAPSHOT",
  "description": "The Open MCT core platform",
  "dependencies": {},
  "devDependencies": {
-    "acorn": "6.2.0",
    "angular": "1.4.14",
    "angular-route": "1.4.14",
    "babel-eslint": "8.2.6",
@@ -12,7 +11,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 +22,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",
@@ -45,7 +42,6 @@
    "karma-coverage": "^1.1.2",
    "karma-html-reporter": "^0.2.7",
    "karma-jasmine": "^1.1.2",
-    "karma-sourcemap-loader": "^0.3.7",
    "karma-webpack": "^3.0.0",
    "location-bar": "^3.0.1",
    "lodash": "^3.10.1",
@@ -76,13 +72,12 @@
  },
  "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: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
@@ -21,6 +21,12 @@
 *****************************************************************************/

 define([
+    "./src/BrowseController",
+    "./src/PaneController",
+    "./src/InspectorPaneController",
+    "./src/BrowseObjectController",
+    "./src/MenuArrowController",
+    "./src/ObjectHeaderController",
    "./src/navigation/NavigationService",
    "./src/navigation/NavigateAction",
    "./src/navigation/OrphanNavigationHandler",
@@ -32,8 +38,15 @@ define([
    "./res/templates/menu-arrow.html",
    "./res/templates/back-arrow.html",
    "./res/templates/browse/object-properties.html",
-    "./res/templates/browse/inspector-region.html"
+    "./res/templates/browse/inspector-region.html",
+    'legacyRegistry'
 ], function (
+    BrowseController,
+    PaneController,
+    InspectorPaneController,
+    BrowseObjectController,
+    MenuArrowController,
+    ObjectHeaderController,
    NavigationService,
    NavigateAction,
    OrphanNavigationHandler,
@@ -45,133 +58,195 @@ 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"
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "BrowseController",
+                    "implementation": BrowseController,
+                    "depends": [
+                        "$scope",
+                        "$route",
+                        "$location",
+                        "objectService",
+                        "navigationService",
+                        "urlService",
+                        "DEFAULT_PATH"
+                    ]
+                },
+                {
+                    "key": "PaneController",
+                    "implementation": PaneController,
+                    "priority": "preferred",
+                    "depends": [
+                        "$scope",
+                        "agentService",
+                        "$window",
+                        "$location",
+                        "$attrs",
+                        "navigationService"
+                    ]
+                },
+                {
+                    "key": "BrowseObjectController",
+                    "implementation": BrowseObjectController,
+                    "depends": [
+                        "$scope",
+                        "$location",
+                        "$route"
+                    ]
+                },
+                {
+                    "key": "MenuArrowController",
+                    "implementation": MenuArrowController,
+                    "depends": [
+                        "$scope"
+                    ]
+                },
+                {
+                    "key": "InspectorPaneController",
+                    "implementation": InspectorPaneController,
+                    "priority": "preferred",
+                    "depends": [
+                        "$scope",
+                        "agentService",
+                        "$window",
+                        "navigationService",
+                        "$location",
+                        "$attrs"
+                    ]
+                },
+                {
+                    "key": "ObjectHeaderController",
+                    "implementation": ObjectHeaderController,
+                    "depends": [
+                        "$scope"
+                    ]
+                }
+            ],
+            "representations": [
+                {
+                    "key": "browse-object",
+                    "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/browse/src/BrowseController.js
+++ b/platform/commonUI/browse/src/BrowseController.js
@@ -0,0 +1,215 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * This bundle implements Browse mode.
+ * @namespace platform/commonUI/browse
+ */
+define(
+    ['lodash'],
+    function (_) {
+
+        /**
+         * The BrowseController is used to populate the initial scope in Browse
+         * mode. It loads the root object from the objectService and makes it
+         * available in the scope for Angular template's; this is the point at
+         * which Angular templates first have access to the domain object
+         * hierarchy.
+         *
+         * @memberof platform/commonUI/browse
+         * @constructor
+         */
+        function BrowseController(
+            $scope,
+            $route,
+            $location,
+            objectService,
+            navigationService,
+            urlService,
+            defaultPath
+        ) {
+            window.browseScope = $scope;
+            var initialPath = ($route.current.params.ids || defaultPath).split("/"),
+                currentIds;
+
+            $scope.treeModel = {
+                selectedObject: undefined,
+                onSelection: function (object) {
+                    navigationService.setNavigation(object, true);
+                },
+                allowSelection: function (object) {
+                    var domainObjectInView = navigationService.getNavigation(),
+                        isInEditMode = domainObjectInView.getCapability('status').get('editing');
+
+                    if (isInEditMode) {
+
+                        var actions = object.getCapability('action'),
+                            previewAction = actions.getActions({key: 'mct-preview-action'})[0];
+
+                        if (previewAction && previewAction.perform) {
+                            previewAction.perform();
+                            return false;
+                        } else {
+                            return navigationService.shouldNavigate();
+                        }
+
+                    } else {
+                        return true;
+                    }
+                }
+            };
+
+            function idsForObject(domainObject) {
+                return urlService
+                    .urlForLocation("", domainObject)
+                    .replace('/', '');
+            }
+
+            // Find an object in an array of objects.
+            function findObject(domainObjects, id) {
+                var i;
+                for (i = 0; i < domainObjects.length; i += 1) {
+                    if (domainObjects[i].getId() === id) {
+                        return domainObjects[i];
+                    }
+                }
+            }
+
+            // helper, fetch a single object from the object service.
+            function getObject(id) {
+                return objectService.getObjects([id])
+                    .then(function (results) {
+                        return results[id];
+                    });
+            }
+
+            // recursively locate and return an object inside of a container
+            // via a path.  If at any point in the recursion it fails to find
+            // the next object, it will return the parent.
+            function findViaComposition(containerObject, path) {
+                var nextId = path.shift();
+                if (!nextId) {
+                    return containerObject;
+                }
+                return containerObject.useCapability('composition')
+                    .then(function (composees) {
+                        var nextObject = findObject(composees, nextId);
+                        if (!nextObject) {
+                            return containerObject;
+                        }
+                        if (!nextObject.hasCapability('composition')) {
+                            return nextObject;
+                        }
+                        return findViaComposition(nextObject, path);
+                    });
+            }
+
+            function navigateToObject(desiredObject) {
+                $scope.navigatedObject = desiredObject;
+                $scope.treeModel.selectedObject = desiredObject;
+                currentIds = idsForObject(desiredObject);
+                $route.current.pathParams.ids = currentIds;
+                $location.path('/browse/' + currentIds);
+            }
+
+            function getLastChildIfRoot(object) {
+                if (object.getId() !== 'ROOT') {
+                    return object;
+                }
+                return object.useCapability('composition')
+                    .then(function (composees) {
+                        return composees[composees.length - 1];
+                    });
+            }
+
+            function navigateToPath(path) {
+                return getObject('ROOT')
+                    .then(function (root) {
+                        return findViaComposition(root, path);
+                    })
+                    .then(getLastChildIfRoot)
+                    .then(function (object) {
+                        navigationService.setNavigation(object);
+                    });
+            }
+
+            getObject('ROOT')
+                .then(function (root) {
+                    $scope.domainObject = root;
+                    navigateToPath(initialPath);
+                });
+
+            // Handle navigation events from view service.  Only navigates
+            // if path has changed.
+            function navigateDirectlyToModel(domainObject) {
+                var newIds = idsForObject(domainObject);
+                if (currentIds !== newIds) {
+                    currentIds = newIds;
+                    navigateToObject(domainObject);
+                }
+            }
+
+            // Listen for changes in navigation state.
+            navigationService.addListener(navigateDirectlyToModel);
+
+            // Listen for route changes which are caused by browser events
+            // (e.g. bookmarks to pages in OpenMCT) and prevent them.  Instead,
+            // navigate to the path ourselves, which results in it being
+            // properly set.
+            $scope.$on('$routeChangeStart', function (event, route, oldRoute) {
+                if (route.$$route === $route.current.$$route) {
+                    if (route.pathParams.ids &&
+                        route.pathParams.ids !== $route.current.pathParams.ids) {
+
+                        var otherParams = _.omit(route.params, 'ids');
+                        var oldOtherParams = _.omit(oldRoute.params, 'ids');
+                        var deletedParams = _.omit(oldOtherParams, _.keys(otherParams));
+
+                        event.preventDefault();
+
+                        navigateToPath(route.pathParams.ids.split('/'))
+                            .then(function () {
+                                if (!_.isEqual(otherParams, oldOtherParams)) {
+                                    _.forEach(otherParams, function (v, k) {
+                                        $location.search(k, v);
+                                    });
+                                    _.forEach(deletedParams, function (k) {
+                                        $location.search(k, null);
+                                    });
+                                }
+                            });
+                    } else {
+                        navigateToPath([]);
+                    }
+                }
+            });
+
+            // Clean up when the scope is destroyed
+            $scope.$on("$destroy", function () {
+                navigationService.removeListener(navigateDirectlyToModel);
+            });
+        }
+
+        return BrowseController;
+    }
+);
+
--- a/platform/commonUI/browse/src/BrowseObjectController.js
+++ b/platform/commonUI/browse/src/BrowseObjectController.js
@@ -0,0 +1,72 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    [],
+    function () {
+
+        /**
+         * Controller for the `browse-object` representation of a domain
+         * object (the right-hand side of Browse mode.)
+         * @memberof platform/commonUI/browse
+         * @constructor
+         */
+        function BrowseObjectController($scope, $location, $route) {
+            function setViewForDomainObject(domainObject) {
+
+                var locationViewKey = $location.search().view;
+
+                function selectViewIfMatching(view) {
+                    if (view.key === locationViewKey) {
+                        $scope.representation = $scope.representation || {};
+                        $scope.representation.selected = view;
+                    }
+                }
+
+                if (locationViewKey) {
+                    ((domainObject && domainObject.useCapability('view')) || [])
+                        .forEach(selectViewIfMatching);
+                }
+            }
+
+            function updateQueryParam(viewKey) {
+                if (viewKey && $location.search().view !== viewKey) {
+                    $location.search('view', viewKey);
+                }
+            }
+
+            $scope.$watch('domainObject', setViewForDomainObject);
+            $scope.$watch('representation.selected.key', updateQueryParam);
+            $scope.$on('$locationChangeSuccess', function () {
+                setViewForDomainObject($scope.domainObject);
+            });
+
+            $scope.doAction = function (action) {
+                return $scope[action] && $scope[action]();
+            };
+
+        }
+
+        return BrowseObjectController;
+    }
+);
+
--- a/platform/commonUI/browse/src/InspectorPaneController.js
+++ b/platform/commonUI/browse/src/InspectorPaneController.js
@@ -0,0 +1,78 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT Web includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+
+define(
+    ["./PaneController"],
+    function (PaneController) {
+
+        /**
+         * Pane controller that reveals inspector, if hidden, when object
+         * switches to edit mode.
+         *
+         * @param $scope
+         * @param agentService
+         * @param $window
+         * @param navigationService
+         * @constructor
+         */
+        function InspectorPaneController($scope, agentService, $window, navigationService, $location, $attrs) {
+            PaneController.call(this, $scope, agentService, $window, $location, $attrs);
+            var statusListener,
+                self = this;
+
+            function showInspector(statuses) {
+                if (statuses.indexOf('editing') !== -1 && !self.visible()) {
+                    self.toggle();
+                }
+            }
+
+            function attachStatusListener(domainObject) {
+                // Remove existing status listener if existing
+                if (statusListener) {
+                    statusListener();
+                }
+
+                if (domainObject.hasCapability("status")) {
+                    statusListener = domainObject.getCapability("status").listen(showInspector);
+                }
+                return statusListener;
+            }
+
+            var domainObject = navigationService.getNavigation();
+            if (domainObject) {
+                attachStatusListener(domainObject);
+            }
+
+            navigationService.addListener(attachStatusListener);
+
+            $scope.$on("$destroy", function () {
+                statusListener();
+                navigationService.removeListener(attachStatusListener);
+            });
+        }
+
+        InspectorPaneController.prototype = Object.create(PaneController.prototype);
+
+        return InspectorPaneController;
+    }
+);
--- a/platform/commonUI/browse/src/MenuArrowController.js
+++ b/platform/commonUI/browse/src/MenuArrowController.js
@@ -20,21 +20,40 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-export default class ClearDataAction {
-    constructor(openmct, appliesToObjects) {
-        this.name = 'Clear Data for Object';
-        this.description = 'Clears current data for object, unsubscribes and resubscribes to data';
-        this.cssClass = 'icon-clear-data';
+/**
+ * Module defining MenuArrowController. Created by shale on 06/30/2015.
+ */
+define(
+    [],
+    function () {

-        this._openmct = openmct;
-        this._appliesToObjects = appliesToObjects;
-    }
-    invoke(objectPath) {
-        this._openmct.objectViews.emit('clearData', objectPath[0]);
-    }
-    appliesTo(objectPath) {
-        let contextualDomainObject = objectPath[0];
+        /**
+         * A left-click on the menu arrow should display a
+         * context menu. This controller launches the context
+         * menu.
+         * @memberof platform/commonUI/browse
+         * @constructor
+         */
+        function MenuArrowController($scope) {
+            this.$scope = $scope;
+        }

-        return this._appliesToObjects.filter(type => contextualDomainObject.type === type).length;
+        /**
+         * Show a context menu for the domain object in this scope.
+         *
+         * @param event the browser event which caused this (used to
+         *        position the menu)
+         */
+        MenuArrowController.prototype.showMenu = function (event) {
+            var actionContext = {
+                key: 'menu',
+                domainObject: this.$scope.domainObject,
+                event: event
+            };
+
+            this.$scope.domainObject.getCapability('action').perform(actionContext);
+        };
+
+        return MenuArrowController;
    }
-}
+);
--- a/platform/commonUI/browse/src/ObjectHeaderController.js
+++ b/platform/commonUI/browse/src/ObjectHeaderController.js
@@ -0,0 +1,92 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    [],
+    function () {
+
+        /**
+         * Controller to provide the ability to inline edit an object name.
+         *
+         * @constructor
+         * @memberof platform/commonUI/browse
+         */
+        function ObjectHeaderController($scope) {
+            this.$scope = $scope;
+            this.domainObject = $scope.domainObject;
+            this.editable = this.allowEdit();
+        }
+
+        /**
+         * Updates the object name on blur and enter keypress events.
+         *
+         * @param event the mouse event
+         */
+        ObjectHeaderController.prototype.updateName = function (event) {
+            if (!event || !event.currentTarget) {
+                return;
+            }
+
+            if (event.type === 'blur') {
+                this.updateModel(event);
+            } else if (event.which === 13) {
+                this.updateModel(event);
+                event.currentTarget.blur();
+                window.getSelection().removeAllRanges();
+            }
+        };
+
+        /**
+         * Updates the model.
+         *
+         * @param event the mouse event
+         * @param private
+         */
+        ObjectHeaderController.prototype.updateModel = function (event) {
+            var name = event.currentTarget.textContent.replace(/\n/g, ' ');
+
+            if (name.length === 0) {
+                name = "Unnamed " + this.domainObject.getCapability("type").typeDef.name;
+                event.currentTarget.textContent = name;
+            }
+
+            if (name !== this.domainObject.getModel().name) {
+                this.domainObject.getCapability('mutation').mutate(function (model) {
+                    model.name = name;
+                });
+            }
+        };
+
+        /**
+         * Checks if the domain object is editable.
+         *
+         * @private
+         * @return true if object is editable
+         */
+        ObjectHeaderController.prototype.allowEdit = function () {
+            var type = this.domainObject && this.domainObject.getCapability('type');
+            return !!(type && type.hasFeature('creation'));
+        };
+
+        return ObjectHeaderController;
+    }
+);
--- a/platform/commonUI/browse/src/PaneController.js
+++ b/platform/commonUI/browse/src/PaneController.js
@@ -0,0 +1,88 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+
+define(
+    [],
+    function () {
+        var navigationListenerAdded = false;
+        /**
+         * Controller to provide the ability to show/hide the tree in
+         * Browse mode.
+         * @constructor
+         * @memberof platform/commonUI/browse
+         */
+        function PaneController($scope, agentService, $window, $location, $attrs, navigationService) {
+            var self = this;
+            this.agentService = agentService;
+            var hideParameterPresent = $location.search().hasOwnProperty($attrs.hideParameter);
+
+            if ($attrs.hideParameter && hideParameterPresent) {
+                this.state = false;
+                $location.search($attrs.hideParameter, undefined);
+            } else {
+                this.state = true;
+            }
+
+            /**
+             * Callback to invoke when any selection occurs in the tree.
+             * This controller can be passed in as the `parameters` object
+             * to the tree representation.
+             *
+             * @property {Function} callback
+             * @memberof platform/commonUI/browse.PaneController#
+             */
+            this.callback = function () {
+                // Note that, since this is a callback to pass, this is not
+                // declared as a method but as a property which happens to
+                // be a function.
+                if (agentService.isPhone() && agentService.isPortrait()) {
+                    // On phones, trees should collapse in portrait mode
+                    // when something is navigated-to.
+                    self.state = false;
+                }
+            };
+
+            if (navigationService && navigationService.addListener && !navigationListenerAdded) {
+                navigationService.addListener(this.callback);
+                navigationListenerAdded = true;
+            }
+        }
+
+        /**
+         * Toggle the visibility of the pane.
+         */
+        PaneController.prototype.toggle = function () {
+            this.state = !this.state;
+        };
+
+        /**
+         * Get the desired visibility state of the pane.
+         * @returns {boolean} true when visible
+         */
+        PaneController.prototype.visible = function () {
+            return !!this.state;
+        };
+
+        return PaneController;
+    }
+);
--- a/platform/commonUI/browse/test/BrowseControllerSpec.js
+++ b/platform/commonUI/browse/test/BrowseControllerSpec.js
@@ -0,0 +1,266 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global console*/
+
+/**
+ * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    [
+        "../src/BrowseController",
+        "../src/navigation/NavigationService"
+    ],
+    function (
+        BrowseController,
+        NavigationService
+    ) {
+
+        describe("The browse controller", function () {
+            var mockScope,
+                mockRoute,
+                mockLocation,
+                mockObjectService,
+                mockNavigationService,
+                mockRootObject,
+                mockUrlService,
+                mockDefaultRootObject,
+                mockOtherDomainObject,
+                mockNextObject,
+                testDefaultRoot,
+                controller;
+
+            function waitsForNavigation() {
+                return new Promise(function (resolve) {
+                    mockNavigationService.setNavigation.and.callFake(function (obj) {
+                        var returnValue;
+                        try {
+                            returnValue = NavigationService.prototype.setNavigation.call(mockNavigationService, obj);
+                        } catch (err) {
+                            console.error(err);
+                            //Not rejecting because 'setNavigation' has been called, which is what's being tested here.
+                            //Rejecting will fail tests.
+                        }
+                        resolve();
+                        return returnValue;
+                    });
+                });
+            }
+
+            function instantiateController() {
+                controller = new BrowseController(
+                    mockScope,
+                    mockRoute,
+                    mockLocation,
+                    mockObjectService,
+                    mockNavigationService,
+                    mockUrlService,
+                    testDefaultRoot
+                );
+            }
+
+            beforeEach(function () {
+                testDefaultRoot = "some-root-level-domain-object";
+
+                mockScope = jasmine.createSpyObj(
+                    "$scope",
+                    ["$on", "$watch"]
+                );
+                mockRoute = { current: { params: {}, pathParams: {} } };
+                mockUrlService = jasmine.createSpyObj(
+                    "urlService",
+                    ["urlForLocation"]
+                );
+                mockUrlService.urlForLocation.and.callFake(function (mode, object) {
+                    if (object === mockDefaultRootObject) {
+                        return [mode, testDefaultRoot].join('/');
+                    }
+                    if (object === mockOtherDomainObject) {
+                        return [mode, 'other'].join('/');
+                    }
+                    if (object === mockNextObject) {
+                        return [mode, testDefaultRoot, 'next'].join('/');
+                    }
+                    throw new Error('Tried to get url for unexpected object');
+                });
+                mockLocation = jasmine.createSpyObj(
+                    "$location",
+                    ["path"]
+                );
+                mockObjectService = jasmine.createSpyObj(
+                    "objectService",
+                    ["getObjects"]
+                );
+                mockNavigationService = new NavigationService({});
+                [
+                    "getNavigation",
+                    "setNavigation",
+                    "addListener",
+                    "removeListener"
+                ].forEach(function (method) {
+                    spyOn(mockNavigationService, method)
+                        .and.callThrough();
+                });
+                mockRootObject = jasmine.createSpyObj(
+                    "rootObjectContainer",
+                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
+                );
+                mockDefaultRootObject = jasmine.createSpyObj(
+                    "defaultRootObject",
+                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
+                );
+                mockOtherDomainObject = jasmine.createSpyObj(
+                    "otherDomainObject",
+                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
+                );
+                mockNextObject = jasmine.createSpyObj(
+                    "nestedDomainObject",
+                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
+                );
+                mockObjectService.getObjects.and.returnValue(Promise.resolve({
+                    ROOT: mockRootObject
+                }));
+                mockRootObject.useCapability.and.returnValue(Promise.resolve([
+                    mockOtherDomainObject,
+                    mockDefaultRootObject
+                ]));
+                mockRootObject.hasCapability.and.returnValue(true);
+                mockDefaultRootObject.useCapability.and.returnValue(Promise.resolve([
+                    mockNextObject
+                ]));
+                mockDefaultRootObject.hasCapability.and.returnValue(true);
+                mockOtherDomainObject.hasCapability.and.returnValue(false);
+                mockNextObject.useCapability.and.returnValue(undefined);
+                mockNextObject.hasCapability.and.returnValue(false);
+                mockNextObject.getId.and.returnValue("next");
+                mockDefaultRootObject.getId.and.returnValue(testDefaultRoot);
+
+                instantiateController();
+                return waitsForNavigation();
+            });
+
+            it("uses composition to set the navigated object, if there is none", function () {
+                instantiateController();
+                return waitsForNavigation().then(function () {
+                    expect(mockNavigationService.setNavigation)
+                        .toHaveBeenCalledWith(mockDefaultRootObject);
+                });
+            });
+
+            it("navigates to a root-level object, even when default path is not found", function () {
+                mockDefaultRootObject.getId
+                    .and.returnValue("something-other-than-the-" + testDefaultRoot);
+                instantiateController();
+
+                return waitsForNavigation().then(function () {
+                    expect(mockNavigationService.setNavigation)
+                        .toHaveBeenCalledWith(mockDefaultRootObject);
+                });
+            });
+
+            it("does not try to override navigation", function () {
+                mockNavigationService.getNavigation.and.returnValue(mockDefaultRootObject);
+                instantiateController();
+                return waitsForNavigation().then(function () {
+                    expect(mockScope.navigatedObject).toBe(mockDefaultRootObject);
+                });
+            });
+
+            it("updates scope when navigated object changes", function () {
+                // Should have registered a listener - call it
+                mockNavigationService.addListener.calls.mostRecent().args[0](
+                    mockOtherDomainObject
+                );
+                expect(mockScope.navigatedObject).toEqual(mockOtherDomainObject);
+            });
+
+
+            it("releases its navigation listener when its scope is destroyed", function () {
+                expect(mockScope.$on).toHaveBeenCalledWith(
+                    "$destroy",
+                    jasmine.any(Function)
+                );
+                mockScope.$on.calls.mostRecent().args[1]();
+
+                // Should remove the listener it added earlier
+                expect(mockNavigationService.removeListener).toHaveBeenCalledWith(
+                    mockNavigationService.addListener.calls.mostRecent().args[0]
+                );
+            });
+
+            it("uses route parameters to choose initially-navigated object", function () {
+                mockRoute.current.params.ids = testDefaultRoot + "/next";
+                instantiateController();
+                return waitsForNavigation().then(function () {
+                    expect(mockScope.navigatedObject).toBe(mockNextObject);
+                    expect(mockNavigationService.setNavigation)
+                        .toHaveBeenCalledWith(mockNextObject);
+                });
+            });
+
+            it("handles invalid IDs by going as far as possible", function () {
+                // Idea here is that if we get a bad path of IDs,
+                // browse controller should traverse down it until
+                // it hits an invalid ID.
+                mockRoute.current.params.ids = testDefaultRoot + "/junk";
+                instantiateController();
+                return waitsForNavigation().then(function () {
+                    expect(mockScope.navigatedObject).toBe(mockDefaultRootObject);
+                    expect(mockNavigationService.setNavigation)
+                        .toHaveBeenCalledWith(mockDefaultRootObject);
+                });
+            });
+
+            it("handles compositionless objects by going as far as possible", function () {
+                // Idea here is that if we get a path which passes
+                // through an object without a composition, browse controller
+                // should stop at it since remaining IDs cannot be loaded.
+                mockRoute.current.params.ids = testDefaultRoot + "/next/junk";
+                instantiateController();
+                return waitsForNavigation().then(function () {
+                    expect(mockScope.navigatedObject).toBe(mockNextObject);
+                    expect(mockNavigationService.setNavigation)
+                        .toHaveBeenCalledWith(mockNextObject);
+                });
+            });
+
+            it("updates the displayed route to reflect current navigation", function () {
+                // In order to trigger a route update and not a route change,
+                // the current route must be updated before location.path is
+                // called.
+                expect(mockRoute.current.pathParams.ids)
+                    .not
+                    .toBe(testDefaultRoot + '/next');
+                mockLocation.path.and.callFake(function () {
+                    expect(mockRoute.current.pathParams.ids)
+                        .toBe(testDefaultRoot + '/next');
+                });
+                mockNavigationService.addListener.calls.mostRecent().args[0](
+                    mockNextObject
+                );
+                expect(mockLocation.path).toHaveBeenCalledWith(
+                    '/browse/' + testDefaultRoot + '/next'
+                );
+            });
+
+        });
+    }
+);
--- a/platform/commonUI/browse/test/BrowseObjectControllerSpec.js
+++ b/platform/commonUI/browse/test/BrowseObjectControllerSpec.js
@@ -0,0 +1,93 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ["../src/BrowseObjectController"],
+    function (BrowseObjectController) {
+
+        describe("The browse object controller", function () {
+            var mockScope,
+                mockLocation,
+                mockRoute,
+                controller;
+
+            // Utility function; look for a $watch on scope and fire it
+            function fireWatch(expr, value) {
+                mockScope.$watch.calls.all().forEach(function (call) {
+                    if (call.args[0] === expr) {
+                        call.args[1](value);
+                    }
+                });
+            }
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj(
+                    "$scope",
+                    ["$on", "$watch"]
+                );
+                mockRoute = { current: { params: {} } };
+                mockLocation = jasmine.createSpyObj(
+                    "$location",
+                    ["path", "search"]
+                );
+                mockLocation.search.and.returnValue({});
+
+                controller = new BrowseObjectController(
+                    mockScope,
+                    mockLocation,
+                    mockRoute
+                );
+            });
+
+            it("updates query parameters when selected view changes", function () {
+                fireWatch("representation.selected.key", "xyz");
+                expect(mockLocation.search).toHaveBeenCalledWith('view', "xyz");
+
+                // Allows the path index to be checked
+                // prior to setting $route.current
+                mockLocation.path.and.returnValue("/browse/");
+            });
+
+            it("sets the active view from query parameters", function () {
+                var mockDomainObject = jasmine.createSpyObj(
+                        "domainObject",
+                        ['getId', 'getModel', 'getCapability', 'useCapability']
+                    ),
+                    testViews = [
+                        { key: 'abc' },
+                        { key: 'def', someKey: 'some value' },
+                        { key: 'xyz' }
+                    ];
+
+                mockDomainObject.useCapability.and.callFake(function (c) {
+                    return (c === 'view') && testViews;
+                });
+                mockLocation.search.and.returnValue({ view: 'def' });
+
+                fireWatch('domainObject', mockDomainObject);
+                expect(mockScope.representation.selected)
+                    .toEqual(testViews[1]);
+            });
+
+        });
+    }
+);
--- a/platform/commonUI/browse/test/InspectorPaneControllerSpec.js
+++ b/platform/commonUI/browse/test/InspectorPaneControllerSpec.js
@@ -0,0 +1,103 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT Web includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ["../src/InspectorPaneController"],
+    function (InspectorPaneController) {
+
+        describe("The InspectorPaneController", function () {
+            var mockScope,
+                mockAgentService,
+                mockDomainObject,
+                mockWindow,
+                mockStatusCapability,
+                mockNavigationService,
+                mockNavigationUnlistener,
+                mockStatusUnlistener,
+                controller,
+                mockLocation,
+                mockAttrs;
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj("$scope", ["$on"]);
+                mockWindow = jasmine.createSpyObj("$window", ["open"]);
+                mockAgentService = jasmine.createSpyObj(
+                    "agentService",
+                    ["isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape"]
+                );
+
+                mockNavigationUnlistener = jasmine.createSpy("navigationUnlistener");
+                mockNavigationService = jasmine.createSpyObj(
+                    "navigationService",
+                    ["getNavigation", "addListener"]
+                );
+                mockNavigationService.addListener.and.returnValue(mockNavigationUnlistener);
+
+                mockStatusUnlistener = jasmine.createSpy("statusUnlistener");
+                mockStatusCapability = jasmine.createSpyObj(
+                    "statusCapability",
+                    ["listen"]
+                );
+                mockStatusCapability.listen.and.returnValue(mockStatusUnlistener);
+
+                mockDomainObject = jasmine.createSpyObj(
+                    'domainObject',
+                    [
+                        'getId',
+                        'getModel',
+                        'getCapability',
+                        'hasCapability'
+                    ]
+                );
+                mockDomainObject.getId.and.returnValue("domainObject");
+                mockDomainObject.getModel.and.returnValue({});
+                mockDomainObject.hasCapability.and.returnValue(true);
+                mockDomainObject.getCapability.and.returnValue(mockStatusCapability);
+
+                mockLocation = jasmine.createSpyObj('location', ['search']);
+                mockLocation.search.and.returnValue({});
+
+                mockAttrs = {};
+
+                controller = new InspectorPaneController(mockScope, mockAgentService, mockWindow, mockNavigationService, mockLocation, mockAttrs);
+            });
+
+            it("listens for changes to navigation and attaches a status" +
+                " listener", function () {
+                expect(mockNavigationService.addListener).toHaveBeenCalledWith(jasmine.any(Function));
+                mockNavigationService.addListener.calls.mostRecent().args[0](mockDomainObject);
+                expect(mockStatusCapability.listen).toHaveBeenCalledWith(jasmine.any(Function));
+            });
+
+            it("if hidden, shows the inspector when domain object switches to" +
+                " edit mode", function () {
+                controller.toggle();
+                // test pre-condition that inspector is hidden
+                expect(controller.visible()).toBe(false);
+                mockNavigationService.addListener.calls.mostRecent().args[0](mockDomainObject);
+                mockStatusCapability.listen.calls.mostRecent().args[0](["editing"]);
+                expect(controller.visible()).toBe(true);
+            });
+
+        });
+    }
+);
--- a/platform/commonUI/browse/test/MenuArrowControllerSpec.js
+++ b/platform/commonUI/browse/test/MenuArrowControllerSpec.js
@@ -0,0 +1,79 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * MenuArrowControllerSpec. Created by shale on 07/02/2015.
+ */
+define(
+    ["../src/MenuArrowController"],
+    function (MenuArrowController) {
+
+        describe("The menu arrow controller ", function () {
+            var mockScope,
+                mockDomainObject,
+                mockEvent,
+                mockContextMenuAction,
+                mockActionContext,
+                controller;
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj(
+                    "$scope",
+                    [""]
+                );
+                mockDomainObject = jasmine.createSpyObj(
+                    "domainObject",
+                    ["getCapability"]
+                );
+                mockEvent = jasmine.createSpyObj(
+                    "event",
+                    ["preventDefault"]
+                );
+                mockContextMenuAction = jasmine.createSpyObj(
+                    "action",
+                    ["perform", "getActions"]
+                );
+                mockActionContext = jasmine.createSpyObj(
+                    "actionContext",
+                    [""]
+                );
+
+                mockActionContext.domainObject = mockDomainObject;
+                mockActionContext.event = mockEvent;
+                mockScope.domainObject = mockDomainObject;
+                mockDomainObject.getCapability.and.returnValue(mockContextMenuAction);
+                mockContextMenuAction.perform.and.returnValue(jasmine.any(Function));
+
+                controller = new MenuArrowController(mockScope);
+            });
+
+            it("calls the context menu action when clicked", function () {
+                // Simulate a click on the menu arrow
+                controller.showMenu(mockEvent);
+
+                // Expect the menu action to be performed
+                expect(mockDomainObject.getCapability).toHaveBeenCalledWith('action');
+                expect(mockContextMenuAction.perform).toHaveBeenCalled();
+            });
+        });
+    }
+);
--- a/platform/commonUI/browse/test/ObjectHeaderControllerSpec.js
+++ b/platform/commonUI/browse/test/ObjectHeaderControllerSpec.js
@@ -0,0 +1,137 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ["../src/ObjectHeaderController"],
+    function (ObjectHeaderController) {
+
+        describe("The object header controller", function () {
+            var mockScope,
+                mockDomainObject,
+                mockCapabilities,
+                mockMutationCapability,
+                mockTypeCapability,
+                mockEvent,
+                mockCurrentTarget,
+                model,
+                controller;
+
+            beforeEach(function () {
+                mockMutationCapability = jasmine.createSpyObj("mutation", ["mutate"]);
+                mockTypeCapability = jasmine.createSpyObj("type", ["typeDef", "hasFeature"]);
+                mockTypeCapability.typeDef = { name: ""};
+                mockTypeCapability.hasFeature.and.callFake(function (feature) {
+                    return feature === 'creation';
+                });
+
+                mockCapabilities = {
+                    mutation: mockMutationCapability,
+                    type: mockTypeCapability
+                };
+
+                model = {
+                    name: "Test name"
+                };
+                mockDomainObject = jasmine.createSpyObj("domainObject", ["getCapability", "getModel"]);
+                mockDomainObject.getModel.and.returnValue(model);
+                mockDomainObject.getCapability.and.callFake(function (key) {
+                    return mockCapabilities[key];
+                });
+
+                mockScope = {
+                    domainObject: mockDomainObject
+                };
+
+                mockCurrentTarget = jasmine.createSpyObj("currentTarget", ["blur", "textContent"]);
+                mockCurrentTarget.blur.and.returnValue(mockCurrentTarget);
+
+                mockEvent = {
+                    which: {},
+                    type: {},
+                    currentTarget: mockCurrentTarget
+                };
+
+                controller = new ObjectHeaderController(mockScope);
+            });
+
+            it("updates the model with new name on blur", function () {
+                mockEvent.type = "blur";
+                mockCurrentTarget.textContent = "New name";
+                controller.updateName(mockEvent);
+
+                expect(mockMutationCapability.mutate).toHaveBeenCalled();
+            });
+
+            it("updates the model with a default for blank names", function () {
+                mockEvent.type = "blur";
+                mockCurrentTarget.textContent = "";
+                controller.updateName(mockEvent);
+
+                expect(mockCurrentTarget.textContent.length).not.toEqual(0);
+                expect(mockMutationCapability.mutate).toHaveBeenCalled();
+            });
+
+            it("does not update the model if the same name", function () {
+                mockEvent.type = "blur";
+                mockCurrentTarget.textContent = mockDomainObject.getModel().name;
+                controller.updateName(mockEvent);
+
+                expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
+            });
+
+            it("updates the model on enter keypress event only", function () {
+                mockCurrentTarget.textContent = "New name";
+                controller.updateName(mockEvent);
+
+                expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
+
+                mockEvent.which = 13;
+                controller.updateName(mockEvent);
+
+                expect(mockMutationCapability.mutate).toHaveBeenCalledWith(jasmine.any(Function));
+
+                mockMutationCapability.mutate.calls.mostRecent().args[0](model);
+
+                expect(mockDomainObject.getModel().name).toBe("New name");
+            });
+
+            it("blurs the field on enter key press", function () {
+                mockCurrentTarget.textContent = "New name";
+                mockEvent.which = 13;
+                controller.updateName(mockEvent);
+
+                expect(mockEvent.currentTarget.blur).toHaveBeenCalled();
+            });
+
+            it("allows editting name when object is creatable", function () {
+                expect(controller.allowEdit()).toBe(true);
+            });
+
+            it("disallows editting name when object is non-creatable", function () {
+                mockTypeCapability.hasFeature.and.returnValue(false);
+
+                expect(controller.allowEdit()).toBe(false);
+
+            });
+        });
+    }
+);
--- a/platform/commonUI/browse/test/PaneControllerSpec.js
+++ b/platform/commonUI/browse/test/PaneControllerSpec.js
@@ -0,0 +1,106 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ["../src/PaneController"],
+    function (PaneController) {
+
+        describe("The PaneController", function () {
+            var mockScope,
+                mockAgentService,
+                mockWindow,
+                controller,
+                mockLocation,
+                mockAttrs;
+
+            // We want to reinstantiate for each test case
+            // because device state can influence constructor-time behavior
+            function instantiateController() {
+                return new PaneController(
+                    mockScope,
+                    mockAgentService,
+                    mockWindow,
+                    mockLocation,
+                    mockAttrs
+                );
+            }
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj("$scope", ["$on"]);
+                mockAgentService = jasmine.createSpyObj(
+                    "agentService",
+                    ["isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape"]
+                );
+                mockWindow = jasmine.createSpyObj("$window", ["open"]);
+
+                mockLocation = jasmine.createSpyObj('location', ['search']);
+                mockLocation.search.and.returnValue({});
+
+                mockAttrs = {};
+            });
+
+            it("is initially visible", function () {
+                expect(instantiateController().visible()).toBeTruthy();
+            });
+
+            it("allows visibility to be toggled", function () {
+                controller = instantiateController();
+                controller.toggle();
+                expect(controller.visible()).toBeFalsy();
+                controller.toggle();
+                expect(controller.visible()).toBeTruthy();
+            });
+
+            it("collapses on navigation changes on portrait-oriented phones", function () {
+                mockAgentService.isMobile.and.returnValue(true);
+                mockAgentService.isPhone.and.returnValue(true);
+                mockAgentService.isPortrait.and.returnValue(true);
+                controller = instantiateController();
+                expect(controller.visible()).toBeTruthy();
+
+                // Simulate a change from the tree by invoking controller's
+                controller.callback();
+
+                // Tree should have collapsed
+                expect(controller.visible()).toBeFalsy();
+            });
+
+            describe("specifying hideParameter", function () {
+                beforeEach(function () {
+                    mockAttrs = {hideParameter: 'hideTree'};
+                });
+
+                it("sets pane state to false when in location.search", function () {
+                    mockLocation.search.and.returnValue({'hideTree': true});
+                    expect(instantiateController().visible()).toBe(false);
+                    expect(mockLocation.search).toHaveBeenCalledWith('hideTree', undefined);
+                });
+
+                it("sets state to true when not found in location.search", function () {
+                    mockLocation.search.and.returnValue({});
+                    expect(instantiateController().visible()).toBe(true);
+                    expect(mockLocation.search).not.toHaveBeenCalledWith('hideTree', undefined);
+                });
+            });
+        });
+    }
+);
--- a/platform/commonUI/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/dialog/src/OverlayService.js
+++ b/platform/commonUI/dialog/src/OverlayService.js
@@ -97,7 +97,7 @@ define(
            this.$timeout(() => {
                // Create the overlay element and add it to the document's body
                element = this.$compile(TEMPLATE)(scope);
-
+                
                // Append so that most recent dialog is last in DOM. This means the most recent dialog will be on top when
                // multiple overlays with the same z-index are active.
                this.findBody().append(element);
--- a/platform/commonUI/edit/bundle.js
+++ b/platform/commonUI/edit/bundle.js
@@ -27,6 +27,7 @@ define([
    "./src/actions/EditAndComposeAction",
    "./src/actions/EditAction",
    "./src/actions/PropertiesAction",
+    "./src/actions/RemoveAction",
    "./src/actions/SaveAction",
    "./src/actions/SaveAndStopEditingAction",
    "./src/actions/SaveAsAction",
@@ -48,7 +49,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,
@@ -56,6 +58,7 @@ define([
    EditAndComposeAction,
    EditAction,
    PropertiesAction,
+    RemoveAction,
    SaveAction,
    SaveAndStopEditingAction,
    SaveAsAction,
@@ -77,277 +80,288 @@ 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": "remove",
+                    "category": "legacy",
+                    "implementation": RemoveAction,
+                    "cssClass": "icon-trash",
+                    "name": "Remove",
+                    "description": "Remove this object from its containing object.",
+                    "depends": [
+                        "openmct",
+                        "navigationService"
+                    ]
+                },
+                {
+                    "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/RemoveAction.js
+++ b/platform/commonUI/edit/src/actions/RemoveAction.js
@@ -0,0 +1,131 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * Module defining RemoveAction. Created by vwoeltje on 11/17/14.
+ */
+define([], function () {
+
+    /**
+     * Construct an action which will remove the provided object manifestation.
+     * The object will be removed from its parent's composition; the parent
+     * is looked up via the "context" capability (so this will be the
+     * immediate ancestor by which this specific object was reached.)
+     *
+     * @param {DialogService} dialogService a service which will show the dialog
+     * @param {NavigationService} navigationService a service that maintains the current navigation state
+     * @param {ActionContext} context the context in which this action is performed
+     * @memberof platform/commonUI/edit
+     * @constructor
+     * @implements {Action}
+     */
+    function RemoveAction(openmct, navigationService, context) {
+        this.domainObject = (context || {}).domainObject;
+        this.openmct = openmct;
+        this.navigationService = navigationService;
+    }
+
+    /**
+     * Perform this action.
+     */
+    RemoveAction.prototype.perform = function () {
+        var dialog,
+            domainObject = this.domainObject,
+            navigationService = this.navigationService;
+        /*
+         * Check whether an object ID matches the ID of the object being
+         * removed (used to filter a parent's composition to handle the
+         * removal.)
+         */
+        function isNotObject(otherObjectId) {
+            return otherObjectId !== domainObject.getId();
+        }
+
+        /*
+         * Mutate a parent object such that it no longer contains the object
+         * which is being removed.
+         */
+        function doMutate(model) {
+            model.composition = model.composition.filter(isNotObject);
+        }
+
+        /*
+         * Checks current object and ascendants of current
+         * object with object being removed, if the current
+         * object or any in the current object's path is being removed,
+         * navigate back to parent of removed object.
+         */
+        function checkObjectNavigation(object, parentObject) {
+            // Traverse object starts at current location
+            var traverseObject = (navigationService).getNavigation(),
+                context;
+
+            // Stop when object is not defined (above ROOT)
+            while (traverseObject) {
+                // If object currently traversed to is object being removed
+                // navigate to parent of current object and then exit loop
+                if (traverseObject.getId() === object.getId()) {
+                    navigationService.setNavigation(parentObject);
+                    return;
+                }
+                // Traverses to parent of current object, moving
+                // up the ascendant path
+                context = traverseObject.getCapability('context');
+                traverseObject = context && context.getParent();
+            }
+        }
+
+        /*
+         * Remove the object from its parent, as identified by its context
+         * capability. Based on object's location and selected object's location
+         * user may be navigated to existing parent object
+         */
+        function removeFromContext() {
+            var contextCapability = domainObject.getCapability('context'),
+                parent = contextCapability.getParent();
+
+            // If currently within path of removed object(s),
+            // navigates to existing object up tree
+            checkObjectNavigation(domainObject, parent);
+
+            return parent.useCapability('mutation', doMutate);
+        }
+
+        removeFromContext();
+    };
+
+    // Object needs to have a parent for Remove to be applicable
+    RemoveAction.appliesTo = function (context) {
+        var object = (context || {}).domainObject,
+            contextCapability = object && object.getCapability("context"),
+            parent = contextCapability && contextCapability.getParent(),
+            parentType = parent && parent.getCapability('type'),
+            parentCreatable = parentType && parentType.hasFeature('creation');
+
+        // Only creatable types should be modifiable
+        return parent !== undefined &&
+                Array.isArray(parent.getModel().composition) &&
+                parentCreatable;
+    };
+
+    return RemoveAction;
+});
--- a/platform/commonUI/edit/src/actions/SaveInProgressDialog.js
+++ b/platform/commonUI/edit/src/actions/SaveInProgressDialog.js
@@ -6,7 +6,7 @@ define([], function () {

    SaveInProgressDialog.prototype.show = function () {
        this.dialog = this.dialogService.showBlockingMessage({
-            title: "Saving",
+            title: "Saving...",
            hint: "Do not navigate away from this page or close this browser tab while this message is displayed.",
            unknownProgress: true,
            severity: "info",
--- a/platform/commonUI/edit/test/actions/RemoveActionSpec.js
+++ b/platform/commonUI/edit/test/actions/RemoveActionSpec.js
@@ -0,0 +1,255 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ["../../src/actions/RemoveAction"],
+    function (RemoveAction) {
+
+        describe("The Remove action", function () {
+            var action,
+                actionContext,
+                capabilities,
+                mockContext,
+                mockOverlayAPI,
+                mockDomainObject,
+                mockMutation,
+                mockNavigationService,
+                mockParent,
+                mockType,
+                model;
+
+            beforeEach(function () {
+                mockDomainObject = jasmine.createSpyObj(
+                    "domainObject",
+                    ["getId", "getCapability", "getModel"]
+                );
+
+                mockMutation = jasmine.createSpyObj("mutation", ["invoke"]);
+                mockType = jasmine.createSpyObj("type", ["hasFeature"]);
+                mockType.hasFeature.and.returnValue(true);
+
+                capabilities = {
+                    mutation: mockMutation,
+                    type: mockType
+                };
+
+                model = {
+                    composition: ["a", "test", "b"]
+                };
+
+                mockParent = {
+                    getModel: function () {
+                        return model;
+                    },
+                    getCapability: function (k) {
+                        return capabilities[k];
+                    },
+                    useCapability: function (k, v) {
+                        return capabilities[k].invoke(v);
+                    }
+                };
+
+                mockOverlayAPI = jasmine.createSpyObj(
+                    "overlayAPI",
+                    ["dialog"]
+                );
+
+                mockNavigationService = jasmine.createSpyObj(
+                    "navigationService",
+                    [
+                        "getNavigation",
+                        "setNavigation",
+                        "addListener",
+                        "removeListener"
+                    ]
+                );
+                mockNavigationService.getNavigation.and.returnValue(mockDomainObject);
+
+                mockContext = jasmine.createSpyObj("context", ["getParent"]);
+                mockContext.getParent.and.returnValue(mockParent);
+
+                mockDomainObject.getId.and.returnValue("test");
+                mockDomainObject.getCapability.and.returnValue(mockContext);
+                mockDomainObject.getModel.and.returnValue({name: 'test object'});
+
+                mockContext.getParent.and.returnValue(mockParent);
+                mockType.hasFeature.and.returnValue(true);
+
+                actionContext = { domainObject: mockDomainObject };
+
+                action = new RemoveAction({overlays: mockOverlayAPI}, mockNavigationService, actionContext);
+            });
+
+            it("only applies to objects with parents", function () {
+                expect(RemoveAction.appliesTo(actionContext)).toBeTruthy();
+
+                mockContext.getParent.and.returnValue(undefined);
+
+                expect(RemoveAction.appliesTo(actionContext)).toBeFalsy();
+
+                // Also verify that creatability was checked
+                expect(mockType.hasFeature).toHaveBeenCalledWith('creation');
+            });
+
+            it("shows a blocking message dialog", function () {
+                mockParent = jasmine.createSpyObj(
+                    "parent",
+                    ["getModel", "getCapability", "useCapability"]
+                );
+
+                action.perform();
+
+                expect(mockOverlayAPI.dialog).toHaveBeenCalled();
+
+                // Also check that no mutation happens at this point
+                expect(mockParent.useCapability).not.toHaveBeenCalledWith("mutation", jasmine.any(Function));
+            });
+
+            describe("after the remove callback is triggered", function () {
+                var mockChildContext,
+                    mockChildObject,
+                    mockDialogHandle,
+                    mockGrandchildContext,
+                    mockGrandchildObject,
+                    mockRootContext,
+                    mockRootObject;
+
+                beforeEach(function () {
+                    mockChildObject = jasmine.createSpyObj(
+                        "domainObject",
+                        ["getId", "getCapability"]
+                    );
+
+                    mockDialogHandle = jasmine.createSpyObj(
+                        "dialogHandle",
+                        ["dismiss"]
+                    );
+
+                    mockGrandchildObject = jasmine.createSpyObj(
+                        "domainObject",
+                        ["getId", "getCapability"]
+                    );
+
+                    mockRootObject = jasmine.createSpyObj(
+                        "domainObject",
+                        ["getId", "getCapability"]
+                    );
+
+                    mockChildContext = jasmine.createSpyObj("context", ["getParent"]);
+                    mockGrandchildContext = jasmine.createSpyObj("context", ["getParent"]);
+                    mockRootContext = jasmine.createSpyObj("context", ["getParent"]);
+
+                    mockOverlayAPI.dialog.and.returnValue(mockDialogHandle);
+                });
+
+                it("mutates the parent when performed", function () {
+                    action.perform();
+                    mockOverlayAPI.dialog.calls.mostRecent().args[0]
+                        .buttons[0].callback();
+
+                    expect(mockMutation.invoke)
+                        .toHaveBeenCalledWith(jasmine.any(Function));
+                });
+
+                it("changes composition from its mutation function", function () {
+                    var mutator, result;
+
+                    action.perform();
+                    mockOverlayAPI.dialog.calls.mostRecent().args[0]
+                        .buttons[0].callback();
+
+                    mutator = mockMutation.invoke.calls.mostRecent().args[0];
+                    result = mutator(model);
+
+                    // Should not have cancelled the mutation
+                    expect(result).not.toBe(false);
+
+                    // Simulate mutate's behavior (remove can either return a
+                    // new model or modify this one in-place)
+                    result = result || model;
+
+                    // Should have removed "test" - that was our
+                    // mock domain object's id.
+                    expect(result.composition).toEqual(["a", "b"]);
+                });
+
+                it("removes parent of object currently navigated to", function () {
+                    // Navigates to child object
+                    mockNavigationService.getNavigation.and.returnValue(mockChildObject);
+
+                    // Test is id of object being removed
+                    // Child object has different id
+                    mockDomainObject.getId.and.returnValue("test");
+                    mockChildObject.getId.and.returnValue("not test");
+
+                    // Sets context for the child and domainObject
+                    mockDomainObject.getCapability.and.returnValue(mockContext);
+                    mockChildObject.getCapability.and.returnValue(mockChildContext);
+
+                    // Parents of child and domainObject are set
+                    mockContext.getParent.and.returnValue(mockParent);
+                    mockChildContext.getParent.and.returnValue(mockDomainObject);
+
+                    mockType.hasFeature.and.returnValue(true);
+
+                    action.perform();
+                    mockOverlayAPI.dialog.calls.mostRecent().args[0]
+                        .buttons[0].callback();
+
+                    // Expects navigation to parent of domainObject (removed object)
+                    expect(mockNavigationService.setNavigation).toHaveBeenCalledWith(mockParent);
+                });
+
+                it("checks if removing object not in ascendent path (reaches ROOT)", function () {
+                    // Navigates to grandchild of ROOT
+                    mockNavigationService.getNavigation.and.returnValue(mockGrandchildObject);
+
+                    // domainObject (grandparent) is set as ROOT, child and grandchild
+                    // are set objects not being removed
+                    mockDomainObject.getId.and.returnValue("test 1");
+                    mockRootObject.getId.and.returnValue("ROOT");
+                    mockChildObject.getId.and.returnValue("not test 2");
+                    mockGrandchildObject.getId.and.returnValue("not test 3");
+
+                    // Sets context for the grandchild, child, and domainObject
+                    mockRootObject.getCapability.and.returnValue(mockRootContext);
+                    mockChildObject.getCapability.and.returnValue(mockChildContext);
+                    mockGrandchildObject.getCapability.and.returnValue(mockGrandchildContext);
+
+                    // Parents of grandchild and child are set
+                    mockChildContext.getParent.and.returnValue(mockRootObject);
+                    mockGrandchildContext.getParent.and.returnValue(mockChildObject);
+
+                    mockType.hasFeature.and.returnValue(true);
+
+                    action.perform();
+                    mockOverlayAPI.dialog.calls.mostRecent().args[0]
+                        .buttons[0].callback();
+
+                    // Expects no navigation to occur
+                    expect(mockNavigationService.setNavigation).not.toHaveBeenCalled();
+                });
+
+            });
+        });
+    }
+);
--- a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js
+++ b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js
@@ -25,7 +25,7 @@ define(
    ["../../src/actions/SaveAsAction"],
    function (SaveAsAction) {

-        xdescribe("The Save As action", function () {
+        describe("The Save As action", function () {
            var mockDomainObject,
                mockClonedObject,
                mockEditorCapability,
--- a/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js
+++ b/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js
@@ -24,7 +24,7 @@ define(
    ["../../src/capabilities/EditorCapability"],
    function (EditorCapability) {

-        xdescribe("The editor capability", function () {
+        describe("The editor capability", function () {
            var mockDomainObject,
                capabilities,
                mockParentObject,
--- a/platform/commonUI/edit/test/creation/CreateActionSpec.js
+++ b/platform/commonUI/edit/test/creation/CreateActionSpec.js
@@ -27,7 +27,7 @@ define(
    ["../../src/creation/CreateAction"],
    function (CreateAction) {

-        xdescribe("The create action", function () {
+        describe("The create action", function () {
            var mockType,
                mockParent,
                mockContext,
--- a/platform/commonUI/edit/test/creation/CreateWizardSpec.js
+++ b/platform/commonUI/edit/test/creation/CreateWizardSpec.js
@@ -27,7 +27,7 @@ define(
    ["../../src/creation/CreateWizard"],
    function (CreateWizard) {

-        xdescribe("The create wizard", function () {
+        describe("The create wizard", function () {
            var mockType,
                mockParent,
                mockProperties,
--- 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/general/res/templates/angular-indicator.html
+++ b/platform/commonUI/general/res/templates/angular-indicator.html
@@ -20,7 +20,8 @@
 at runtime from the About dialog for additional information.
 -->
 <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-<div class="c-indicator {{ngModel.getCssClass()}}"
+<div class="ls-indicator {{ngModel.getCssClass()}}"
+	 title="{{ngModel.getDescription()}}"
 	 ng-show="ngModel.getText().length > 0">
-	<span class="label c-indicator__label">{{ngModel.getText()}}</span>
+	<span class="label">{{ngModel.getText()}}</span>
 </div>
--- a/platform/commonUI/general/test/ui/TreeViewSpec.js
+++ b/platform/commonUI/general/test/ui/TreeViewSpec.js
@@ -26,7 +26,7 @@ define([
    'zepto'
 ], function (TreeView, $) {

-    xdescribe("TreeView", function () {
+    describe("TreeView", function () {
        var mockGestureService,
            mockGestureHandle,
            mockDomainObject,
--- 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/notification/res/notification-indicator.html
+++ b/platform/commonUI/notification/res/notification-indicator.html
@@ -1,8 +1,8 @@
 <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-<div ng-show="notifications.length > 0" class="c-indicator c-indicator--clickable s-status-{{highest.severity}} icon-bell"
+<div ng-show="notifications.length > 0" class="ls-indicator s-status-{{highest.severity}} icon-bell"
      ng-controller="NotificationIndicatorController">
-    <span class="label c-indicator__label">
-        <button ng-click="showNotificationsList()">
-           {{notifications.length}} Notification<span ng-show="notifications.length > 1">s</span></button>
-    </span><span class="c-indicator__count">{{notifications.length}}</span>
+    <span class="label">
+        <a ng-click="showNotificationsList()">
+           {{notifications.length}} Notification<span ng-show="notifications.length > 1">s</span></a>
+    </span><span class="count">{{notifications.length}}</span>
 </div>
--- a/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js
+++ b/platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js
@@ -24,7 +24,7 @@ define(
    ['../src/NotificationIndicatorController'],
    function (NotificationIndicatorController) {

-        xdescribe("The notification indicator controller ", function () {
+        describe("The notification indicator controller ", function () {
            var mockNotificationService,
                mockScope,
                mockDialogService,
--- 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/containment/test/ComposeActionPolicySpec.js
+++ b/platform/containment/test/ComposeActionPolicySpec.js
@@ -23,7 +23,7 @@
 define(
    ["../src/ComposeActionPolicy"],
    function (ComposeActionPolicy) {
-        xdescribe("The compose action policy", function () {
+        describe("The compose action policy", function () {
            var mockInjector,
                mockPolicyService,
                mockTypes,
--- 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/entanglement/test/services/CopyServiceSpec.js
+++ b/platform/entanglement/test/services/CopyServiceSpec.js
@@ -42,7 +42,7 @@ define(
            return promise;
        }

-        xdescribe("CopyService", function () {
+        describe("CopyService", function () {
            var policyService;

            beforeEach(function () {
--- a/platform/entanglement/test/services/LinkServiceSpec.js
+++ b/platform/entanglement/test/services/LinkServiceSpec.js
@@ -29,7 +29,7 @@ define(
    ],
    function (LinkService, domainObjectFactory, ControlledPromise) {

-        xdescribe("LinkService", function () {
+        describe("LinkService", function () {

            var linkService,
                mockPolicyService;
--- a/platform/entanglement/test/services/MoveServiceSpec.js
+++ b/platform/entanglement/test/services/MoveServiceSpec.js
@@ -34,7 +34,7 @@ define(
        ControlledPromise
    ) {

-        xdescribe("MoveService", function () {
+        describe("MoveService", function () {

            var moveService,
                policyService,
--- 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/clock/src/indicators/ClockIndicator.js
+++ b/platform/features/clock/src/indicators/ClockIndicator.js
@@ -49,7 +49,7 @@ define(
        };

        ClockIndicator.prototype.getCssClass = function () {
-            return "t-indicator-clock icon-clock no-minify c-indicator--not-clickable";
+            return "t-indicator-clock icon-clock no-collapse float-right";
        };

        ClockIndicator.prototype.getText = function () {
--- a/platform/features/clock/test/indicators/FollowIndicatorSpec.js
+++ b/platform/features/clock/test/indicators/FollowIndicatorSpec.js
@@ -31,7 +31,7 @@ define([
    MCT,
    $
 ) {
-    xdescribe("The timer-following indicator", function () {
+    describe("The timer-following indicator", function () {
        var timerService;
        var openmct;

--- 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/imagery/test/controllers/ImageryControllerSpec.js
+++ b/platform/features/imagery/test/controllers/ImageryControllerSpec.js
@@ -30,7 +30,7 @@ define(
        var MOCK_ELEMENT_TEMPLATE =
            '<div class="l-image-thumbs-wrapper"></div>';

-        xdescribe("The Imagery controller", function () {
+        describe("The Imagery controller", function () {
            var $scope,
                openmct,
                oldDomainObject,
--- 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,16 +20,36 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-import PreviewAction from './PreviewAction';
+/**
+ * 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 class ViewHistoricalDataAction extends PreviewAction {
-    constructor(openmct) {
-        super(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;
+        }

-        this.name = 'View Historical Data';
-        this.key = 'viewHistoricalData';
-        this.description = 'View Historical Data in a Table or Plot';
-        this.cssClass = 'icon-eye-open';
-        this.hideInDefaultMenu = true;
+        /**
+         * 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
@@ -20,26 +20,37 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-import WebPageViewProvider from './WebPageViewProvider.js';
+define(
+    ["../src/EmbeddedPageController"],
+    function (EmbeddedPageController) {

-export default function plugin() {
-    return function install(openmct) {
-        openmct.objectViews.addProvider(new WebPageViewProvider(openmct));
+        describe("The controller for embedded pages", function () {
+            var mockSCE,
+                controller;
+
+            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);
+            });

-        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"
-                }
-            ]
        });
-    };
-}
+    }
+);
--- 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/forms/test/MCTFileInputSpec.js
+++ b/platform/forms/test/MCTFileInputSpec.js
@@ -24,7 +24,7 @@ define(
    ["../src/MCTFileInput"],
    function (MCTFileInput) {

-        xdescribe("The mct-file-input directive", function () {
+        describe("The mct-file-input directive", function () {

            var mockScope,
                mockFileInputService,
--- 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/framework/src/FrameworkLayer.js
+++ b/platform/framework/src/FrameworkLayer.js
@@ -55,13 +55,13 @@ define([

    FrameworkLayer.prototype.initializeApplication = function (
        angular,
-        openmct,
+        legacyRegistry,
        logLevel
    ) {
        var $http = this.$http,
            $log = this.$log,
            app = angular.module(Constants.MODULE_NAME, ["ngRoute"]),
-            loader = new BundleLoader($http, $log, openmct.legacyRegistry),
+            loader = new BundleLoader($http, $log, legacyRegistry),
            resolver = new BundleResolver(
                new ExtensionResolver(
                    new ImplementationLoader({}),
@@ -77,7 +77,7 @@ define([
            ),
            bootstrapper = new ApplicationBootstrapper(
                angular,
-                openmct.element,
+                window.document,
                $log
            ),
            initializer = new FrameworkInitializer(
--- a/platform/framework/src/Main.js
+++ b/platform/framework/src/Main.js
@@ -41,7 +41,7 @@ define(
        function Main() {
        }

-        Main.prototype.run = function (openmct) {
+        Main.prototype.run = function (legacyRegistry) {
            // Get a reference to Angular's injector, so we can get $http and $log
            // services, which are useful to the framework layer.
            var injector = angular.injector(['ng']);
@@ -53,7 +53,7 @@ define(
            }

            return injector.instantiate(['$http', '$log', FrameworkLayer])
-                .initializeApplication(angular, openmct, logLevel());
+                .initializeApplication(angular, legacyRegistry, logLevel());
        };

        return Main;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
charlesh88	9519d62f5c	Filter indicators styling - Reverting mistakenly changed file;	2019-06-25 16:07:34 -07:00
charlesh88	36dffe8892	Filter indicators styling - Adding missed Icomoon project file;	2019-06-25 16:04:14 -07:00
charlesh88	ba819fa1dd	Filter indicators styling - CSS, markup; - Added dynamic labeling and titling for mixed/non-mixed filter states; - Theme colors defined and added; - Added new filter icon glyphs for both 16px and 12px fonts; - Revised/normalized font project and glyph file names;	2019-06-25 16:02:38 -07:00
charlesh88	0f8bf0752e	Filter indicator styling WIP - Markup, class names added; - TODO: 'Mixed' and commas to be added via CSS, icon and bg coloring;	2019-06-24 16:06:36 -07:00
Pegah Sarram	54dfa6db0e	- Display 'Mixed' if filters have mixed values. - Use table configuration domain object to get composition.	2019-06-21 16:05:49 -07:00
Pegah Sarram	429464557a	Display a list of filters that are applied to telemetry objects in a telemetry table.	2019-06-20 15:59:38 -07:00