4 files changed, 303 insertions, 460 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 5287ce28..238ddae9 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -318,7 +318,6 @@ var Layer = exports.Layer = Montage.create(Component, {
                         this.log('layer.js: isMainCollapsed: ' + newVal);
                         this._isMainCollapsed = newVal;
                         this.layerData.isMainCollapsed = newVal;
-                        // this.triggerOutgoingBinding();
                 }
         }
     },
@@ -336,8 +335,6 @@ var Layer = exports.Layer = Montage.create(Component, {
                 if (newVal !== this._isTransformCollapsed) {
                         this._isTransformCollapsed = newVal;
                         this.layerData.isTransformCollapsed = newVal;
-                        this.triggerOutgoingBinding();
-                        //this.needsDraw = true;
                 }
         }
     },
@@ -355,8 +352,6 @@ var Layer = exports.Layer = Montage.create(Component, {
                 if (newVal !== this._isPositionCollapsed) {
                         this._isPositionCollapsed = newVal;
                         this.layerData.isPositionCollapsed = newVal;
-                        this.triggerOutgoingBinding();
-                        //this.needsDraw = true;
                 }
         }
     },
@@ -374,8 +369,6 @@ var Layer = exports.Layer = Montage.create(Component, {
                 if (newVal !== this._isStyleCollapsed) {
                         this._isStyleCollapsed = newVal;
                         this.layerData.isStyleCollapsed = newVal;
-                        this.triggerOutgoingBinding();
-                        //this.needsDraw = true;
                 }
         }
     },
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 34860ae7..6e7d410c 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -22,8 +22,6 @@
                         "timeline_leftpane" : {"#" : "timeline_leftpane"},
                         "layer_tracks": {"#": "layer_tracks"},
                         "master_track": {"#": "master_track"},
-                        "newlayer_button": {"#": "newlayer_button"},
-                        "deletelayer_button": {"#": "deletelayer_button"},
                         "time_markers" : {"#": "timeline_markers"},
                         "layerRepetition" : {"@": "repetition1"},
                         "trackRepetition" : {"@" : "repetition2"},
@@ -170,8 +168,6 @@
                         </div>
 
                         <div id="timeline_gutter" class="timelinegutter">
-                            <div id="newlayer_button" class="newlayerbutton"></div>
-                            <div id="deletelayer_button" class="deletelayerbutton"></div>
                             <input 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 a1e320c4..191228af 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -19,12 +19,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     /* === BEGIN: Models === */
     _arrLayers:{
-        serializable: true,
+        serializable:true,
         value:[]
     },
 
     arrLayers:{
-        serializable: true,
+        serializable:true,
         get:function () {
             return this._arrLayers;
         },
@@ -50,12 +50,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
 
     _layerRepetition:{
-        serializable: true,
+        serializable:true,
         value:null
     },
 
     layerRepetition:{
-        serializable: true,
+        serializable:true,
         get:function () {
             return this._layerRepetition;
         },
@@ -64,18 +64,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    _cacheArrays : {
-        value: function() {
+    _cacheArrays:{
+        value:function () {
             if (this._boolCacheArrays) {
                 this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
-
             }
         }
     },
-    
+
     // Set to false to skip array caching array sets in current document
-    _boolCacheArrays : {
-        value: true
+    _boolCacheArrays:{
+        value:true
     },
 
     _currentLayerNumber:{
@@ -95,16 +94,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     _setCurrentLayerNumber:{
-        value:function(){
+        value:function () {
             if (this._boolCacheArrays) {
                 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber;
             }
         }
     },
 
+    // TODO - Remove hash tables
     _hashKey:{
-            value:0
-        },
+        value:0
+    },
 
     hashKey:{
         get:function () {
@@ -119,46 +119,47 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     _setHashKey:{
-        value:function(){
+        value:function () {
             if (this._boolCacheArrays) {
                 this.application.ninja.currentDocument.hashKey = this.hashKey;
             }
         }
     },
 
+
     _currentLayerSelected:{
-        value: null
+        value:null
     },
-    currentLayerSelected : {
-        get: function() {
-                return this._currentLayerSelected;
-        },
-        set: function(newVal) {
-                this._currentLayerSelected = newVal;
-                this.application.ninja.currentDocument.tlCurrentLayerSelected = newVal;
-        }
+    currentLayerSelected:{
+        get:function () {
+            return this._currentLayerSelected;
+        },
+        set:function (newVal) {
+            this._currentLayerSelected = newVal;
+            this.application.ninja.currentDocument.tlCurrentLayerSelected = newVal;
+        }
     },
 
     _selectedLayerID:{
-        value: false
-    },
-    selectedLayerID : {
-        get: function() {
+        value:false
+    },
+    selectedLayerID:{
+        get:function () {