From f06f714bdcaa4a7f8153321b653a12e18affd831 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Fri, 2 Sep 2016 15:02:18 -0700
Subject: [PATCH] [API] Document some public fields

---
 src/MCT.js     | 22 ++++++++++++++++++++--
 src/api/api.js |  1 -
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/MCT.js b/src/MCT.js
index 542309032d..f19e074653 100644
--- a/src/MCT.js
+++ b/src/MCT.js
@@ -6,7 +6,8 @@ define([
     'text!./adapter/templates/edit-object-replacement.html',
     './ui/Dialog',
     './Selection',
-    './api/objects/object-utils'
+    './api/objects/object-utils',
+    './api/TimeConductor'
 ], function (
     EventEmitter,
     legacyRegistry,
@@ -15,7 +16,8 @@ define([
     editObjectTemplate,
     Dialog,
     Selection,
-    objectUtils
+    objectUtils,
+    TimeConductor
 ) {
 
     /**
@@ -28,7 +30,23 @@ define([
         EventEmitter.call(this);
         this.legacyBundle = { extensions: {} };
 
+        /**
+         *
+         * @type {Selection}
+         * @memberof module:openmct.MCT#
+         * @name selection
+         */
         this.selection = new Selection();
+
+        /**
+         *
+         * @type {TimeConductor}
+         * @memberof module:openmct.MCT#
+         * @name conductor
+         */
+        this.conductor = new TimeConductor();
+
+        this.TimeConductor = this.conductor; // compatibility for prototype
         this.on('navigation', this.selection.clear.bind(this.selection));
     }
 
diff --git a/src/api/api.js b/src/api/api.js
index 4c221c3f13..3f236e55ef 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -13,7 +13,6 @@ define([
 ) {
     return {
         Type: Type,
-        TimeConductor: new TimeConductor(),
         View: View,
         Objects: ObjectAPI,
         Composition: CompositionAPI