4 files changed, 566 insertions, 573 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index c4571e9d..5c674c27 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -244,7 +244,9 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
     insertPropTween:{
         value:function(clickPos){
             var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
-            this.application.ninja.timeline.selectLayer(selectedIndex, true);
+            // this.application.ninja.timeline.selectLayer(selectedIndex, true); // Deprecated.
+            this.application.ninja.timeline.selectLayers([selectedIndex]);
+            this.application.ninja.timeline.updateStageSelection();
 
             var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
             var currentMillisec = currentMillisecPerPixel * clickPos;
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 1df37636..17372935 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -11,103 +11,244 @@ var Montage = require("montage/core/core").Montage,
 
 var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
+    /* === BEGIN: Models === */
+        _user_layers: {
+                value: null
+        },
     user_layers: {
-        value: null,
-        serializable: true
+        serializable: true,
+        get: function() {
+                return this._user_layers;
+        },
+        set: function(newVal) {
+                this._user_layers = newVal;
+        }
     },
 
+        _track_container: {
+                value: null
+        },
     track_container: {
-        value: null,
-        serializable: true
+        serializable: true,
+        get: function() {
+                return this._track_container;
+        },
+        set: function(newVal) {
+                this._track_container = newVal;
+        }
     },
 
+        _timeline_leftpane: {
+                value: null
+        },
     timeline_leftpane: {
-        value: null,
-        serializable: true
+        serializable: true,
+        get: function() {
+                return this._timeline_leftpane;
+        },
+        set: function(newVal) {
+                this._timeline_leftpane = newVal;
+        }
     },
 
+        _layer_tracks: {
+                value: null
+        },
     layer_tracks: {
-        value: null,
-        serializable: true
+        serializable: true,
+        get: function() {
+                return this._layer_tracks;
+        },
+        set: function(newVal) {
+                this._layer_tracks = newVal;
+        }
     },
 
+        _master_track: {
+                value: null
+        },
     master_track: {
-        value: null,
-        serializable: true
+        serializable: true,
+        get: function() {
+                return this._master_track;
+        },
+        set: function(newVal) {
+                this._master_track = newVal;
+        }
     },
 
+        _time_markers: {
+                value: null
+        },
     time_markers: {
-        value: null,
-        serializable: true
+        serializable: true,
+        get: function() {
+                return this._time_markers;
+        },
+        set: function(newVal) {
+                this._time_markers = newVal;
+        }
     },
 
+        _playhead: {
+                value: null
+        },
     playhead: {
-        value: null,
-        serializable: true
+        serializable: true,
+        get: function() {
+                return this._playhead;
+        },
+        set: function(newVal) {
+                this._playhead = newVal;
+        }
     },
 
+        _playheadmarker: {
+                value: null
+        },
     playheadmarker: {
-        value: null,
-        serializable: true
+        serializable: true,
+        get: function() {
+                return this._playheadmarker;
+        },
+        set: function(newVal) {
+                this._playheadmarker = newVal;
+        }
     },
 
+        _timetext: {
+                value: null
+        },
     timetext: {
-        value: null,
-        serializable: true
+        serializable: true,
+        get: function() {
+                return this._timetext;
+        },
+        set: function(newVal) {
+                this._timetext = newVal;
+        }
     },
 
+        _timebar: {
+                value: null
+        },
     timebar: {
-        value: null,
-        serializable: true
+        serializable: true,
+        get: function() {
+                return this._timebar;
+        },
+        set: function(newVal) {
+                this._timebar = newVal;
+        }
     },
 
+        _container_tracks: {
+                value: null
+        },
     container_tracks: {
-        value: null,
-        serializable: true
+        serializable: true,
+        get: function() {
+                return this._container_tracks;
+        },
+        set: function(newVal) {
+                this._container_tracks = newVal;
+        }
     },
 
+        _end_hottext: {
+                value: null
+        },
     end_hottext: {
-        value: null,
-        serializable: true
+        serializable: true,
+        get: function() {
+                return this._end_hottext;
+        },
+        set: function(newVal) {
+                this._end_hottext = newVal;
+        }
     },
 
+        _container_layers: {
+                value: null
+        },
     container_layers: {
-        value: null,
-        serializable: true
+        serializable: true,
+        get: function() {