Disabled broken test

Fixed new linting error
Resolved merge conflict
2025-06-26 19:12:02 +00:00 · 2019-10-29 15:34:45 -07:00 · 2019-10-29 15:28:58 -07:00 · 2019-10-29 15:11:00 -07:00 · 2019-10-23 12:02:57 -07:00 · 2019-10-10 17:01:27 -07:00
403 changed files with 19725 additions and 25582 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
@ -52,6 +52,7 @@
    - [The URL Status Indicator](#the-url-status-indicator)
    - [Creating a Simple Indicator](#creating-a-simple-indicator)
    - [Custom Indicators](#custom-indicators)
+  - [Included Plugins](#included-plugins)

 <!-- END doctoc generated TOC please keep comment here to allow auto update -->

@ -108,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>
@ -125,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 
@ -231,7 +237,7 @@ attributes
    of this object. This is used for specifying an icon to appear next to each 
    object of this type.

-The [Open MCT Tutorials](https://github.com/nasa/openmct-tutorial) provide a 
+The [Open MCT Tutorials](https://github.com/openmct/openmct-tutorial) provide a 
 step-by-step examples of writing code for Open MCT that includes a [section on 
 defining a new object type](https://github.com/nasa/openmct-tutorial#step-3---providing-objects).

@ -423,7 +429,7 @@ attribute      | type   | flags    | notes

 ###### Value Hints

-Each telemetry value description has an object defining hints.  Keys in this this object represent the hint itself, and the value represents the weight of that hint.  A lower weight means the hint has a higher priority.  For example, multiple values could be hinted for use as the y-axis of a plot (raw, engineering), but the highest priority would be the default choice.  Likewise, a table will use hints to determine the default order of columns.
+Each telemetry value description has an object defining hints.  Keys in this this object represent the hint itself, and the value represents the weight of that hint.  A lower weight means the hint has a higher priority.  For example, multiple values could be hinted for use as the y axis of a plot (raw, engineering), but the highest priority would be the default choice.  Likewise, a table will use hints to determine the default order of columns.

 Known hints:

@ -505,7 +511,7 @@ example:
 }
 ```

-This strategy says "I want the latest data point in this time range".  A provider which recognizes this request should return only one value-- the latest-- in the requested time range.  Depending on your back-end implementation, performing these queries in bulk can be a large performance increase.  These are generally issued by views that are only capable of displaying a single value and only need to show the latest value.
+This strategy says "I want the lastest data point in this time range".  A provider which recognizes this request should return only one value-- the latest-- in the requested time range.  Depending on your back-end implementation, performing these queries in bulk can be a large performance increase.  These are generally issued by views that are only capable of displaying a single value and only need to show the latest value.

 ##### `minmax` request strategy

@ -600,7 +606,7 @@ evaluator, take a look at `examples/generator/SinewaveLimitProvider.js`.

 ### Telemetry Consumer APIs **draft**

-The APIs for requesting telemetry from Open MCT -- e.g. for use in custom views -- are currently in draft state and are being revised.  If you'd like to experiment with them before they are finalized, please contact the team via the contact-us link on our website.
+The APIs for requesting telemetry from Open MCT -- e.g. for use in custom views -- are currently in draft state and are being revised.  If you'd like to experiement with them before they are finalized, please contact the team via the contact-us link on our website.


 ## Time API
@ -988,7 +994,7 @@ A common use case for indicators is to convey the state of some external system
 persistence backend or HTTP server. So long as this system is accessible via HTTP request, 
 Open MCT provides a general purpose indicator to show whether the server is available and 
 returing a 2xx status code. The URL Status Indicator is made available as a default plugin. See
-the [documentation](./src/plugins/URLIndicatorPlugin) for details on how to install and configure the 
+[Included Plugins](#included-plugins) below for details on how to install and configure the 
 URL Status Indicator.

 ### Creating a Simple Indicator
@ -1027,7 +1033,7 @@ different colors to indicate status.

 ### Custom Indicators

-A completely custom indicator can be added by simply providing a DOM element to place alongside other indicators.
+A completely custom indicator can be added by simple providing a DOM element to place alongside other indicators.

 ``` javascript
    var domNode = document.createElement('div');
@ -1040,3 +1046,59 @@ A completely custom indicator can be added by simply providing a DOM element to
        element: domNode
    });
 ```
+
+## Included Plugins
+
+Open MCT is packaged along with a few general-purpose plugins:
+
+* `openmct.plugins.Conductor` provides a user interface for working with time
+within the application. If activated, configuration must be provided. This is 
+detailed in the section on [Time Conductor Configuration](#time-conductor-configuration).
+* `openmct.plugins.CouchDB` is an adapter for using CouchDB for persistence
+  of user-created objects. This is a constructor that takes the URL for the
+  CouchDB database as a parameter, e.g.
+```javascript
+openmct.install(openmct.plugins.CouchDB('http://localhost:5984/openmct'))
+```
+* `openmct.plugins.Elasticsearch` is an adapter for using Elasticsearch for
+  persistence of user-created objects. This is a
+  constructor that takes the URL for the Elasticsearch instance as a
+  parameter. eg.
+```javascript
+openmct.install(openmct.plugins.CouchDB('http://localhost:9200'))
+```
+* `openmct.plugins.Espresso` and `openmct.plugins.Snow` are two different
+  themes (dark and light) available for Open MCT. Note that at least one
+  of these themes must be installed for Open MCT to appear correctly.
+* `openmct.plugins.URLIndicator` adds an indicator which shows the
+availability of a URL with the following options: 
+  - `url` : URL to indicate the status of
+  - `iconClass`: Icon to show in the status bar, defaults to `icon-database`, [list of all icons](https://nasa.github.io/openmct/style-guide/#/browse/styleguide:home?view=items)
+  - `interval`: Interval between checking the connection, defaults to `10000`
+  - `label` Name showing up as text in the status bar, defaults to url
+```javascript
+openmct.install(openmct.plugins.URLIndicator({
+  url: 'http://localhost:8080',
+    iconClass: 'check',
+    interval: 10000,
+    label: 'Localhost'
+ })
+);
+```
+* `openmct.plugins.LocalStorage` provides persistence of user-created
+  objects in browser-local storage. This is particularly useful in
+  development environments.
+* `openmct.plugins.MyItems` adds a top-level folder named "My Items"
+  when the application is first started, providing a place for a
+  user to store created items.
+* `openmct.plugins.UTCTimeSystem` provides a default time system for Open MCT.
+
+Generally, you will want to either install these plugins, or install
+different plugins that provide persistence and an initial folder
+hierarchy.
+
+eg.
+```javascript
+openmct.install(openmct.plugins.LocalStorage());
+openmct.install(openmct.plugins.MyItems());
+```
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,7 +0,0 @@
-# Open MCT License
-
-Open MCT, Copyright (c) 2014-2019, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
-
-Open MCT is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
--- a/LICENSES.md
+++ b/LICENSES.md
@ -0,0 +1,691 @@
+# Open MCT Licenses
+
+Open MCT, Copyright (c) 2014-2017, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
+
+Open MCT is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+Open MCT includes source code licensed under additional open source licenses as follows.
+
+## Software Components Licenses
+
+This software includes components released under the following licenses:
+
+---
+
+### SuperSocket
+
+#### Info
+
+* Link: https://supersocket.codeplex.com/
+
+* Version: 0.9.0.2
+
+* Author: Kerry Jiang
+
+* Description: Supports SuperWebSocket
+
+#### License
+
+Copyright 2012 Kerry Jiang (kerry-jiang@hotmail.com)
+
+SuperSocket 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.
+
+---
+
+### SuperWebSocket
+
+#### Info
+
+* Link: https://superswebocket.codeplex.com/
+
+* Version: 0.9.0.2
+
+* Author: Kerry Jiang
+
+* Description: WebSocket implementation for client-server communication
+
+#### License
+
+Copyright 2010-2013 Kerry Jiang (kerry-jiang@hotmail.com)
+
+SuperWebSocket 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.
+
+
+---
+
+### log4net
+
+#### Info
+
+* Link: http://logging.apache.org/log4net/
+
+* Version: 1.2.13
+
+* Author: Apache Software Foundation
+
+* Description: Logging.
+
+#### License
+
+Copyright © 2004-2015 Apache Software Foundation.
+
+log4net 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.
+
+---
+
+### Blanket.js
+
+#### Info
+
+* Link: http://blanketjs.org/
+
+* Version: 1.1.5
+
+* Author: Alex Seville
+
+* Description: Code coverage measurement and reporting
+
+#### License
+
+Copyright (c) 2013 Alex Seville
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### Jasmine
+
+#### Info
+
+* Link: http://jasmine.github.io/
+
+* Version: 1.3.1
+
+* Author: Pivotal Labs
+
+* Description: Unit testing
+
+#### License
+
+Copyright (c) 2008-2011 Pivotal Labs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### RequireJS
+
+#### Info
+
+* Link: http://requirejs.org/
+
+* Version: 2.1.22
+
+* Author: The Dojo Foundation
+
+* Description: Script loader
+
+#### License
+
+Copyright (c) 2010-2015, The Dojo Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### requirejs-text
+
+#### Info
+
+* Link: https://github.com/requirejs/text
+
+* Version: 2.0.14
+
+* Author: The Dojo Foundation
+
+* Description: Text loading plugin for RequireJS
+
+#### License
+
+Copyright (c) 2010-2014, The Dojo Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+---
+
+### AngularJS
+
+#### Info
+
+* Link: http://angularjs.org/
+
+* Version: 1.4.4
+
+* Author: Google
+
+* Description: Client-side web application framework
+
+#### License
+
+Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### Angular-Route
+
+#### Info
+
+* Link: http://angularjs.org/
+
+* Version: 1.4.4
+
+* Author: Google
+
+* Description: Client-side view routing
+
+#### License
+
+Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### ES6-Promise
+
+#### Info
+
+* Link: https://github.com/jakearchibald/es6-promise
+
+* Version: 3.0.2
+
+* Authors: Yehuda Katz, Tom Dale, Stefan Penner and contributors
+
+* Description: Promise polyfill for pre-ECMAScript 6 browsers
+
+#### License
+
+Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### screenfull.js
+
+#### Info
+
+* Link: https://github.com/sindresorhus/screenfull.js/
+
+* Version: 3.0.0
+
+* Author: Sindre Sorhus
+
+* Description: Wrapper for cross-browser usage of fullscreen API
+
+#### License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### Math.uuid.js
+
+#### Info
+
+* Link: https://github.com/broofa/node-uuid
+
+* Version: 1.4.7
+
+* Author: Robert Kieffer
+
+* Description: Unique identifer generation.
+
+#### License
+
+Copyright (c) 2010-2012 Robert Kieffer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### Normalize.css
+
+#### Info
+
+* Link: https://github.com/necolas/normalize.css
+
+* Version: 1.1.2
+
+* Authors: Nicolas Gallagher, Jonathan Neal
+
+* Description: Browser style normalization
+
+#### License
+
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### Moment.js
+
+#### Info
+
+* Link: http://momentjs.com
+
+* Version: 2.11.1
+
+* Authors: Tim Wood, Iskren Chernev, Moment.js contributors
+
+* Description: Time/date parsing/formatting
+
+#### License
+
+Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### moment-duration-format
+
+#### Info
+
+* Link: https://github.com/jsmreese/moment-duration-format
+
+* Version: 1.3.0
+
+* Authors: John Madhavan-Reese
+
+* Description: Duration parsing/formatting
+
+#### License
+
+Copyright 2014 John Madhavan-Reese
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### CSV.js
+
+#### Info
+
+* Link: https://github.com/knrz/CSV.js
+
+* Version: 3.6.4
+
+* Authors: Kash Nouroozi
+
+* Description: Encoder for CSV (comma separated values) export
+
+#### License
+
+Copyright (c) 2014 Kash Nouroozi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+---
+
+### FileSaver.js
+
+#### Info
+
+* Link: https://github.com/eligrey/FileSaver.js/
+
+* Version: 0.0.2
+
+* Authors: Eli Grey
+
+* Description: File download initiator (for file exports)
+
+#### License
+
+Copyright © 2015 Eli Grey.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### Zepto
+
+#### Info
+
+* Link: http://zeptojs.com/
+
+* Version: 1.1.6
+
+* Authors: Thomas Fuchs
+
+* Description: DOM manipulation
+
+#### License
+
+Copyright (c) 2010-2016 Thomas Fuchs
+http://zeptojs.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### Json.NET
+
+#### Info
+
+* Link: http://www.newtonsoft.com/json
+
+* Version: 6.0.8
+
+* Author: Newtonsoft
+
+* Description: JSON serialization/deserialization
+
+#### License
+
+Copyright (c) 2007 James Newton-King
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### Nancy
+
+#### Info
+
+* Link: http://nancyfx.org
+
+* Version: 0.23.2
+
+* Author: Andreas Håkansson, Steven Robbins and contributors
+
+* Description: Embedded web server
+
+#### License
+
+Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### Nancy.Hosting.Self
+
+#### Info
+
+* Link: http://nancyfx.org
+
+* Version: 0.23.2
+
+* Author: Andreas Håkansson, Steven Robbins and contributors
+
+* Description: Embedded web server
+
+#### License
+
+Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+### Almond
+
+* Link: https://github.com/requirejs/almond
+
+* Version: 0.3.3
+
+* Author: jQuery Foundation
+
+* Description: Lightweight RequireJS replacement for builds
+
+#### License
+
+Copyright jQuery Foundation and other contributors, https://jquery.org/
+
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/requirejs/almond
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====
+
+Copyright and related rights for sample code are waived via CC0. Sample
+code is defined as all source code displayed within the prose of the
+documentation.
+
+CC0: http://creativecommons.org/publicdomain/zero/1.0/
+
+====
+
+Files located in the node_modules directory, and certain utilities used
+to build or test the software in the test and dist directories, are
+externally maintained libraries used by this software which have their own
+licenses; we recommend you read them, as their terms may differ from the
+terms above.
+
+
+### Lodash
+
+* Link: https://lodash.com
+
+* Version: 3.10.1
+
+* Author: Dojo Foundation
+
+* Description: Utility functions
+
+#### License
+
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+### EventEmitter3
+
+* Link: https://github.com/primus/eventemitter3
+
+* Version: 1.2.0
+
+* Author: Arnout Kazemier
+
+* Description: Event-driven programming support
+
+#### License
+
+The MIT License (MIT)
+
+Copyright (c) 2014 Arnout Kazemier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- 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/app.js
+++ b/app.js
@ -16,7 +16,7 @@ const request = require('request');

 // Defaults
 options.port = options.port || options.p || 8080;
-options.host = options.host || 'localhost';
+options.host = options.host || options.h || 'localhost';
 options.directory = options.directory || options.D || '.';

 // Show command line options
--- a/copyright-notice.html
+++ b/copyright-notice.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2020, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@ -18,4 +18,4 @@
 licenses. See the Open Source Licenses file (LICENSES.md) included with
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
-->
+-->
--- a/copyright-notice.js
+++ b/copyright-notice.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@ -18,4 +18,4 @@
 * licenses. See the Open Source Licenses file (LICENSES.md) included with
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
- *****************************************************************************/
+ *****************************************************************************/
--- a/docs/src/index.md
+++ b/docs/src/index.md
@ -33,5 +33,5 @@ As we transition to a new API, the following documentation for the old API
 * The [Developer's Guide](guide/) goes into more detail about how to use the
 platform and the functionality that it provides.

- * The [Tutorials](https://github.com/nasa/openmct-tutorial) give examples of extending the platform to add
+ * The [Tutorials](tutorials/) give examples of extending the platform to add
 functionality, and integrate with data sources.
--- a/docs/src/tutorials/images/add-task.png
+++ b/docs/src/tutorials/images/add-task.png
--- a/docs/src/tutorials/images/bar-plot-2.png
+++ b/docs/src/tutorials/images/bar-plot-2.png
--- a/docs/src/tutorials/images/bar-plot-3.png
+++ b/docs/src/tutorials/images/bar-plot-3.png
--- a/docs/src/tutorials/images/bar-plot-4.png
+++ b/docs/src/tutorials/images/bar-plot-4.png
--- a/docs/src/tutorials/images/bar-plot.png
+++ b/docs/src/tutorials/images/bar-plot.png
--- a/docs/src/tutorials/images/chrome.png
+++ b/docs/src/tutorials/images/chrome.png
--- a/docs/src/tutorials/images/remove-task.png
+++ b/docs/src/tutorials/images/remove-task.png
--- a/docs/src/tutorials/images/telemetry-1.png
+++ b/docs/src/tutorials/images/telemetry-1.png
--- a/docs/src/tutorials/images/telemetry-2.png
+++ b/docs/src/tutorials/images/telemetry-2.png
--- a/docs/src/tutorials/images/telemetry-3.png
+++ b/docs/src/tutorials/images/telemetry-3.png
--- a/docs/src/tutorials/images/todo-edit.png
+++ b/docs/src/tutorials/images/todo-edit.png
--- a/docs/src/tutorials/images/todo-list.png
+++ b/docs/src/tutorials/images/todo-list.png
--- a/docs/src/tutorials/images/todo-restyled.png
+++ b/docs/src/tutorials/images/todo-restyled.png
--- a/docs/src/tutorials/images/todo-selection.png
+++ b/docs/src/tutorials/images/todo-selection.png
--- a/docs/src/tutorials/images/todo.png
+++ b/docs/src/tutorials/images/todo.png
--- a/docs/src/tutorials/index.md
+++ b/docs/src/tutorials/index.md
--- 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/GeneratorMetadataProvider.js
+++ b/example/generator/GeneratorMetadataProvider.js
@ -9,8 +9,7 @@ define([
            values: [
                {
                    key: "name",
-                    name: "Name",
-                    format: "string"
+                    name: "Name"
                },
                {
                    key: "utc",
--- a/example/generator/GeneratorProvider.js
+++ b/example/generator/GeneratorProvider.js
@ -31,7 +31,6 @@ define([
        period: 10,
        offset: 0,
        dataRateInHz: 1,
-        randomness: 0,
        phase: 0
    };

@ -54,7 +53,6 @@ define([
            'offset',
            'dataRateInHz',
            'phase',
-            'randomness'
        ];

        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
@ -65,8 +65,8 @@
                        name: data.name,
                        utc: nextStep,
                        yesterday: nextStep - 60*60*24*1000,
-                        sin: sin(nextStep, data.period, data.amplitude, data.offset, data.phase, data.randomness),
-                        cos: cos(nextStep, data.period, data.amplitude, data.offset, data.phase, data.randomness)
+                        sin: sin(nextStep, data.period, data.amplitude, data.offset, data.phase),
+                        cos: cos(nextStep, data.period, data.amplitude, data.offset, data.phase)
                    }
                });
                nextStep += step;
@ -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;
        }

@ -99,7 +99,6 @@
        var offset = request.offset;
        var dataRateInHz = request.dataRateInHz;
        var phase = request.phase;
-        var randomness = request.randomness;

        var step = 1000 / dataRateInHz;
        var nextStep = start - (start % step) + step;
@ -111,8 +110,8 @@
                name: request.name,
                utc: nextStep,
                yesterday: nextStep - 60*60*24*1000,
-                sin: sin(nextStep, period, amplitude, offset, phase, randomness),
-                cos: cos(nextStep, period, amplitude, offset, phase, randomness)
+                sin: sin(nextStep, period, amplitude, offset, phase),
+                cos: cos(nextStep, period, amplitude, offset, phase)
            });
        }
        self.postMessage({
@ -121,14 +120,14 @@
        });
    }

-    function cos(timestamp, period, amplitude, offset, phase, randomness) {
+    function cos(timestamp, period, amplitude, offset, phase) {
        return amplitude *
-            Math.cos(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
+            Math.cos(phase + (timestamp / period / 1000 * Math.PI * 2)) + offset;
    }

-    function sin(timestamp, period, amplitude, offset, phase, randomness) {
+    function sin(timestamp, period, amplitude, offset, phase) {
        return amplitude *
-            Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
+            Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + offset;
    }

    function sendError(error, message) {
--- 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",
@ -122,17 +122,6 @@ define([
                        "telemetry",
                        "phase"
                    ]
-                },
-                {
-                    name: "Randomness",
-                    control: "numberfield",
-                    cssClass: "l-input-sm l-numeric",
-                    key: "randomness",
-                    required: true,
-                    property: [
-                        "telemetry",
-                        "randomness"
-                    ]
                }
            ],
            initialize: function (object) {
@ -141,8 +130,7 @@ define([
                    amplitude: 1,
                    offset: 0,
                    dataRateInHz: 1,
-                    phase: 0,
-                    randomness: 0
+                    phase: 0
                };
            }
        });
--- a/example/identity/bundle.js
+++ b/example/identity/bundle.js
@ -22,28 +22,27 @@
 /*global define*/

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

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

 define([

-], function (
+], function(

 ) {
    function ImageryPlugin() {

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

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

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

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

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

--- a/example/msl/src/MSLDataDictionary.js
+++ b/example/msl/src/MSLDataDictionary.js
@ -76,4 +76,4 @@ define(
            ]
        };
    }
-);
+);
--- a/example/msl/src/RemsTelemetryModelProvider.js
+++ b/example/msl/src/RemsTelemetryModelProvider.js
@ -22,7 +22,7 @@
 /*global define*/

 define(
-    function () {
+    function (){
        "use strict";

        var PREFIX = "msl_tlm:",
@ -32,20 +32,20 @@ define(
                string: "string"
            };

-        function RemsTelemetryModelProvider(adapter) {
+        function RemsTelemetryModelProvider(adapter){

            function isRelevant(id) {
                return id.indexOf(PREFIX) === 0;
            }

-            function makeId(element) {
+            function makeId(element){
                return PREFIX + element.identifier;
            }

-            function buildTaxonomy(dictionary) {
+            function buildTaxonomy(dictionary){
                var models = {};

-                function addMeasurement(measurement, parent) {
+                function addMeasurement(measurement, parent){
                    var format = FORMAT_MAPPINGS[measurement.type];
                    models[makeId(measurement)] = {
                        type: "msl.measurement",
@ -73,12 +73,12 @@ define(
                        location: spacecraftId,
                        composition: measurements.map(makeId)
                    };
-                    measurements.forEach(function (measurement) {
+                    measurements.forEach(function(measurement) {
                        addMeasurement(measurement, instrumentId);
                    });
                }

-                (dictionary.instruments || []).forEach(function (instrument) {
+                (dictionary.instruments || []).forEach(function(instrument) {
                    addInstrument(instrument, "msl:curiosity");
                });
                return models;
--- a/example/msl/src/RemsTelemetryProvider.js
+++ b/example/msl/src/RemsTelemetryProvider.js
@ -72,10 +72,10 @@ define (
         * This data source does not support real-time subscriptions
         */
        RemsTelemetryProvider.prototype.subscribe = function (callback, requests) {
-            return function () {};
+            return function() {};
        };
        RemsTelemetryProvider.prototype.unsubscribe = function (callback, requests) {
-            return function () {};
+            return function() {};
        };

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

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

        return RemsTelemetrySeries;
--- a/example/msl/src/RemsTelemetryServerAdapter.js
+++ b/example/msl/src/RemsTelemetryServerAdapter.js
@ -68,18 +68,18 @@ define(
         * given request ID.
         * @private
         */
-        RemsTelemetryServerAdapter.prototype.requestHistory = function (request) {
+        RemsTelemetryServerAdapter.prototype.requestHistory = function(request) {
            var self = this,
                id = request.key;

            var dataTransforms = this.dataTransforms;

-            function processResponse(response) {
+            function processResponse(response){
                var data = [];
                /*
                 * History data is organised by Sol. Iterate over sols...
                 */
-                response.data.soles.forEach(function (solData) {
+                response.data.soles.forEach(function(solData){
                    /*
                     * Check that valid data exists
                     */
@ -106,13 +106,13 @@ define(

            //Filter results to match request parameters
            function filterResults(results) {
-                return results.filter(function (result) {
+                return results.filter(function(result){
                    return result.date >= (request.start || Number.MIN_VALUE) &&
                        result.date <= (request.end || Number.MAX_VALUE);
                });
            }

-            function packageAndResolve(results) {
+            function packageAndResolve(results){
                return {id: id, values: results};
            }

@ -132,7 +132,7 @@ define(
         * @param id The telemetry data point key to be queried.
         * @returns {Promise | Array<RemsTelemetryValue>} that resolves with an Array of {@link RemsTelemetryValue} objects for the request data key.
         */
-        RemsTelemetryServerAdapter.prototype.history = function (request) {
+        RemsTelemetryServerAdapter.prototype.history = function(request) {
            return this.requestHistory(request);
        };

--- a/example/notifications/bundle.js
+++ b/example/notifications/bundle.js
@ -27,65 +27,64 @@ define([
    "./src/DialogLaunchIndicator",
    "./src/NotificationLaunchIndicator",
    "./res/dialog-launch.html",
-    "./res/notification-launch.html"
+    "./res/notification-launch.html",
+    'legacyRegistry'
 ], function (
    DialogLaunchController,
    NotificationLaunchController,
    DialogLaunchIndicator,
    NotificationLaunchIndicator,
    DialogLaunch,
-    NotificationLaunch
+    NotificationLaunch,
+    legacyRegistry
 ) {
    "use strict";

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

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

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

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

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

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

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

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

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

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

--- a/example/simpleVuePlugin/plugin.js
+++ b/example/simpleVuePlugin/plugin.js
@ -1,8 +1,10 @@
 import Vue from 'Vue';
 import HelloWorld from './HelloWorld.vue';

-function SimpleVuePlugin() {
+function SimpleVuePlugin () {
    return function install(openmct) {
+        var views = (openmct.mainViews || openmct.objectViews);
+
        openmct.types.addType('hello-world', {
            name: 'Hello World',
            description: 'An introduction object',
--- a/example/styleguide/bundle.js
+++ b/example/styleguide/bundle.js
@ -8,7 +8,8 @@ define([
    "./res/templates/glyphs.html",
    "./res/templates/controls.html",
    "./res/templates/input.html",
-    "./res/templates/menus.html"
+    "./res/templates/menus.html",
+    'legacyRegistry'
 ], function (
    ExampleStyleGuideModelProvider,
    MCTExample,
@ -19,14 +20,13 @@ define([
    glyphsTemplate,
    controlsTemplate,
    inputTemplate,
-    menusTemplate
+    menusTemplate,
+    legacyRegistry
 ) {
-    return {
-        name:"example/styleguide",
-        definition: {
-            "name": "Open MCT Style Guide",
-            "description": "Examples and documentation illustrating UI styles in use in Open MCT.",
-            "extensions":
+    legacyRegistry.register("example/styleguide", {
+        "name": "Open MCT Style Guide",
+        "description": "Examples and documentation illustrating UI styles in use in Open MCT.",
+        "extensions":
        {
            "types": [
                { "key": "styleguide.intro", "name": "Introduction", "cssClass": "icon-page", "description": "Introduction and overview to the style guide" },
@ -103,6 +103,5 @@ define([
                }
            ]
        }
-        }
-    };
+    });
 });
--- a/example/styleguide/src/ExampleStyleGuideModelProvider.js
+++ b/example/styleguide/src/ExampleStyleGuideModelProvider.js
@ -30,14 +30,14 @@ define(
            var pages = {};

            // Add pages
-            pages.intro = { name: "Introduction", type: "styleguide.intro", location: "styleguide:home" };
-            pages.standards = { name: "Standards", type: "styleguide.standards", location: "styleguide:home" };
-            pages.colors = { name: "Colors", type: "styleguide.colors", location: "styleguide:home" };
-            pages.glyphs = { name: "Glyphs", type: "styleguide.glyphs", location: "styleguide:home" };
-            pages.status = { name: "Status Indication", type: "styleguide.status", location: "styleguide:home" };
-            pages.controls = { name: "Controls", type: "styleguide.controls", location: "styleguide:ui-elements" };
-            pages.input = { name: "Text Inputs", type: "styleguide.input", location: "styleguide:ui-elements" };
-            pages.menus = { name: "Menus", type: "styleguide.menus", location: "styleguide:ui-elements" };
+            pages['intro'] = { name: "Introduction", type: "styleguide.intro", location: "styleguide:home" };
+            pages['standards'] = { name: "Standards", type: "styleguide.standards", location: "styleguide:home" };
+            pages['colors'] = { name: "Colors", type: "styleguide.colors", location: "styleguide:home" };
+            pages['glyphs'] = { name: "Glyphs", type: "styleguide.glyphs", location: "styleguide:home" };
+            pages['status'] = { name: "Status Indication", type: "styleguide.status", location: "styleguide:home" };
+            pages['controls'] = { name: "Controls", type: "styleguide.controls", location: "styleguide:ui-elements" };
+            pages['input'] = { name: "Text Inputs", type: "styleguide.input", location: "styleguide:ui-elements" };
+            pages['menus'] = { name: "Menus", type: "styleguide.menus", location: "styleguide:ui-elements" };

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

        return ExampleStyleGuideModelProvider
    }
-);
+);
--- a/index.html
+++ b/index.html
@ -38,12 +38,11 @@
        const THIRTY_MINUTES = 30 * 60 * 1000;

        [
-            'example/eventGenerator'
+            'example/eventGenerator',
+            'example/styleguide'
        ].forEach(
            openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
        );
-
-        openmct.install(openmct.plugins.Espresso());
        openmct.install(openmct.plugins.MyItems());
        openmct.install(openmct.plugins.LocalStorage());
        openmct.install(openmct.plugins.Generator());
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "openmct",
-  "version": "1.0.0-snapshot",
+  "version": "1.0.0-beta",
  "description": "The Open MCT core platform",
  "dependencies": {},
  "devDependencies": {
@ -11,7 +11,6 @@
    "comma-separated-values": "^3.6.4",
    "concurrently": "^3.6.1",
    "copy-webpack-plugin": "^4.5.2",
-    "cross-env": "^6.0.3",
    "css-loader": "^1.0.0",
    "d3-array": "1.2.x",
    "d3-axis": "1.0.x",
@ -24,7 +23,6 @@
    "d3-time": "1.0.x",
    "d3-time-format": "2.1.x",
    "eslint": "5.2.0",
-    "eslint-plugin-vue": "^6.0.0",
    "eventemitter3": "^1.2.0",
    "exports-loader": "^0.7.0",
    "express": "^4.13.1",
@ -63,8 +61,7 @@
    "raw-loader": "^0.5.1",
    "request": "^2.69.0",
    "split": "^1.0.0",
-    "style-loader": "^1.0.1",
-    "uuid": "^3.3.3",
+    "style-loader": "^0.21.0",
    "v8-compile-cache": "^1.1.0",
    "vue": "2.5.6",
    "vue-loader": "^15.2.6",
@ -77,13 +74,13 @@
  },
  "scripts": {
    "start": "node app.js",
-    "lint": "eslint platform example src/**/*.{js,vue} openmct.js",
-    "lint:fix": "eslint platform example src/**/*.{js,vue} openmct.js --fix",
-    "build:prod": "cross-env NODE_ENV=production webpack",
+    "lint": "eslint platform src openmct.js",
+    "lint:fix": "eslint platform src openmct.js --fix",
+    "build:prod": "NODE_ENV=production webpack",
    "build:dev": "webpack",
    "build:watch": "webpack --watch",
    "test": "karma start --single-run",
-    "test-debug": "cross-env NODE_ENV=debug karma start --no-single-run",
+    "test-debug": "NODE_ENV=debug karma start --no-single-run",
    "test:watch": "karma start --no-single-run",
    "verify": "concurrently 'npm:test' 'npm:lint'",
    "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
--- a/platform/commonUI/about/bundle.js
+++ b/platform/commonUI/about/bundle.js
@ -31,7 +31,8 @@ define([
    "./res/templates/license-apache.html",
    "./res/templates/license-mit.html",
    "./res/templates/licenses.html",
-    "./res/templates/licenses-export-md.html"
+    "./res/templates/licenses-export-md.html",
+    'legacyRegistry'
 ], function (
    aboutDialogTemplate,
    LogoController,
@ -43,139 +44,137 @@ define([
    licenseApacheTemplate,
    licenseMitTemplate,
    licensesTemplate,
-    licensesExportMdTemplate
+    licensesExportMdTemplate,
+    legacyRegistry
 ) {

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

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

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

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

    SaveInProgressDialog.prototype.show = function () {
        this.dialog = this.dialogService.showBlockingMessage({
-            title: "Saving",
+            title: "Saving...",
            hint: "Do not navigate away from this page or close this browser tab while this message is displayed.",
            unknownProgress: true,
            severity: "info",
--- a/platform/commonUI/formats/bundle.js
+++ b/platform/commonUI/formats/bundle.js
@ -23,57 +23,56 @@
 define([
    "./src/FormatProvider",
    "./src/UTCTimeFormat",
-    "./src/DurationFormat"
+    "./src/DurationFormat",
+    'legacyRegistry'
 ], function (
    FormatProvider,
    UTCTimeFormat,
-    DurationFormat
+    DurationFormat,
+    legacyRegistry
 ) {

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

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

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

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

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

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

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

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

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

            return this.$q.when(
                (actions && actions.length > 0) ?
-                    actions[0].perform(flag) :
+                    actions[0].perform() :
                    undefined
            );
        };
--- 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/src/services/MoveService.js
+++ b/platform/entanglement/src/services/MoveService.js
@ -91,7 +91,7 @@ define(
                .then(function () {
                    return object
                        .getCapability('action')
-                        .perform('remove', true);
+                        .perform('remove');
                });
        };

--- a/platform/entanglement/test/services/MoveServiceSpec.js
+++ b/platform/entanglement/test/services/MoveServiceSpec.js
@ -227,11 +227,10 @@ define(
                            locationPromise.resolve();
                        });

-                        it("removes object from parent without user warning dialog", function () {
+                        it("removes object from parent", function () {
                            expect(actionCapability.perform)
-                                .toHaveBeenCalledWith('remove', true);
+                                .toHaveBeenCalledWith('remove');
                        });
-
                    });

                });
@ -248,9 +247,9 @@ define(
                            .toHaveBeenCalled();
                    });

-                    it("removes object from parent without user warning dialog", function () {
+                    it("removes object from parent", function () {
                        expect(actionCapability.perform)
-                            .toHaveBeenCalledWith('remove', true);
+                            .toHaveBeenCalledWith('remove');
                    });
                });

--- a/platform/execution/bundle.js
+++ b/platform/execution/bundle.js
@ -21,26 +21,25 @@
 *****************************************************************************/

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

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

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

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

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

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

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

-                    }
-                ],
-                "views": [
-                    {
-                        "key": "hyperlink",
-                        "type": "hyperlink",
-                        "name": "Hyperlink Display",
-                        "template": hyperlinkTemplate,
-                        "editable": false
-                    }
-                ],
-                "controllers": [
-                    {
-                        "key": "HyperlinkController",
-                        "implementation": HyperlinkController,
-                        "depends": ["$scope"]
-                    }
-                ]
-            }
+                }
+            ],
+            "views": [
+                {
+                    "key": "hyperlink",
+                    "type": "hyperlink",
+                    "name": "Hyperlink Display",
+                    "template": hyperlinkTemplate,
+                    "editable": false
+                }
+            ],
+            "controllers": [
+                {
+                    "key": "HyperlinkController",
+                    "implementation": HyperlinkController,
+                    "depends": ["$scope"]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/features/imagery/bundle.js
+++ b/platform/features/imagery/bundle.js
@ -0,0 +1,85 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    "./src/policies/ImageryViewPolicy",
+    "./src/controllers/ImageryController",
+    "./src/directives/MCTBackgroundImage",
+    "./res/templates/imagery.html",
+    'legacyRegistry'
+], function (
+    ImageryViewPolicy,
+    ImageryController,
+    MCTBackgroundImage,
+    imageryTemplate,
+    legacyRegistry
+) {
+
+    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/res/templates/imagery.html
+++ b/platform/features/imagery/res/templates/imagery.html
@ -0,0 +1,58 @@
+<div class="t-imagery c-imagery" ng-controller="ImageryController as imagery">
+    <mct-split-pane class='abs' anchor="bottom" alias="imagery">
+    <div class="split-pane-component has-local-controls l-image-main-wrapper l-flex-col">
+        <div class="h-local-controls h-local-controls--overlay-content c-local-controls--show-on-hover l-flex-row c-imagery__lc">
+            <span class="holder flex-elem grows c-imagery__lc__sliders">
+                <input class="icon-brightness" type="range"
+                       min="0"
+                       max="500"
+                       ng-model="filters.brightness" />
+                <input class="icon-contrast" type="range"
+                       min="0"
+                       max="500"
+                       ng-model="filters.contrast" />
+            </span>
+            <span class="holder flex-elem t-reset-btn-holder c-imagery__lc__reset-btn">
+                <a class="s-icon-button icon-reset t-btn-reset"
+                   ng-click="filters = { brightness: 100, contrast: 100 }"></a>
+            </span>
+        </div>
+
+        <div class="l-image-main s-image-main flex-elem grows"
+             ng-class="{ paused: imagery.paused(), stale:false }">
+            <div class="image-main"
+
+            mct-background-image="imagery.getImageUrl()"
+            filters="filters">
+            </div>
+        </div>
+
+        <div class="l-image-main-controlbar flex-elem l-flex-row">
+            <div class="l-datetime-w flex-elem grows">
+                <a class="c-button show-thumbs sm hidden icon-thumbs-strip"
+                    ng-click="showThumbsBubble = (showThumbsBubble) ? false:true"></a>
+                <span class="l-time">{{imagery.getTime()}}</span>
+            </div>
+            <div class="h-local-controls flex-elem">
+                <a class="c-button icon-pause pause-play"
+                    ng-click="imagery.paused(!imagery.paused())"
+                    ng-class="{ 'is-paused': imagery.paused() }"></a>
+                <a href=""
+                    class="s-button l-mag s-mag vsm icon-reset"
+                    ng-click="clipped = false"
+                    ng-show="clipped === true"
+                    title="Not all of image is visible; click to reset."></a>
+            </div>
+        </div>
+    </div>
+    <mct-splitter></mct-splitter>
+    <div class="split-pane-component l-image-thumbs-wrapper">
+        <div class="l-image-thumb-item" ng-class="{selected: image.selected}" ng-repeat="image in imageHistory track by $index" 
+            ng-click="imagery.setSelectedImage(image)"  ng-init="imagery.scrollToBottom()">
+            <img class="l-thumb" 
+                ng-src={{imagery.getImageUrl(image)}}>
+            <div class="l-time">{{imagery.getTime(image)}}</div>
+        </div>
+    </div>
+    </mct-split-pane>
+</div>
--- a/platform/features/imagery/src/controllers/ImageryController.js
+++ b/platform/features/imagery/src/controllers/ImageryController.js
@ -0,0 +1,284 @@
+/*****************************************************************************
+ * 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 views of image telemetry.
+ * @namespace platform/features/imagery
+ */
+
+define(
+    [
+        'zepto',
+        'lodash'
+    ],
+    function ($, _) {
+
+        /**
+         * Controller for the "Imagery" view of a domain object which
+         * provides image telemetry.
+         * @constructor
+         * @memberof platform/features/imagery
+         */
+
+        function ImageryController($scope, $window, element, openmct) {
+            this.$scope = $scope;
+            this.$window = $window;
+            this.openmct = openmct;
+            this.date = "";
+            this.time = "";
+            this.zone = "";
+            this.imageUrl = "";
+            this.requestCount = 0;
+            this.scrollable = $(".l-image-thumbs-wrapper");
+            this.autoScroll = openmct.time.clock() ? true : false;
+            this.$scope.imageHistory = [];
+            this.$scope.filters = {
+                brightness: 100,
+                contrast: 100
+            };
+
+            this.subscribe = this.subscribe.bind(this);
+            this.stopListening = this.stopListening.bind(this);
+            this.updateValues = this.updateValues.bind(this);
+            this.updateHistory = this.updateHistory.bind(this);
+            this.onBoundsChange = this.onBoundsChange.bind(this);
+            this.onScroll = this.onScroll.bind(this);
+            this.setSelectedImage = this.setSelectedImage.bind(this);
+
+            this.subscribe(this.$scope.domainObject);
+
+            this.$scope.$on('$destroy', this.stopListening);
+            this.openmct.time.on('bounds', this.onBoundsChange);
+            this.scrollable.on('scroll', this.onScroll);
+        }
+
+        ImageryController.prototype.subscribe = function (domainObject) {
+            this.date = "";
+            this.imageUrl = "";
+            this.openmct.objects.get(domainObject.getId())
+                .then(function (object) {
+                    this.domainObject = object;
+                    var metadata = this.openmct
+                        .telemetry
+                        .getMetadata(this.domainObject);
+                    this.timeKey = this.openmct.time.timeSystem().key;
+                    this.timeFormat = this.openmct
+                        .telemetry
+                        .getValueFormatter(metadata.value(this.timeKey));
+                    this.imageFormat = this.openmct
+                        .telemetry
+                        .getValueFormatter(metadata.valuesForHints(['image'])[0]);
+                    this.unsubscribe = this.openmct.telemetry
+                        .subscribe(this.domainObject, function (datum) {
+                            this.updateHistory(datum);
+                            this.updateValues(datum);
+                        }.bind(this));
+
+                    this.requestHistory(this.openmct.time.bounds());
+                }.bind(this));
+        };
+
+        ImageryController.prototype.requestHistory = function (bounds) {
+            this.requestCount++;
+            this.$scope.imageHistory = [];
+            var requestId = this.requestCount;
+            this.openmct.telemetry
+                .request(this.domainObject, bounds)
+                .then(function (values) {
+                    if (this.requestCount > requestId) {
+                        return Promise.resolve('Stale request');
+                    }
+
+                    values.forEach(function (datum) {
+                        this.updateHistory(datum);
+                    }, this);
+
+                    this.updateValues(values[values.length - 1]);
+                }.bind(this));
+        };
+
+        ImageryController.prototype.stopListening = function () {
+            this.openmct.time.off('bounds', this.onBoundsChange);
+            this.scrollable.off('scroll', this.onScroll);
+            if (this.unsubscribe) {
+                this.unsubscribe();
+                delete this.unsubscribe;
+            }
+        };
+
+        /**
+         * Responds to bound change event be requesting new
+         * historical data if the bound change was manual.
+         * @private
+         * @param {object} [newBounds] new bounds object
+         * @param {boolean} [tick] true when change is automatic
+         */
+        ImageryController.prototype.onBoundsChange = function (newBounds, tick) {
+            if (this.domainObject && !tick) {
+                this.requestHistory(newBounds);
+            }
+        };
+
+        /**
+         * Updates displayable values to match those of the most
+         * recently received datum.
+         * @param {object} [datum] the datum
+         * @private
+         */
+        ImageryController.prototype.updateValues = function (datum) {
+            if (this.isPaused) {
+                this.nextDatum = datum;
+                return;
+            }
+            this.time = this.timeFormat.format(datum);
+            this.imageUrl = this.imageFormat.format(datum);
+
+        };
+
+        /**
+         * Appends given imagery datum to running history.
+         * @private
+         * @param {object} [datum] target telemetry datum
+         * @returns {boolean} falsy when a duplicate datum is given
+         */
+        ImageryController.prototype.updateHistory = function (datum) {
+            if (!this.datumMatchesMostRecent(datum)) {
+                var index = _.sortedIndex(this.$scope.imageHistory, datum, this.timeFormat.format.bind(this.timeFormat));
+                this.$scope.imageHistory.splice(index, 0, datum);
+                return true;
+            } else {
+                return false;
+            }
+        };
+
+        /**
+         * Checks to see if the given datum is the same as the most recent in history.
+         * @private
+         * @param {object} [datum] target telemetry datum
+         * @returns {boolean} true if datum is most recent in history, false otherwise
+         */
+        ImageryController.prototype.datumMatchesMostRecent = function (datum) {
+            if (this.$scope.imageHistory.length !== 0) {
+                var datumTime = this.timeFormat.format(datum);
+                var datumURL = this.imageFormat.format(datum);
+                var lastHistoryTime = this.timeFormat.format(this.$scope.imageHistory.slice(-1)[0]);
+                var lastHistoryURL = this.imageFormat.format(this.$scope.imageHistory.slice(-1)[0]);
+
+                return datumTime === lastHistoryTime && datumURL === lastHistoryURL;
+            }
+            return false;
+        };
+
+        ImageryController.prototype.onScroll = function (event) {
+            this.$window.requestAnimationFrame(function () {
+                var thumbnailWrapperHeight = this.scrollable[0].offsetHeight;
+                var thumbnailWrapperWidth = this.scrollable[0].offsetWidth;
+                if (this.scrollable[0].scrollLeft <
+                    (this.scrollable[0].scrollWidth - this.scrollable[0].clientWidth) - (thumbnailWrapperWidth) ||
+                    this.scrollable[0].scrollTop <
+                    (this.scrollable[0].scrollHeight - this.scrollable[0].clientHeight) - (thumbnailWrapperHeight)) {
+                    this.autoScroll = false;
+                } else {
+                    this.autoScroll = true;
+                }
+            }.bind(this));
+        };
+
+        /**
+         *  Force history imagery div to scroll to bottom.
+         */
+        ImageryController.prototype.scrollToBottom = function () {
+            if (this.autoScroll) {
+                this.scrollable[0].scrollTop = this.scrollable[0].scrollHeight;
+            }
+        };
+
+
+        /**
+         * Get the time portion (hours, minutes, seconds) of the
+         * timestamp associated with the incoming image telemetry
+         * if no parameter is given, or of a provided datum.
+         * @param {object} [datum] target telemetry datum
+         * @returns {string} the time
+         */
+        ImageryController.prototype.getTime = function (datum) {
+            return datum ?
+                this.timeFormat.format(datum) :
+                this.time;
+        };
+
+        /**
+         * Get the URL of the most recent image telemetry if no
+         * parameter is given, or of a provided datum.
+         * @param {object} [datum] target telemetry datum
+         * @returns {string} URL for telemetry image
+         */
+        ImageryController.prototype.getImageUrl = function (datum) {
+            return datum ?
+                this.imageFormat.format(datum) :
+                this.imageUrl;
+        };
+
+        /**
+         * Getter-setter for paused state of the view (true means
+         * paused, false means not.)
+         * @param {boolean} [state] the state to set
+         * @returns {boolean} the current state
+         */
+        ImageryController.prototype.paused = function (state) {
+            if (arguments.length > 0 && state !== this.isPaused) {
+                this.unselectAllImages();
+                this.isPaused = state;
+                if (this.nextDatum) {
+                    this.updateValues(this.nextDatum);
+                    delete this.nextDatum;
+                } else {
+                    this.updateValues(this.$scope.imageHistory[this.$scope.imageHistory.length - 1]);
+                }
+                this.autoScroll = true;
+            }
+            return this.isPaused;
+        };
+
+        /**
+         * Set the selected image on the state for the large imagery div to use.
+         * @param {object} [image] the image object to get url from.
+         */
+        ImageryController.prototype.setSelectedImage = function (image) {
+            this.imageUrl = this.getImageUrl(image);
+            this.time = this.getTime(image);
+            this.paused(true);
+            this.unselectAllImages();
+            image.selected = true;
+        };
+
+        /**
+         * Loop through the history imagery data to set all images to unselected.
+         */
+        ImageryController.prototype.unselectAllImages = function () {
+            for (var i = 0; i < this.$scope.imageHistory.length; i++) {
+                this.$scope.imageHistory[i].selected = false;
+            }
+        };
+        return ImageryController;
+    }
+);
--- a/platform/features/imagery/src/directives/MCTBackgroundImage.js
+++ b/platform/features/imagery/src/directives/MCTBackgroundImage.js
@ -0,0 +1,110 @@
+/*****************************************************************************
+ * 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 () {
+
+        /**
+         * Defines the `mct-background-image` directive.
+         *
+         * Used as an attribute, this will set the `background-image`
+         * property to the URL given in its value, but only after that
+         * image has loaded; this avoids "flashing" as images change.
+         *
+         * If the value of `mct-background-image`is falsy, no image
+         * will be displayed (immediately.)
+         *
+         * Optionally, a `filters` attribute may be specified as an
+         * object with `brightness` and/or `contrast` properties,
+         * whose values are percentages. A value of 100 will make
+         * no changes to the image's brightness or contrast.
+         *
+         * @constructor
+         * @memberof platform/features/imagery
+         */
+        function MCTBackgroundImage($document) {
+            function link(scope, element) {
+                // General strategy here:
+                // - Keep count of how many images have been requested; this
+                //   counter will be used as an internal identifier or sorts
+                //   for each image that loads.
+                // - As the src attribute changes, begin loading those images.
+                // - When images do load, update the background-image property
+                //   of the element, but only if a more recently
+                //   requested image has not already been loaded.
+                // The order in which URLs are passed in and the order
+                // in which images are actually loaded may be different, so
+                // some strategy like this is necessary to ensure that images
+                // do not display out-of-order.
+                var requested = 0, loaded = 0;
+
+                function updateFilters(filters) {
+                    var styleValue = filters ?
+                        Object.keys(filters).map(function (k) {
+                            return k + "(" + filters[k] + "%)";
+                        }).join(' ') :
+                        "";
+                    element.css('filter', styleValue);
+                    element.css('webkitFilter', styleValue);
+                }
+
+                function nextImage(url) {
+                    var myCounter = requested,
+                        image;
+
+                    function useImage() {
+                        if (loaded <= myCounter) {
+                            loaded = myCounter;
+                            element.css('background-image', "url('" + url + "')");
+                        }
+                    }
+
+                    if (!url) {
+                        loaded = myCounter;
+                        element.css('background-image', 'none');
+                    } else {
+                        image = $document[0].createElement('img');
+                        image.src = url;
+                        image.onload = useImage;
+                    }
+
+                    requested += 1;
+                }
+
+                scope.$watch('mctBackgroundImage', nextImage);
+                scope.$watchCollection('filters', updateFilters);
+            }
+
+            return {
+                restrict: "A",
+                scope: {
+                    mctBackgroundImage: "=",
+                    filters: "="
+                },
+                link: link
+            };
+        }
+
+        return MCTBackgroundImage;
+    }
+);
+
--- a/platform/features/imagery/src/policies/ImageryViewPolicy.js
+++ b/platform/features/imagery/src/policies/ImageryViewPolicy.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@ -19,50 +19,41 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-import { TRIGGER } from "./constants";

-export const evaluateResults = (results, trigger) => {
-    if (trigger && trigger === TRIGGER.XOR) {
-        return matchExact(results, 1);
-    } else if (trigger && trigger === TRIGGER.NOT) {
-        return matchExact(results, 0);
-    } else if (trigger && trigger === TRIGGER.ALL) {
-        return matchAll(results);
-    } else {
-        return matchAny(results);
-    }
-}
-
-function matchAll(results) {
-    for (const result of results) {
-        if (!result) {
-            return false;
-        }
+define([
+    '../../../../../src/api/objects/object-utils'
+], function (
+    objectUtils
+) {
+    /**
+     * Policy preventing the Imagery view from being made available for
+     * domain objects which do not have associated image telemetry.
+     * @implements {Policy.<View, DomainObject>}
+     * @constructor
+     */
+    function ImageryViewPolicy(openmct) {
+        this.openmct = openmct;
    }

-    return true;
-}
+    ImageryViewPolicy.prototype.hasImageTelemetry = function (domainObject) {
+        var newDO = objectUtils.toNewFormat(
+            domainObject.getModel(),
+            domainObject.getId()
+        );

-function matchAny(results) {
-    for (const result of results) {
-        if (result) {
-            return true;
+        var metadata = this.openmct.telemetry.getMetadata(newDO);
+        var values = metadata.valuesForHints(['image']);
+        return values.length >= 1;
+    };
+
+    ImageryViewPolicy.prototype.allow = function (view, domainObject) {
+        if (view.key === 'imagery' || view.key === 'historical-imagery') {
+            return this.hasImageTelemetry(domainObject);
        }
-    }

-    return false;
-}
+        return true;
+    };

-function matchExact(results, target) {
-    let matches = 0;
-    for (const result of results) {
-        if (result) {
-            matches++;
-        }
-        if (matches > target) {
-            return false;
-        }
-    }
+    return ImageryViewPolicy;
+});

-    return matches === target;
-}
--- a/platform/features/imagery/test/controllers/ImageryControllerSpec.js
+++ b/platform/features/imagery/test/controllers/ImageryControllerSpec.js
@ -0,0 +1,271 @@
+/*****************************************************************************
+ * 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(
+    [
+        "zepto",
+        "../../src/controllers/ImageryController"
+    ],
+    function ($, ImageryController) {
+
+        var MOCK_ELEMENT_TEMPLATE =
+            '<div class="l-image-thumbs-wrapper"></div>';
+
+        xdescribe("The Imagery controller", function () {
+            var $scope,
+                openmct,
+                oldDomainObject,
+                newDomainObject,
+                unsubscribe,
+                metadata,
+                prefix,
+                controller,
+                requestPromise,
+                mockWindow,
+                mockElement;
+
+            beforeEach(function () {
+                $scope = jasmine.createSpyObj('$scope', ['$on', '$watch']);
+                oldDomainObject = jasmine.createSpyObj(
+                    'domainObject',
+                    ['getId']
+                );
+                newDomainObject = { name: 'foo' };
+                oldDomainObject.getId.and.returnValue('testID');
+                openmct = {
+                    objects: jasmine.createSpyObj('objectAPI', [
+                        'get'
+                    ]),
+                    time: jasmine.createSpyObj('timeAPI', [
+                        'timeSystem',
+                        'clock',
+                        'on',
+                        'off',
+                        'bounds'
+                    ]),
+                    telemetry: jasmine.createSpyObj('telemetryAPI', [
+                        'subscribe',
+                        'request',
+                        'getValueFormatter',
+                        'getMetadata'
+                    ])
+                };
+                metadata = jasmine.createSpyObj('metadata', [
+                    'value',
+                    'valuesForHints'
+                ]);
+                metadata.value.and.returnValue("timestamp");
+                metadata.valuesForHints.and.returnValue(["value"]);
+
+                prefix = "formatted ";
+                unsubscribe = jasmine.createSpy('unsubscribe');
+                openmct.telemetry.subscribe.and.returnValue(unsubscribe);
+                openmct.time.timeSystem.and.returnValue({
+                    key: 'testKey'
+                });
+                $scope.domainObject = oldDomainObject;
+                openmct.objects.get.and.returnValue(Promise.resolve(newDomainObject));
+                openmct.telemetry.getMetadata.and.returnValue(metadata);
+                openmct.telemetry.getValueFormatter.and.callFake(function (property) {
+                    var formatter =
+                        jasmine.createSpyObj("formatter-" + property, ['format']);
+                    var isTime = (property === "timestamp");
+                    formatter.format.and.callFake(function (datum) {
+                        return (isTime ? prefix : "") + datum[property];
+                    });
+                    return formatter;
+                });
+
+                requestPromise = new Promise(function (resolve) {
+                    setTimeout(function () {
+                        resolve([{
+                            timestamp: 1434600258123,
+                            value: 'some/url'
+                        }]);
+                    }, 10);
+                });
+
+                openmct.telemetry.request.and.returnValue(requestPromise);
+                mockElement = $(MOCK_ELEMENT_TEMPLATE);
+                mockWindow = jasmine.createSpyObj('$window', ['requestAnimationFrame']);
+                mockWindow.requestAnimationFrame.and.callFake(function (f) {
+                    return f();
+                });
+
+                controller = new ImageryController(
+                    $scope,
+                    mockWindow,
+                    mockElement,
+                    openmct
+                );
+            });
+
+            describe("when loaded", function () {
+                var callback,
+                    boundsListener,
+                    bounds;
+
+                beforeEach(function () {
+                    return requestPromise.then(function () {
+                        openmct.time.on.calls.all().forEach(function (call) {
+                            if (call.args[0] === "bounds") {
+                                boundsListener = call.args[1];
+                            }
+                        });
+                        callback =
+                            openmct.telemetry.subscribe.calls.mostRecent().args[1];
+                    });
+                });
+
+                it("requests history", function () {
+                    expect(openmct.telemetry.request).toHaveBeenCalledWith(
+                        newDomainObject, bounds
+                    );
+                    expect(controller.getTime()).toEqual(prefix + 1434600258123);
+                    expect(controller.getImageUrl()).toEqual('some/url');
+                });
+
+
+                it("exposes the latest telemetry values", function () {
+                    callback({
+                        timestamp: 1434600259456,
+                        value: "some/other/url"
+                    });
+
+                    expect(controller.getTime()).toEqual(prefix + 1434600259456);
+                    expect(controller.getImageUrl()).toEqual("some/other/url");
+                });
+
+                it("allows updates to be paused and unpaused", function () {
+                    var newTimestamp = 1434600259456,
+                        newUrl = "some/other/url",
+                        initialTimestamp = controller.getTime(),
+                        initialUrl = controller.getImageUrl();
+
+                    expect(initialTimestamp).not.toBe(prefix + newTimestamp);
+                    expect(initialUrl).not.toBe(newUrl);
+                    expect(controller.paused()).toBeFalsy();
+
+                    controller.paused(true);
+                    expect(controller.paused()).toBeTruthy();
+                    callback({ timestamp: newTimestamp, value: newUrl });
+
+                    expect(controller.getTime()).toEqual(initialTimestamp);
+                    expect(controller.getImageUrl()).toEqual(initialUrl);
+
+                    controller.paused(false);
+                    expect(controller.paused()).toBeFalsy();
+                    expect(controller.getTime()).toEqual(prefix + newTimestamp);
+                    expect(controller.getImageUrl()).toEqual(newUrl);
+                });
+
+                it("forwards large image view to latest image in history on un-pause", function () {
+                    $scope.imageHistory = [
+                        { utc: 1434600258122, url: 'some/url1', selected: false},
+                        { utc: 1434600258123, url: 'some/url2', selected: false}
+                    ];
+                    controller.paused(true);
+                    controller.paused(false);
+
+                    expect(controller.getImageUrl()).toEqual(controller.getImageUrl($scope.imageHistory[1]));
+                });
+
+                it("subscribes to telemetry", function () {
+                    expect(openmct.telemetry.subscribe).toHaveBeenCalledWith(
+                        newDomainObject,
+                        jasmine.any(Function)
+                    );
+                });
+
+                it("requests telemetry", function () {
+                    expect(openmct.telemetry.request).toHaveBeenCalledWith(
+                        newDomainObject,
+                        bounds
+                    );
+                });
+
+                it("unsubscribes and unlistens when scope is destroyed", function () {
+                    expect(unsubscribe).not.toHaveBeenCalled();
+
+                    $scope.$on.calls.all().forEach(function (call) {
+                        if (call.args[0] === '$destroy') {
+                            call.args[1]();
+                        }
+                    });
+                    expect(unsubscribe).toHaveBeenCalled();
+                    expect(openmct.time.off)
+                        .toHaveBeenCalledWith('bounds', jasmine.any(Function));
+                });
+
+                it("listens for bounds event and responds to tick and manual change", function () {
+                    var mockBounds = {start: 1434600000000, end: 1434600500000};
+                    expect(openmct.time.on).toHaveBeenCalled();
+                    openmct.telemetry.request.calls.reset();
+                    boundsListener(mockBounds, true);
+                    expect(openmct.telemetry.request).not.toHaveBeenCalled();
+                    boundsListener(mockBounds, false);
+                    expect(openmct.telemetry.request).toHaveBeenCalledWith(newDomainObject, mockBounds);
+                });
+
+                it ("doesnt append duplicate datum", function () {
+                    var mockDatum  = {value: 'image/url', timestamp: 1434700000000};
+                    var mockDatum2 = {value: 'image/url', timestamp: 1434700000000};
+                    var mockDatum3 = {value: 'image/url', url: 'someval', timestamp: 1434700000000};
+                    expect(controller.updateHistory(mockDatum)).toBe(true);
+                    expect(controller.updateHistory(mockDatum)).toBe(false);
+                    expect(controller.updateHistory(mockDatum)).toBe(false);
+                    expect(controller.updateHistory(mockDatum2)).toBe(false);
+                    expect(controller.updateHistory(mockDatum3)).toBe(false);
+                });
+
+                describe("when user clicks on imagery thumbnail", function () {
+                    var mockDatum = { utc: 1434600258123, url: 'some/url', selected: false};
+
+                    it("pauses and adds selected class to imagery thumbnail", function () {
+                        controller.setSelectedImage(mockDatum);
+                        expect(controller.paused()).toBeTruthy();
+                        expect(mockDatum.selected).toBeTruthy();
+                    });
+
+                    it("unselects previously selected image", function () {
+                        $scope.imageHistory = [{ utc: 1434600258123, url: 'some/url', selected: true}];
+                        controller.unselectAllImages();
+                        expect($scope.imageHistory[0].selected).toBeFalsy();
+                    });
+
+                    it("updates larger image url and time", function () {
+                        controller.setSelectedImage(mockDatum);
+                        expect(controller.getImageUrl()).toEqual(controller.getImageUrl(mockDatum));
+                        expect(controller.getTime()).toEqual(controller.timeFormat.format(mockDatum.utc));
+                    });
+                });
+
+            });
+
+            it("initially shows an empty string for date/time", function () {
+                expect(controller.getTime()).toEqual("");
+                expect(controller.getImageUrl()).toEqual("");
+            });
+        });
+    }
+);
+
--- a/platform/features/imagery/test/directives/MCTBackgroundImageSpec.js
+++ b/platform/features/imagery/test/directives/MCTBackgroundImageSpec.js
@ -0,0 +1,126 @@
+/*****************************************************************************
+ * 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/directives/MCTBackgroundImage"],
+    function (MCTBackgroundImage) {
+
+        describe("The mct-background-image directive", function () {
+            var mockDocument,
+                mockScope,
+                mockElement,
+                testImage,
+                directive;
+
+            beforeEach(function () {
+                mockDocument = [
+                    jasmine.createSpyObj('document', ['createElement'])
+                ];
+                mockScope = jasmine.createSpyObj('scope', [
+                    '$watch',
+                    '$watchCollection'
+                ]);
+                mockElement = jasmine.createSpyObj('element', ['css']);
+                testImage = {};
+
+                mockDocument[0].createElement.and.returnValue(testImage);
+
+                directive = new MCTBackgroundImage(mockDocument);
+            });
+
+            it("is applicable as an attribute", function () {
+                expect(directive.restrict).toEqual("A");
+            });
+
+            it("two-way-binds its own value", function () {
+                expect(directive.scope.mctBackgroundImage).toEqual("=");
+            });
+
+            describe("once linked", function () {
+                beforeEach(function () {
+                    directive.link(mockScope, mockElement, {});
+                });
+
+                it("watches for changes to the URL", function () {
+                    expect(mockScope.$watch).toHaveBeenCalledWith(
+                        'mctBackgroundImage',
+                        jasmine.any(Function)
+                    );
+                });
+
+                it("updates images in-order, even when they load out-of-order", function () {
+                    var firstOnload;
+
+                    mockScope.$watch.calls.mostRecent().args[1]("some/url/0");
+                    firstOnload = testImage.onload;
+
+                    mockScope.$watch.calls.mostRecent().args[1]("some/url/1");
+
+                    // Resolve in a different order
+                    testImage.onload();
+                    firstOnload();
+
+                    // Should still have taken the more recent value
+                    expect(mockElement.css.calls.mostRecent().args).toEqual([
+                        "background-image",
+                        "url('some/url/1')"
+                    ]);
+                });
+
+                it("clears the background image when undefined is passed in", function () {
+                    mockScope.$watch.calls.mostRecent().args[1]("some/url/0");
+                    testImage.onload();
+                    mockScope.$watch.calls.mostRecent().args[1](undefined);
+
+                    expect(mockElement.css.calls.mostRecent().args).toEqual([
+                        "background-image",
+                        "none"
+                    ]);
+                });
+
+                it("updates filters on change", function () {
+                    var filters = { brightness: 123, contrast: 21 };
+                    mockScope.$watchCollection.calls.all().forEach(function (call) {
+                        if (call.args[0] === 'filters') {
+                            call.args[1](filters);
+                        }
+                    });
+                    expect(mockElement.css).toHaveBeenCalledWith(
+                        'filter',
+                        'brightness(123%) contrast(21%)'
+                    );
+                });
+
+                it("clears filters when none are present", function () {
+                    mockScope.$watchCollection.calls.all().forEach(function (call) {
+                        if (call.args[0] === 'filters') {
+                            call.args[1](undefined);
+                        }
+                    });
+                    expect(mockElement.css)
+                        .toHaveBeenCalledWith('filter', '');
+                });
+            });
+        });
+    }
+);
+
--- a/platform/features/imagery/test/policies/ImageryViewPolicySpec.js
+++ b/platform/features/imagery/test/policies/ImageryViewPolicySpec.js
@ -0,0 +1,84 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ["../../src/policies/ImageryViewPolicy"],
+    function (ImageryViewPolicy) {
+
+        describe("Imagery view policy", function () {
+            var testView,
+                openmct,
+                mockDomainObject,
+                mockTelemetry,
+                mockMetadata,
+                policy;
+
+            beforeEach(function () {
+                testView = { key: "imagery" };
+                mockMetadata = jasmine.createSpyObj('metadata', [
+                    "valuesForHints"
+                ]);
+                mockDomainObject = jasmine.createSpyObj(
+                    'domainObject',
+                    ['getId', 'getModel', 'getCapability']
+                );
+                mockTelemetry = jasmine.createSpyObj(
+                    'telemetry',
+                    ['getMetadata']
+                );
+                mockDomainObject.getCapability.and.callFake(function (c) {
+                    return c === 'telemetry' ? mockTelemetry : undefined;
+                });
+                mockDomainObject.getId.and.returnValue("some-id");
+                mockDomainObject.getModel.and.returnValue({ name: "foo" });
+                mockTelemetry.getMetadata.and.returnValue(mockMetadata);
+                mockMetadata.valuesForHints.and.returnValue(["bar"]);
+
+                openmct = { telemetry: mockTelemetry };
+
+                policy = new ImageryViewPolicy(openmct);
+            });
+
+            it("checks for hints indicating image telemetry", function () {
+                policy.allow(testView, mockDomainObject);
+                expect(mockMetadata.valuesForHints)
+                    .toHaveBeenCalledWith(["image"]);
+            });
+
+            it("allows the imagery view for domain objects with image telemetry", function () {
+                expect(policy.allow(testView, mockDomainObject)).toBeTruthy();
+            });
+
+            it("disallows the imagery view for domain objects without image telemetry", function () {
+                mockMetadata.valuesForHints.and.returnValue([]);
+                expect(policy.allow(testView, mockDomainObject)).toBeFalsy();
+            });
+
+            it("allows other views", function () {
+                testView.key = "somethingElse";
+                expect(policy.allow(testView, mockDomainObject)).toBeTruthy();
+            });
+
+        });
+    }
+);
+
--- a/platform/features/my-items/README.md
+++ b/platform/features/my-items/README.md
@ -1,8 +0,0 @@
-# My Items plugin
-Defines top-level folder named "My Items" to store user-created items. Enabled by default, this can be disabled in a 
-read-only deployment with no user-editable objects.
-
-## Installation
-```js
-openmct.install(openmct.plugins.MyItems());
-```
--- 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
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@ -20,33 +20,36 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-export const getLatestTimestamp = (
-    currentTimestamp,
-    compareTimestamp,
-    timeSystems,
-    currentTimeSystem
-) => {
-    let latest = { ...currentTimestamp };
-    const compare = { ...compareTimestamp };
-    const key = currentTimeSystem.key;
+/**
+ * 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 () {

-    if (!latest || !latest[key]) {
-        latest = updateLatestTimeStamp(compare, timeSystems)
+        /**
+         * 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;
+        }
+
+        /**
+         * 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;
    }

-    if (compare[key] > latest[key]) {
-        latest = updateLatestTimeStamp(compare, timeSystems)
-    }
-
-    return latest;
-}
-
-function updateLatestTimeStamp(timestamp, timeSystems) {
-    let latest = {};
-
-    timeSystems.forEach(timeSystem => {
-        latest[timeSystem.key] = timestamp[timeSystem.key];
-    });
-
-    return latest;
-}
+);
--- a/platform/features/pages/test/EmbeddedPageControllerSpec.js
+++ b/platform/features/pages/test/EmbeddedPageControllerSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@ -20,35 +20,37 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-export const TRIGGER = {
-    ANY: 'any',
-    ALL: 'all',
-    NOT: 'not',
-    XOR: 'xor'
-};
+define(
+    ["../src/EmbeddedPageController"],
+    function (EmbeddedPageController) {

-export const TRIGGER_LABEL = {
-    'any': 'when any criteria are met',
-    'all': 'when all criteria are met',
-    'not': 'when no criteria are met',
-    'xor': 'when only one criteria is met'
-};
+        describe("The controller for embedded pages", function () {
+            var mockSCE,
+                controller;

-export const STYLE_CONSTANTS = {
-    isStyleInvisible: 'is-style-invisible',
-    borderColorTitle: 'Set border color',
-    textColorTitle: 'Set text color',
-    backgroundColorTitle: 'Set background color',
-    imagePropertiesTitle: 'Edit image properties',
-    visibilityHidden: 'Hidden',
-    visibilityVisible: 'Visible'
-};
+            beforeEach(function () {
+                mockSCE = jasmine.createSpyObj(
+                    '$sce',
+                    ["trustAsResourceUrl"]
+                );

-export const ERROR = {
-    'TELEMETRY_NOT_FOUND': {
-        errorText: 'Telemetry not found for criterion'
-    },
-    'CONDITION_NOT_FOUND': {
-        errorText: 'Condition not found'
+                mockSCE.trustAsResourceUrl.and.callFake(function (v) {
+                    return v;
+                });
+
+                controller = new EmbeddedPageController(mockSCE);
+            });
+
+            it("allows URLs to be marked as trusted", function () {
+                var testURL = "http://www.nasa.gov";
+
+                expect(controller.trust(testURL))
+                    .toEqual(testURL);
+
+                expect(mockSCE.trustAsResourceUrl)
+                    .toHaveBeenCalledWith(testURL);
+            });
+
+        });
    }
-};
+);
--- a/platform/features/static-markup/bundle.js
+++ b/platform/features/static-markup/bundle.js
@ -22,35 +22,35 @@

 define([

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

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

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

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

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

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

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

-    return {
-        name:"platform/identity",
-        definition: {
-            "extensions": {
-                "components": [
-                    {
-                        "implementation": IdentityAggregator,
-                        "type": "aggregator",
-                        "provides": "identityService",
-                        "depends": [
-                            "$q"
-                        ]
-                    },
-                    {
-                        "implementation": IdentityProvider,
-                        "type": "provider",
-                        "provides": "identityService",
-                        "depends": [
-                            "$q"
-                        ],
-                        "priority": "fallback"
-                    },
-                    {
-                        "type": "decorator",
-                        "provides": "creationService",
-                        "implementation": IdentityCreationDecorator,
-                        "depends": [
-                            "identityService"
-                        ]
-                    }
-                ],
-                "indicators": [
-                    {
-                        "implementation": IdentityIndicator,
-                        "depends": [
-                            "identityService"
-                        ]
-                    }
-                ],
-                "types": [
-                    {
-                        "properties": [
-                            {
-                                "key": "creator",
-                                "name": "Creator"
-                            }
-                        ]
-                    }
-                ]
-            }
+    legacyRegistry.register("platform/identity", {
+        "extensions": {
+            "components": [
+                {
+                    "implementation": IdentityAggregator,
+                    "type": "aggregator",
+                    "provides": "identityService",
+                    "depends": [
+                        "$q"
+                    ]
+                },
+                {
+                    "implementation": IdentityProvider,
+                    "type": "provider",
+                    "provides": "identityService",
+                    "depends": [
+                        "$q"
+                    ],
+                    "priority": "fallback"
+                },
+                {
+                    "type": "decorator",
+                    "provides": "creationService",
+                    "implementation": IdentityCreationDecorator,
+                    "depends": [
+                        "identityService"
+                    ]
+                }
+            ],
+            "indicators": [
+                {
+                    "implementation": IdentityIndicator,
+                    "depends": [
+                        "identityService"
+                    ]
+                }
+            ],
+            "types": [
+                {
+                    "properties": [
+                        {
+                            "key": "creator",
+                            "name": "Creator"
+                        }
+                    ]
+                }
+            ]
        }
-    };
+    });
 });
--- a/platform/import-export/README.md
+++ b/platform/import-export/README.md
@ -1,14 +0,0 @@
-# Import / Export Plugin
-The Import/Export plugin allows objects to be exported as JSON files. This allows for sharing of objects between users 
-who are not using a shared persistence store. It also allows object trees to be backed up. Additionally, object trees 
-exported using this tool can then be exposed as read-only static root trees using the 
-[Static Root Plugin](../../src/plugins/staticRootPlugin/README.md).
-
-Upon installation it will add two new context menu actions to allow import and export of objects. Initiating the Export 
-action on an object will produce a JSON file that includes the object and all of its composed children. Selecting Import 
-on an object will allow the user to import a previously exported object tree as a child of the selected object.
-
-## Installation
-```js
-openmct.install(openmct.plugins.ImportExport())
-```
--- a/platform/import-export/bundle.js
+++ b/platform/import-export/bundle.js
@ -72,8 +72,6 @@ define([
                    ]
                }
            });
-
-            openmct.legacyRegistry.enable('platform/import-export');
        };
    };
 });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrew Henry	1e64cf4657	Disabled broken test	2019-10-29 15:34:45 -07:00
Andrew Henry	60ba2c23e6	Fixed new linting error	2019-10-29 15:28:58 -07:00
Andrew Henry	606aaf29c7	Resolved merge conflict	2019-10-29 15:11:00 -07:00
Joel McKinnon	61c31454ac	addressed review comments	2019-10-23 12:02:57 -07:00
Joel McKinnon	5f1dc5d5e2	Removed commented code	2019-10-10 17:01:27 -07:00
Joel McKinnon	bba3306a98	fixed lint errors: no-shadow	2019-09-05 09:52:28 -07:00
Joel McKinnon	35743577c9	fixed lint errors for rule: no-shadow	2019-09-04 17:01:35 -07:00
Joel McKinnon	7b2b682eea	fixed lint errors for rule: no-newcap	2019-09-04 16:49:35 -07:00
McKinnon	51ab52e9f1	fixed lint errors for rule: no-unused-vars	2019-09-04 16:33:39 -07:00
McKinnon	acc24ccd72	fixed lint errors for rule: no-undef	2019-09-04 16:18:43 -07:00