5 files changed, 1517 insertions, 1458 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 6c5e030c..c287e68e 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -217,7 +217,9 @@ POSSIBILITY OF SUCH DAMAGE.
                         </div>
 
                         <div data-montage-id="timeline_gutter" class="timelinegutter">
+                            <div class="sliderClass">
                             <div data-montage-id="tl_slider" class="tl_slider"></div>
+                            </div>
                             <input data-montage-id="end_hottext" class="endhottext">
                         </div>
                     </div>
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index a1e03b35..4e9771d4 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -30,109 +30,250 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
 var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component,
-    nj = require("js/lib/NJUtils").NJUtils,
-    EasingMenuPopup = require("js/panels/Timeline/EasingMenu.reel").EasingMenu;
+        Component = require("montage/ui/component").Component,
+        nj = require("js/lib/NJUtils").NJUtils,
+        EasingMenuPopup = require("js/panels/Timeline/EasingMenu.reel").EasingMenu;
 
 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;
+