diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js
index fb58e0b87..40f37a09b 100644
--- a/FloatingSpace/StrategyPartConstructor.js
+++ b/FloatingSpace/StrategyPartConstructor.js
@@ -192,7 +192,19 @@ function newStrategyPartConstructor () {
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
-            angle: 0
+            angle: -20
+          },
+          {
+            action: 'Download',
+            actionFunction: payload.onMenuItemClick,
+            label: 'Download',
+            visible: false,
+            iconPathOn: 'upload',
+            iconPathOff: 'upload',
+            rawRadius: 8,
+            targetRadius: 0,
+            currentRadius: 0,
+            angle: 20
           }]
         break
       }
@@ -222,7 +234,19 @@ function newStrategyPartConstructor () {
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
-            angle: 0
+            angle: -20
+          },
+          {
+            action: 'Download',
+            actionFunction: payload.onMenuItemClick,
+            label: 'Download',
+            visible: false,
+            iconPathOn: 'upload',
+            iconPathOff: 'upload',
+            rawRadius: 8,
+            targetRadius: 0,
+            currentRadius: 0,
+            angle: 20
           }]
         break
       }
@@ -252,7 +276,19 @@ function newStrategyPartConstructor () {
             rawRadius: 8,
             targetRadius: 0,
             currentRadius: 0,
-            angle: 0
+            angle: -20
+          },
+          {
+            action: 'Download',
+            actionFunction: payload.onMenuItemClick,
+            label: 'Download',
+            visible: false,
+            iconPathOn: 'upload',
+            iconPathOff: 'upload',
+            rawRadius: 8,
+            targetRadius: 0,
+            currentRadius: 0,
+            angle: 20
           }]
         break
       }
diff --git a/StrategySpace/Workspace.js b/StrategySpace/Workspace.js
index 60fddc367..ad4e38160 100644
--- a/StrategySpace/Workspace.js
+++ b/StrategySpace/Workspace.js
@@ -503,7 +503,51 @@ function newWorkspace () {
         return takeProfit
         break
       }
+      case 'Trade Entry Event': {
+        let event = {
+          type: node.type,
+          subType: node.subType,
+          name: node.name,
+          situations: []
+        }
+
+        for (let m = 0; m < node.situations.length; m++) {
+          let situation = getProtocolNode(node.situations[m])
+          event.situations.push(situation)
+        }
+        return event
+        break
+      }
+      case 'Strategy Entry Event': {
+        let event = {
+          type: node.type,
+          subType: node.subType,
+          name: node.name,
+          situations: []
+        }
+
+        for (let m = 0; m < node.situations.length; m++) {
+          let situation = getProtocolNode(node.situations[m])
+          event.situations.push(situation)
+        }
+        return event
+        break
+      }
+      case 'Strategy Exit Event': {
+        let event = {
+          type: node.type,
+          subType: node.subType,
+          name: node.name,
+          situations: []
+        }
+
+        for (let m = 0; m < node.situations.length; m++) {
+          let situation = getProtocolNode(node.situations[m])
+          event.situations.push(situation)
+        }
+        return event
+        break
+      }
     }
   }
 }
-