From 240070b5da9e10e92b8b34327f56c93ac9e3c7e8 Mon Sep 17 00:00:00 2001
From: Erin <erin@code.org>
Date: Thu, 1 Mar 2018 15:25:13 -0800
Subject: [PATCH 01/56] Use empty blob to save empty animation

---
 apps/src/gamelab/animationListModule.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/src/gamelab/animationListModule.js b/apps/src/gamelab/animationListModule.js
index bb9c01d3112c6..1cfeda1cf1ab4 100644
--- a/apps/src/gamelab/animationListModule.js
+++ b/apps/src/gamelab/animationListModule.js
@@ -339,7 +339,7 @@ export function addBlankAnimation() {
         version: null,
         loadedFromSource: true,
         saved: false,
-        blob: null,
+        blob: new Blob(),
         dataURI: null,
         hasNewVersionThisSession: false
       }));

From f601378d9ced616185a9372af8f9a32b93e979c2 Mon Sep 17 00:00:00 2001
From: Erin <erin@code.org>
Date: Sat, 3 Mar 2018 16:11:35 -0800
Subject: [PATCH 02/56] Resource Link component with story

---
 .../templates/instructions/ResourceLink.jsx   | 93 +++++++++++++++++++
 .../instructions/ResourceLink.story.jsx       | 30 ++++++
 2 files changed, 123 insertions(+)
 create mode 100644 apps/src/templates/instructions/ResourceLink.jsx
 create mode 100644 apps/src/templates/instructions/ResourceLink.story.jsx

diff --git a/apps/src/templates/instructions/ResourceLink.jsx b/apps/src/templates/instructions/ResourceLink.jsx
new file mode 100644
index 0000000000000..3b97efc5c1198
--- /dev/null
+++ b/apps/src/templates/instructions/ResourceLink.jsx
@@ -0,0 +1,93 @@
+import React, { PropTypes } from 'react';
+import Radium from 'radium';
+import color from '@cdo/apps/util/color';
+import BaseDialog from '../BaseDialog';
+
+const styles = {
+  textLink: {
+    display: 'inline-block',
+    margin: 8,
+    fontWeight: 'bold',
+    fontSize: 16,
+    lineHeight: '25px',
+    cursor: 'pointer',
+    maxWidth: '90%'
+  },
+  mapThumbnail: {
+    backgroundColor: color.teal,
+  },
+  commonThumbnail: {
+    borderRadius: 5,
+    paddingLeft: 26,
+    paddingRight: 26,
+    paddingTop: 16,
+    paddingBottom: 9,
+  },
+  commonIcon: {
+    fontSize: 22,
+  },
+  mapIcon: {
+    color: color.white
+  },
+  resourceIcon: {
+    color: color.teal
+  },
+  resourceStyle: {
+    margin: 8
+  },
+  linkFrame: {
+    width: '98%',
+    height: '94%'
+  }
+};
+
+class ResourceLink extends React.Component {
+  static propTypes = {
+    map: PropTypes.bool,
+    text: PropTypes.string.isRequired,
+    reference: PropTypes.string.isRequired,
+  };
+
+  state = {
+    dialogSelected: false,
+    text: this.props.reference
+  };
+
+  selectResource = () => {
+    this.setState({dialogSelected: true});
+  };
+
+  closeResource = () => {
+    this.setState({dialogSelected: false});
+  };
+
+  render() {
+    const { map, reference, text } = this.props;
+
+    const iconStyle = map ? {...styles.commonIcon, ...styles.mapIcon} : {...styles.commonIcon, ...styles.resourceIcon};
+    const thumbnailStyle = map ? {...styles.commonThumbnail, ...styles.mapThumbnail} : {...styles.commonThumbnail};
+
+    return (
+      <div>
+        <div style={styles.resourceStyle} onClick={this.selectResource}>
+          <span style={thumbnailStyle}>
+              <i style={iconStyle} className={map ? "fa fa-map" : "fa fa-book"}/>
+          </span>
+          <a style={styles.textLink}>
+            {text}
+          </a>
+        </div>
+        <BaseDialog
+          isOpen={this.state.dialogSelected}
+          handleClose={this.closeResource}
+          fullWidth={true}
+          fullHeight={true}
+        >
+          <iframe style={styles.linkFrame} src={reference}/>
+        </BaseDialog>
+      </div>
+    );
+  }
+}
+
+export default Radium(ResourceLink);
diff --git a/apps/src/templates/instructions/ResourceLink.story.jsx b/apps/src/templates/instructions/ResourceLink.story.jsx
new file mode 100644
index 0000000000000..20513346d1e2e
--- /dev/null
+++ b/apps/src/templates/instructions/ResourceLink.story.jsx
@@ -0,0 +1,30 @@
+import ResourceLink from './ResourceLink';
+import React from 'react';
+
+export default storybook => {
+  return storybook
+    .storiesOf('ResourceLink', module)
+    .addStoryTable([
+      {
+        name: 'Map Reference',
+        description: 'Resource link with a map icon',
+        story: () => (
+          <ResourceLink
+            map
+            reference="/docs/csd/maker_leds/index.html"
+            text="First Item"
+          />
+        )
+      },
+      {
+        name: 'Book Reference',
+        description: 'Resource link with a book icon',
+        story: () => (
+          <ResourceLink
+            reference="/docs/csd/maker_leds/index.html"
+            text="Second Item"
+          />
+        )
+      },
+    ]);
+};

From 11e175883f72944fc36a8e9c30af295a50a33d26 Mon Sep 17 00:00:00 2001
From: Ram Kandasamy <ram@code.org>
Date: Tue, 27 Feb 2018 17:15:02 -0800
Subject: [PATCH 03/56] Remove 'edit_code' serialized property

---
 dashboard/app/helpers/levels_helper.rb        |  2 +-
 dashboard/app/models/game.rb                  |  2 ++
 dashboard/app/models/levels/applab.rb         |  5 ++++-
 dashboard/app/models/levels/blockly.rb        | 18 ++++++---------
 dashboard/app/models/levels/gamelab.rb        |  5 ++++-
 dashboard/app/models/levels/gamelab_jr.rb     |  5 ++++-
 dashboard/app/models/levels/studio_ec.rb      |  5 ++++-
 .../views/levels/editors/_artist.html.haml    |  2 +-
 .../views/levels/editors/_blockly.html.haml   | 22 +++++++++----------
 9 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/dashboard/app/helpers/levels_helper.rb b/dashboard/app/helpers/levels_helper.rb
index 31896a5d46370..24f694044eccc 100644
--- a/dashboard/app/helpers/levels_helper.rb
+++ b/dashboard/app/helpers/levels_helper.rb
@@ -262,7 +262,7 @@ def app_options
   # Helper that renders the _apps_dependencies partial with a configuration
   # appropriate to the level being rendered.
   def render_app_dependencies
-    use_droplet = app_options[:droplet]
+    use_droplet = @level.uses_droplet?
     use_netsim = @level.game == Game.netsim
     use_applab = @level.game == Game.applab
     use_gamelab = @level.game.app == Game::GAMELAB
diff --git a/dashboard/app/models/game.rb b/dashboard/app/models/game.rb
index a64c5627cf46b..9c8cf09de47fd 100644
--- a/dashboard/app/models/game.rb
+++ b/dashboard/app/models/game.rb
@@ -192,6 +192,8 @@ def flappy?
   end
 
   def uses_droplet?
+    # This is only applicable to levels.js levels. Everything else
+    # specifies droplet usage in the corresponding level class
     %w(MazeEC ArtistEC Applab StudioEC Gamelab).include? name
   end
 
diff --git a/dashboard/app/models/levels/applab.rb b/dashboard/app/models/levels/applab.rb
index 743db98d9cc81..6656cc9b4e781 100644
--- a/dashboard/app/models/levels/applab.rb
+++ b/dashboard/app/models/levels/applab.rb
@@ -75,7 +75,6 @@ def self.create_from_level_builder(params, level_params)
         level_num: 'custom',
         properties: {
           code_functions: JSON.parse(palette),
-          edit_code: true
         }
       )
     )
@@ -125,6 +124,10 @@ def validate_maker_if_needed
     end
   end
 
+  def uses_droplet?
+    true
+  end
+
   def self.palette
     SharedConstants::APPLAB_BLOCKS
   end
diff --git a/dashboard/app/models/levels/blockly.rb b/dashboard/app/models/levels/blockly.rb
index da6875e734797..1e088102dfe69 100644
--- a/dashboard/app/models/levels/blockly.rb
+++ b/dashboard/app/models/levels/blockly.rb
@@ -65,7 +65,6 @@ class Blockly < Level
     project_template_level_name
     hide_share_and_remix
     is_project_level
-    edit_code
     code_functions
     palette_category_at_start
     failure_message_override
@@ -218,20 +217,11 @@ def blockly_app_options(game, skin_id)
       app_options[:skinId] = skin_id if skin_id
 
       # Set some values that Blockly expects on the root of its options string
-
-      droplet = game.try(:uses_droplet?)
-      #TODO(ram) normalize or remove the edit_code field
-      if edit_code == "false"
-        droplet = false
-      elsif edit_code == true
-        droplet = true
-      end
-
       app_options.merge!(
         {
           baseUrl: Blockly.base_url,
           app: game.try(:app),
-          droplet: droplet,
+          droplet: uses_droplet?,
           pretty: Rails.configuration.pretty_apps ? '' : '.min',
         }
       )
@@ -295,6 +285,7 @@ def blockly_level_options
       level_prop['startDirection'] = level_prop['startDirection'].to_i if level_prop['startDirection'].present?
       level_prop['sliderSpeed'] = level_prop['sliderSpeed'].to_f if level_prop['sliderSpeed']
       level_prop['scale'] = {'stepSpeed' => level_prop['stepSpeed']} if level_prop['stepSpeed'].present?
+      level_prop['editCode'] = uses_droplet?
 
       # Blockly requires these fields to be objects not strings
       %w(map initialDirt serializedMaze goal softButtons inputOutputTable).
@@ -398,4 +389,9 @@ def fix_examples
     return if examples.nil?
     self.examples = examples.select(&:present?)
   end
+
+  # This should just return false, but we have a few levels.js levels that use
+  # droplet (starwars, and a few test levels). They all have level records of
+  # type 'Blockly', so they can't override this as needed
+  delegate :uses_droplet?, to: :game
 end
diff --git a/dashboard/app/models/levels/gamelab.rb b/dashboard/app/models/levels/gamelab.rb
index 2735a55ccf771..197f053f88a7a 100644
--- a/dashboard/app/models/levels/gamelab.rb
+++ b/dashboard/app/models/levels/gamelab.rb
@@ -67,7 +67,6 @@ def self.create_from_level_builder(params, level_params)
         properties: {
           code_functions: JSON.parse(palette),
           show_d_pad: true,
-          edit_code: true,
           show_debug_watch: true
         }
       )
@@ -90,6 +89,10 @@ def update_palette
     return false
   end
 
+  def uses_droplet?
+    true
+  end
+
   def self.palette
     SharedConstants::GAMELAB_BLOCKS
   end
diff --git a/dashboard/app/models/levels/gamelab_jr.rb b/dashboard/app/models/levels/gamelab_jr.rb
index 4bbe682b0592d..8d6197f9cc31a 100644
--- a/dashboard/app/models/levels/gamelab_jr.rb
+++ b/dashboard/app/models/levels/gamelab_jr.rb
@@ -38,7 +38,6 @@ def self.create_from_level_builder(params, level_params)
         properties: {
           code_functions: JSON.parse(palette),
           show_d_pad: true,
-          edit_code: "false",
           show_debug_watch: true,
           use_helper_lib: true,
         }
@@ -161,4 +160,8 @@ def toolbox(type)
   def xml_blocks
     %w(initialization_blocks start_blocks toolbox_blocks required_blocks recommended_blocks solution_blocks)
   end
+
+  def uses_droplet?
+    false
+  end
 end
diff --git a/dashboard/app/models/levels/studio_ec.rb b/dashboard/app/models/levels/studio_ec.rb
index 58b65ae40e3f6..51093929d322a 100644
--- a/dashboard/app/models/levels/studio_ec.rb
+++ b/dashboard/app/models/levels/studio_ec.rb
@@ -40,7 +40,6 @@ def self.create_from_level_builder(params, level_params)
         properties: {
           code_functions: JSON.parse(palette),
           goal_override: JSON.parse(goal_override),
-          edit_code: true
         }
       )
     )
@@ -88,6 +87,10 @@ def self.goal_override
       }
     JSON
   end
+
+  def uses_droplet?
+    true
+  end
 end
 
 # Another name for this class to match the capitalization conventions of the annotation gem.
diff --git a/dashboard/app/views/levels/editors/_artist.html.haml b/dashboard/app/views/levels/editors/_artist.html.haml
index d9b95c7f4190c..e34750817867f 100644
--- a/dashboard/app/views/levels/editors/_artist.html.haml
+++ b/dashboard/app/views/levels/editors/_artist.html.haml
@@ -29,7 +29,7 @@
   = link_to 'Edit Predraw Blocks', level_edit_blocks_path(@level, :predraw_blocks) unless @level.new_record?
   = f.text_area :predraw_blocks, placeholder: 'Predraw Blocks', rows: 4, value: @level.pretty_block('predraw')
   :javascript
-    levelbuilder.initializeCodeMirror('level_predraw_blocks', '#{@level.game.uses_droplet? ? 'javascript' : 'xml'}');
+    levelbuilder.initializeCodeMirror('level_predraw_blocks', '#{@level.uses_droplet? ? 'javascript' : 'xml'}');
 .field
   = f.label :images, 'Image field in JSON array format, e.g.:'
   %div
diff --git a/dashboard/app/views/levels/editors/_blockly.html.haml b/dashboard/app/views/levels/editors/_blockly.html.haml
index b2e0c7ef519c1..5d8abddaf9a92 100644
--- a/dashboard/app/views/levels/editors/_blockly.html.haml
+++ b/dashboard/app/views/levels/editors/_blockly.html.haml
@@ -1,12 +1,12 @@
 - content_for(:head) do
-  - if @level.is_a?(Blockly) && !@level.game.uses_droplet?
+  - if @level.is_a?(Blockly) && !@level.uses_droplet?
     = javascript_include_tag 'js/blockly'
     = javascript_include_tag "js/en_us/blockly_locale"
     = javascript_include_tag "js/en_us/common_locale"
     = javascript_include_tag "js/en_us/#{@level.game.app}_locale"
 
 .field
-  = f.label :edit_code, @level.game.uses_droplet? ? 'Droplet JavaScript level' : 'Blockly level'
+  = f.label :edit_code, @level.uses_droplet? ? 'Droplet JavaScript level' : 'Blockly level'
 = render partial: 'levels/editors/ani_gif', locals: {f: f}
 .field
   = f.label :skin
@@ -78,7 +78,7 @@
     in the workspace (including hidden start blocks).
   = boolean_check_box f, :top_level_procedure_autopopulate
 
-- if @level.game.uses_droplet?
+- if @level.uses_droplet?
   .field
     = f.label :code_functions, 'Edit Droplet Palette'
     = f.text_area :code_functions, placeholder: 'Droplet Palette', rows: 4, value: @level.code_functions ? JSON.pretty_generate(@level.code_functions) : ''
@@ -91,17 +91,17 @@
       #toolbox-preview.span4
 
 .field
-  - if @level.game.uses_droplet?
+  - if @level.uses_droplet?
     = f.label :start_blocks, 'Edit Starting JavaScript Program'
   - else
     = link_to 'Edit Start Blocks', level_edit_blocks_path(@level, :start_blocks) unless @level.new_record?
   .row
     .span8
-      ~ f.text_area :start_blocks, placeholder: 'Start Blocks', rows: 4, value: @level.game.uses_droplet? ? @level.start_blocks : @level.pretty_block('start')
+      ~ f.text_area :start_blocks, placeholder: 'Start Blocks', rows: 4, value: @level.uses_droplet? ? @level.start_blocks : @level.pretty_block('start')
     #start-preview.span4
 
 .field
-  - if @level.game.uses_droplet?
+  - if @level.uses_droplet?
     = f.label :required_blocks, 'Edit Required Blocks'
   - else
     = link_to 'Edit Required Blocks', level_edit_blocks_path(@level, :required_blocks) unless @level.new_record?
@@ -111,7 +111,7 @@
     #required-preview.span4
 
 .field
-  - if @level.game.uses_droplet?
+  - if @level.uses_droplet?
     = f.label :recommended_blocks, 'Edit Recommended Blocks'
   - else
     = link_to 'Edit Recommended Blocks', level_edit_blocks_path(@level, :recommended_blocks) unless @level.new_record?
@@ -120,7 +120,7 @@
       ~ f.text_area :recommended_blocks, placeholder: 'Recommended Blocks', rows: 4, value: @level.pretty_block('recommended')
     #recommended-preview.span4
 
-- unless @level.game.uses_droplet?
+- unless @level.uses_droplet?
   .field
     = link_to 'Edit Initialization Blocks', level_edit_blocks_path(@level, :initialization_blocks) unless @level.new_record?
   .row
@@ -178,7 +178,7 @@
   = f.text_area :input_output_table, placeholder: 'Input/Output', rows: 4, value: @level.input_output_table
 -if @level.respond_to? :solution_blocks
   .field
-    - if @level.game.uses_droplet?
+    - if @level.uses_droplet?
       = f.label :solution_blocks, 'Edit Solution Blocks'
     - else
       = link_to 'Edit Solution Blocks', level_edit_blocks_path(@level, :solution_blocks) unless @level.new_record?
@@ -186,7 +186,7 @@
       .span8
         ~ f.text_area :solution_blocks, placeholder: 'Solution Blocks', rows: 4, value: @level.pretty_block('solution')
       #solution-preview.span4
--if @level.game.uses_droplet?
+-if @level.uses_droplet?
   .field
     = f.label :palette_category_at_start
     = f.select :palette_category_at_start, options_for_select(@level.class.palette_categories, @level.palette_category_at_start), {include_blank: true}
@@ -212,7 +212,7 @@
       isK1: @level.try(:isK1),
       app: @level.game.app,
       solution_blocks: @level.respond_to?(:solution_blocks),
-      uses_droplet: @level.game.uses_droplet?,
+      uses_droplet: @level.uses_droplet?,
       input_output_table: @level.respond_to?(:input_output_table),
       original_palette: JSON.parse(@level.class.try(:palette) || "{}"),
     }.to_json

From 846db0a557eaa130935a9f32a6e65c0f201fa4bc Mon Sep 17 00:00:00 2001
From: Erin <erin@code.org>
Date: Mon, 5 Mar 2018 19:58:29 -0800
Subject: [PATCH 04/56] Blank animation loads from library

---
 apps/src/gamelab/animationListModule.js | 35 ++++++++++---------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/apps/src/gamelab/animationListModule.js b/apps/src/gamelab/animationListModule.js
index 1cfeda1cf1ab4..85a9aca88ff42 100644
--- a/apps/src/gamelab/animationListModule.js
+++ b/apps/src/gamelab/animationListModule.js
@@ -323,27 +323,20 @@ export function setInitialAnimationList(serializedAnimationList) {
 export function addBlankAnimation() {
   const key = createUuid();
   return (dispatch, getState) => {
-    // Special behavior here:
-    // By pushing an animation that is "loadedFromSource" but has a null
-    // blob and dataURI, Piskel will know to create a new document with
-    // the given dimensions.
-    dispatch(addAnimationAction(
-      key,
-      {
-        name: generateAnimationName('animation', getState().animationList.propsByKey),
-        sourceUrl: null,
-        frameSize: {x: 100, y: 100},
-        frameCount: 1,
-        looping: true,
-        frameDelay: 4,
-        version: null,
-        loadedFromSource: true,
-        saved: false,
-        blob: new Blob(),
-        dataURI: null,
-        hasNewVersionThisSession: false
-      }));
-    dispatch(selectAnimation(key));
+    dispatch(addAnimationAction(key, {
+      name: generateAnimationName('animation', getState().animationList.propsByKey),
+      sourceUrl: '/api/v1/animation-library/mUlvnlbeZ5GHYr_Lb4NIuMwPs7kGxHWz/category_backgrounds/blank.png',
+      frameSize: {x: 100, y: 100},
+      frameCount: 1,
+      looping: true,
+      frameDelay: 4,
+      version: 'mUlvnlbeZ5GHYr_Lb4NIuMwPs7kGxHWz',
+      loadedFromSource: true,
+      saved: false
+    }));
+    dispatch(loadAnimationFromSource(key, () => {
+      dispatch(selectAnimation(key));
+    }));
     projectChanged();
   };
 }

From 68cb65fc5f6e5823b130cc5b202f04fcc3ecc082 Mon Sep 17 00:00:00 2001
From: Erin <erin@code.org>
Date: Mon, 5 Mar 2018 20:40:05 -0800
Subject: [PATCH 05/56] Use FontAwesome function

---
 .../templates/instructions/ResourceLink.jsx   | 19 ++++++++++++-------
 .../instructions/ResourceLink.story.jsx       | 12 +++++++-----
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/apps/src/templates/instructions/ResourceLink.jsx b/apps/src/templates/instructions/ResourceLink.jsx
index 3b97efc5c1198..6cb1870e32c61 100644
--- a/apps/src/templates/instructions/ResourceLink.jsx
+++ b/apps/src/templates/instructions/ResourceLink.jsx
@@ -2,6 +2,7 @@ import React, { PropTypes } from 'react';
 import Radium from 'radium';
 import color from '@cdo/apps/util/color';
 import BaseDialog from '../BaseDialog';
+import FontAwesome from '@cdo/apps/templates/FontAwesome';
 
 const styles = {
   textLink: {
@@ -43,14 +44,14 @@ const styles = {
 
 class ResourceLink extends React.Component {
   static propTypes = {
-    map: PropTypes.bool,
+    highlight: PropTypes.bool,
+    icon: PropTypes.string.isRequired,
     text: PropTypes.string.isRequired,
     reference: PropTypes.string.isRequired,
   };
 
   state = {
-    dialogSelected: false,
-    text: this.props.reference
+    dialogSelected: false
   };
 
   selectResource = () => {
@@ -62,16 +63,20 @@ class ResourceLink extends React.Component {
   };
 
   render() {
-    const { map, reference, text } = this.props;
+    const { icon, reference, text, highlight} = this.props;
 
-    const iconStyle = map ? {...styles.commonIcon, ...styles.mapIcon} : {...styles.commonIcon, ...styles.resourceIcon};
-    const thumbnailStyle = map ? {...styles.commonThumbnail, ...styles.mapThumbnail} : {...styles.commonThumbnail};
+    const iconStyle = highlight ? {...styles.commonIcon, ...styles.mapIcon} : {...styles.commonIcon, ...styles.resourceIcon};
+    const thumbnailStyle = highlight ? {...styles.commonThumbnail, ...styles.mapThumbnail} : {...styles.commonThumbnail};
 
     return (
       <div>
         <div style={styles.resourceStyle} onClick={this.selectResource}>
           <span style={thumbnailStyle}>
-              <i style={iconStyle} className={map ? "fa fa-map" : "fa fa-book"}/>
+            <FontAwesome
+              icon={icon}
+              style={iconStyle}
+              title={text}
+            />
           </span>
           <a style={styles.textLink}>
             {text}
diff --git a/apps/src/templates/instructions/ResourceLink.story.jsx b/apps/src/templates/instructions/ResourceLink.story.jsx
index 20513346d1e2e..e48f4c31c916a 100644
--- a/apps/src/templates/instructions/ResourceLink.story.jsx
+++ b/apps/src/templates/instructions/ResourceLink.story.jsx
@@ -6,23 +6,25 @@ export default storybook => {
     .storiesOf('ResourceLink', module)
     .addStoryTable([
       {
-        name: 'Map Reference',
+        name: 'Highlighted Reference',
         description: 'Resource link with a map icon',
         story: () => (
           <ResourceLink
-            map
-            reference="/docs/csd/maker_leds/index.html"
+            highlight
+            icon="map"
             text="First Item"
+            reference="/docs/csd/maker_leds/index.html"
           />
         )
       },
       {
-        name: 'Book Reference',
+        name: 'Not Highlighted Reference',
         description: 'Resource link with a book icon',
         story: () => (
           <ResourceLink
-            reference="/docs/csd/maker_leds/index.html"
+            icon="book"
             text="Second Item"
+            reference="/docs/csd/maker_leds/index.html"
           />
         )
       },

From f6ba6fd5bf611fe33af336c2c66c3a61fb1ee13e Mon Sep 17 00:00:00 2001
From: Erin <erin@code.org>
Date: Tue, 6 Mar 2018 17:23:31 -0800
Subject: [PATCH 06/56] Re-use adding animation library code for blank
 animations

---
 apps/src/gamelab/animationListModule.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/apps/src/gamelab/animationListModule.js b/apps/src/gamelab/animationListModule.js
index 85a9aca88ff42..1c169d4748778 100644
--- a/apps/src/gamelab/animationListModule.js
+++ b/apps/src/gamelab/animationListModule.js
@@ -321,10 +321,9 @@ export function setInitialAnimationList(serializedAnimationList) {
 }
 
 export function addBlankAnimation() {
-  const key = createUuid();
-  return (dispatch, getState) => {
-    dispatch(addAnimationAction(key, {
-      name: generateAnimationName('animation', getState().animationList.propsByKey),
+  return addLibraryAnimation(
+    {
+      name: 'animation',
       sourceUrl: '/api/v1/animation-library/mUlvnlbeZ5GHYr_Lb4NIuMwPs7kGxHWz/category_backgrounds/blank.png',
       frameSize: {x: 100, y: 100},
       frameCount: 1,
@@ -333,12 +332,8 @@ export function addBlankAnimation() {
       version: 'mUlvnlbeZ5GHYr_Lb4NIuMwPs7kGxHWz',
       loadedFromSource: true,
       saved: false
-    }));
-    dispatch(loadAnimationFromSource(key, () => {
-      dispatch(selectAnimation(key));
-    }));
-    projectChanged();
-  };
+    }
+  );
 }
 
 /**

From afd1356c1c196677b917c3c1fa4d58248d2a65d8 Mon Sep 17 00:00:00 2001
From: Ram Kandasamy <ram@code.org>
Date: Wed, 7 Mar 2018 11:52:56 -0800
Subject: [PATCH 07/56] Move uses_droplet to blockly.rb

---
 dashboard/app/models/game.rb           | 6 ------
 dashboard/app/models/levels/blockly.rb | 4 +++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dashboard/app/models/game.rb b/dashboard/app/models/game.rb
index 9c8cf09de47fd..30053109630d9 100644
--- a/dashboard/app/models/game.rb
+++ b/dashboard/app/models/game.rb
@@ -191,12 +191,6 @@ def flappy?
     app == FLAPPY
   end
 
-  def uses_droplet?
-    # This is only applicable to levels.js levels. Everything else
-    # specifies droplet usage in the corresponding level class
-    %w(MazeEC ArtistEC Applab StudioEC Gamelab).include? name
-  end
-
   def uses_pusher?
     app == NETSIM
   end
diff --git a/dashboard/app/models/levels/blockly.rb b/dashboard/app/models/levels/blockly.rb
index 1e088102dfe69..6adc236b10583 100644
--- a/dashboard/app/models/levels/blockly.rb
+++ b/dashboard/app/models/levels/blockly.rb
@@ -393,5 +393,7 @@ def fix_examples
   # This should just return false, but we have a few levels.js levels that use
   # droplet (starwars, and a few test levels). They all have level records of
   # type 'Blockly', so they can't override this as needed
-  delegate :uses_droplet?, to: :game
+  def uses_droplet?
+    %w(MazeEC ArtistEC Applab StudioEC Gamelab).include? name
+  end
 end

From 05d3cf2d29e5182111c445aace967f10c84e7916 Mon Sep 17 00:00:00 2001
From: Ram Kandasamy <ram@code.org>
Date: Wed, 7 Mar 2018 13:23:06 -0800
Subject: [PATCH 08/56] Droplet usage depends on game name for blockly levels

---
 dashboard/app/models/levels/blockly.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard/app/models/levels/blockly.rb b/dashboard/app/models/levels/blockly.rb
index 6adc236b10583..a4204f69d2f85 100644
--- a/dashboard/app/models/levels/blockly.rb
+++ b/dashboard/app/models/levels/blockly.rb
@@ -394,6 +394,6 @@ def fix_examples
   # droplet (starwars, and a few test levels). They all have level records of
   # type 'Blockly', so they can't override this as needed
   def uses_droplet?
-    %w(MazeEC ArtistEC Applab StudioEC Gamelab).include? name
+    %w(MazeEC ArtistEC Applab StudioEC Gamelab).include? game.name
   end
 end

From f5aacefc203142f84ccb1b6b0a3b4f399cd2b705 Mon Sep 17 00:00:00 2001
From: Brendan Reville <brendan@code.org>
Date: Wed, 7 Mar 2018 13:23:46 -0800
Subject: [PATCH 09/56] Survey: add ethical/social issues topic on both surveys

---
 apps/i18n/common/en_us.json                   |  1 +
 .../templates/census2017/censusQuestions.js   |  4 ++
 .../api/v1/census/census_controller.rb        |  5 ++
 .../app/models/census/census_hoc2017v1.rb     |  1 +
 .../app/models/census/census_hoc2017v2.rb     |  1 +
 .../app/models/census/census_hoc2017v3.rb     |  1 +
 .../app/models/census/census_submission.rb    |  1 +
 .../models/census/census_teacher_banner_v1.rb |  1 +
 .../models/census/census_your_school2017v0.rb |  1 +
 .../models/census/census_your_school2017v1.rb |  1 +
 .../models/census/census_your_school2017v2.rb |  1 +
 .../models/census/census_your_school2017v3.rb |  1 +
 .../models/census/census_your_school2017v4.rb |  1 +
 .../models/census/census_your_school2017v5.rb |  1 +
 .../models/census/census_your_school2017v6.rb | 50 +++++++++++++++++++
 ...ic_ethical_social_to_census_submissions.rb |  5 ++
 dashboard/db/schema.rb                        |  3 +-
 dashboard/test/factories/census_factories.rb  |  4 ++
 .../census/census_your_school2017v5_test.rb   |  2 +-
 .../census/census_your_school2017v6_test.rb   | 13 +++++
 pegasus/sites.v3/hourofcode.com/i18n/en.yml   |  1 +
 .../views/census_questions_followup.haml      |  4 ++
 22 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 dashboard/app/models/census/census_your_school2017v6.rb
 create mode 100644 dashboard/db/migrate/20180305045530_add_topic_ethical_social_to_census_submissions.rb
 create mode 100644 dashboard/test/models/census/census_your_school2017v6_test.rb

diff --git a/apps/i18n/common/en_us.json b/apps/i18n/common/en_us.json
index 60e86d40c8374..21ef6c23525df 100644
--- a/apps/i18n/common/en_us.json
+++ b/apps/i18n/common/en_us.json
@@ -80,6 +80,7 @@
   "censusCybersecurity": "Cybersecurity",
   "censusDataAnalysis": "Data analysis",
   "censusEmail": "What is your email address?",
+  "censusEthicalSocial": "Ethical and social issues in computing",
   "censusFollowUpFrequency": "How often per week does this class meet?",
   "censusFollowUp": "Your school offers a semester or year long computer science class! What topics does this course include?",
   "censusFollowUpTellUsMore": "Please tell us more about this course. For example, name of the class, how often it meets, description of what is taught.",
diff --git a/apps/src/templates/census2017/censusQuestions.js b/apps/src/templates/census2017/censusQuestions.js
index 43420c706aab5..ecce74c9af917 100644
--- a/apps/src/templates/census2017/censusQuestions.js
+++ b/apps/src/templates/census2017/censusQuestions.js
@@ -48,6 +48,10 @@ export const courseTopics = [{
 {
   name: "topic_game_design",
   label: i18n.censusGameDesign()
+},
+{
+  name: "topic_ethical_social",
+  label: i18n.censusEthicalSocial()
 }
 ];
 
diff --git a/dashboard/app/controllers/api/v1/census/census_controller.rb b/dashboard/app/controllers/api/v1/census/census_controller.rb
index b2476b2cc68c3..14b7c448e278b 100644
--- a/dashboard/app/controllers/api/v1/census/census_controller.rb
+++ b/dashboard/app/controllers/api/v1/census/census_controller.rb
@@ -20,6 +20,7 @@ class Api::V1::Census::CensusController < ApplicationController
     :topic_data,
     :topic_web_design,
     :topic_game_design,
+    :topic_ethical_social,
     :topic_other,
     :topic_other_description,
     :topic_do_not_know,
@@ -39,6 +40,7 @@ class Api::V1::Census::CensusController < ApplicationController
     :topic_data,
     :topic_web_design,
     :topic_game_design,
+    :topic_ethical_social,
     :topic_other,
     :topic_do_not_know,
     :pledged
@@ -87,6 +89,9 @@ def create
     census_params[:school_infos] = [school_info]
 
     case params[:form_version]
+    when 'CensusYourSchool2017v6'
+      submission = ::Census::CensusYourSchool2017v6.new census_params
+      template = 'census_form_receipt'
     when 'CensusYourSchool2017v5'
       submission = ::Census::CensusYourSchool2017v5.new census_params
       template = 'census_form_receipt'
diff --git a/dashboard/app/models/census/census_hoc2017v1.rb b/dashboard/app/models/census/census_hoc2017v1.rb
index 8855df99150c1..fac654d3e0be9 100644
--- a/dashboard/app/models/census/census_hoc2017v1.rb
+++ b/dashboard/app/models/census/census_hoc2017v1.rb
@@ -30,6 +30,7 @@
 #  created_at                   :datetime         not null
 #  updated_at                   :datetime         not null
 #  share_with_regional_partners :boolean
+#  topic_ethical_social         :boolean
 #
 # Indexes
 #
diff --git a/dashboard/app/models/census/census_hoc2017v2.rb b/dashboard/app/models/census/census_hoc2017v2.rb
index c18a56c7568b5..b776716ad456c 100644
--- a/dashboard/app/models/census/census_hoc2017v2.rb
+++ b/dashboard/app/models/census/census_hoc2017v2.rb
@@ -30,6 +30,7 @@
 #  created_at                   :datetime         not null
 #  updated_at                   :datetime         not null
 #  share_with_regional_partners :boolean
+#  topic_ethical_social         :boolean
 #
 # Indexes
 #
diff --git a/dashboard/app/models/census/census_hoc2017v3.rb b/dashboard/app/models/census/census_hoc2017v3.rb
index bc56804f3ccb7..669b3252e174b 100644
--- a/dashboard/app/models/census/census_hoc2017v3.rb
+++ b/dashboard/app/models/census/census_hoc2017v3.rb
@@ -30,6 +30,7 @@
 #  created_at                   :datetime         not null
 #  updated_at                   :datetime         not null
 #  share_with_regional_partners :boolean
+#  topic_ethical_social         :boolean
 #
 # Indexes
 #
diff --git a/dashboard/app/models/census/census_submission.rb b/dashboard/app/models/census/census_submission.rb
index 3d6a776b62526..cf25b808af794 100644
--- a/dashboard/app/models/census/census_submission.rb
+++ b/dashboard/app/models/census/census_submission.rb
@@ -31,6 +31,7 @@
 #  created_at                   :datetime         not null
 #  updated_at                   :datetime         not null
 #  share_with_regional_partners :boolean
+#  topic_ethical_social         :boolean
 #
 # Indexes
 #
diff --git a/dashboard/app/models/census/census_teacher_banner_v1.rb b/dashboard/app/models/census/census_teacher_banner_v1.rb
index ee1975835f34f..c0c8118f26f7e 100644
--- a/dashboard/app/models/census/census_teacher_banner_v1.rb
+++ b/dashboard/app/models/census/census_teacher_banner_v1.rb
@@ -30,6 +30,7 @@
 #  created_at                   :datetime         not null
 #  updated_at                   :datetime         not null
 #  share_with_regional_partners :boolean
+#  topic_ethical_social         :boolean
 #
 # Indexes
 #
diff --git a/dashboard/app/models/census/census_your_school2017v0.rb b/dashboard/app/models/census/census_your_school2017v0.rb
index 8992787e14882..137affe465c27 100644
--- a/dashboard/app/models/census/census_your_school2017v0.rb
+++ b/dashboard/app/models/census/census_your_school2017v0.rb
@@ -30,6 +30,7 @@
 #  created_at                   :datetime         not null
 #  updated_at                   :datetime         not null
 #  share_with_regional_partners :boolean
+#  topic_ethical_social         :boolean
 #
 # Indexes
 #
diff --git a/dashboard/app/models/census/census_your_school2017v1.rb b/dashboard/app/models/census/census_your_school2017v1.rb
index f6ed66cbdd137..208e99f9df17d 100644
--- a/dashboard/app/models/census/census_your_school2017v1.rb
+++ b/dashboard/app/models/census/census_your_school2017v1.rb
@@ -30,6 +30,7 @@
 #  created_at                   :datetime         not null
 #  updated_at                   :datetime         not null
 #  share_with_regional_partners :boolean
+#  topic_ethical_social         :boolean
 #
 # Indexes
 #
diff --git a/dashboard/app/models/census/census_your_school2017v2.rb b/dashboard/app/models/census/census_your_school2017v2.rb
index a6c6819e0adec..6c500df7a2260 100644
--- a/dashboard/app/models/census/census_your_school2017v2.rb
+++ b/dashboard/app/models/census/census_your_school2017v2.rb
@@ -30,6 +30,7 @@
 #  created_at                   :datetime         not null
 #  updated_at                   :datetime         not null
 #  share_with_regional_partners :boolean
+#  topic_ethical_social         :boolean
 #
 # Indexes
 #
diff --git a/dashboard/app/models/census/census_your_school2017v3.rb b/dashboard/app/models/census/census_your_school2017v3.rb
index e23d0c5abc68c..e6c7511a2247e 100644
--- a/dashboard/app/models/census/census_your_school2017v3.rb
+++ b/dashboard/app/models/census/census_your_school2017v3.rb
@@ -30,6 +30,7 @@
 #  created_at                   :datetime         not null
 #  updated_at                   :datetime         not null
 #  share_with_regional_partners :boolean
+#  topic_ethical_social         :boolean
 #
 # Indexes
 #
diff --git a/dashboard/app/models/census/census_your_school2017v4.rb b/dashboard/app/models/census/census_your_school2017v4.rb
index bec3b029e3e64..ce50f4acd26a0 100644
--- a/dashboard/app/models/census/census_your_school2017v4.rb
+++ b/dashboard/app/models/census/census_your_school2017v4.rb
@@ -30,6 +30,7 @@
 #  created_at                   :datetime         not null
 #  updated_at                   :datetime         not null
 #  share_with_regional_partners :boolean
+#  topic_ethical_social         :boolean
 #
 # Indexes
 #
diff --git a/dashboard/app/models/census/census_your_school2017v5.rb b/dashboard/app/models/census/census_your_school2017v5.rb
index e7a427352006f..c8ea29d791ca5 100644
--- a/dashboard/app/models/census/census_your_school2017v5.rb
+++ b/dashboard/app/models/census/census_your_school2017v5.rb
@@ -30,6 +30,7 @@
 #  created_at                   :datetime         not null
 #  updated_at                   :datetime         not null
 #  share_with_regional_partners :boolean
+#  topic_ethical_social         :boolean
 #
 # Indexes
 #
diff --git a/dashboard/app/models/census/census_your_school2017v6.rb b/dashboard/app/models/census/census_your_school2017v6.rb
new file mode 100644
index 0000000000000..75921e06e8ce5
--- /dev/null
+++ b/dashboard/app/models/census/census_your_school2017v6.rb
@@ -0,0 +1,50 @@
+# == Schema Information
+#
+# Table name: census_submissions
+#
+#  id                           :integer          not null, primary key
+#  type                         :string(255)      not null
+#  submitter_email_address      :string(255)
+#  submitter_name               :string(255)
+#  submitter_role               :string(255)
+#  school_year                  :integer          not null
+#  how_many_do_hoc              :string(255)
+#  how_many_after_school        :string(255)
+#  how_many_10_hours            :string(255)
+#  how_many_20_hours            :string(255)
+#  other_classes_under_20_hours :boolean
+#  topic_blocks                 :boolean
+#  topic_text                   :boolean
+#  topic_robots                 :boolean
+#  topic_internet               :boolean
+#  topic_security               :boolean
+#  topic_data                   :boolean
+#  topic_web_design             :boolean
+#  topic_game_design            :boolean
+#  topic_other                  :boolean
+#  topic_other_description      :string(255)
+#  topic_do_not_know            :boolean
+#  class_frequency              :string(255)
+#  tell_us_more                 :text(65535)
+#  pledged                      :boolean
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
+#  share_with_regional_partners :boolean
+#  topic_ethical_social         :boolean
+#
+# Indexes
+#
+#  index_census_submissions_on_school_year_and_id  (school_year,id)
+#
+
+# This class represents census submissions coming from /yourschool after
+# adding the topic_ethical_social checkbox.
+#
+
+class Census::CensusYourSchool2017v6 < Census::CensusYourSchool2017v5
+  # These questions are shown conditionally based on other answers.
+  # Only validate under those conditions.
+  with_options if: :show_followup? do
+    validates :topic_ethical_social, exclusion: {in: [nil], message: "cannot be nil"}
+  end
+end
diff --git a/dashboard/db/migrate/20180305045530_add_topic_ethical_social_to_census_submissions.rb b/dashboard/db/migrate/20180305045530_add_topic_ethical_social_to_census_submissions.rb
new file mode 100644
index 0000000000000..ae561c1613767
--- /dev/null
+++ b/dashboard/db/migrate/20180305045530_add_topic_ethical_social_to_census_submissions.rb
@@ -0,0 +1,5 @@
+class AddTopicEthicalSocialToCensusSubmissions < ActiveRecord::Migration[5.0]
+  def change
+    add_column :census_submissions, :topic_ethical_social, :boolean
+  end
+end
diff --git a/dashboard/db/schema.rb b/dashboard/db/schema.rb
index 9188eb6773c6a..afba85ab6f4ed 100644
--- a/dashboard/db/schema.rb
+++ b/dashboard/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180219200100) do
+ActiveRecord::Schema.define(version: 20180305045530) do
 
   create_table "activities", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
     t.integer  "user_id"
@@ -120,6 +120,7 @@
     t.datetime "created_at",                                 null: false
     t.datetime "updated_at",                                 null: false
     t.boolean  "share_with_regional_partners"
+    t.boolean  "topic_ethical_social"
     t.index ["school_year", "id"], name: "index_census_submissions_on_school_year_and_id", using: :btree
   end
 
diff --git a/dashboard/test/factories/census_factories.rb b/dashboard/test/factories/census_factories.rb
index e03bb8adf06d9..68759908894cb 100644
--- a/dashboard/test/factories/census_factories.rb
+++ b/dashboard/test/factories/census_factories.rb
@@ -100,6 +100,10 @@
     share_with_regional_partners true
   end
 
+  factory :census_your_school2017v6, parent: :census_your_school2017v5, class: Census::CensusYourSchool2017v6 do
+    topic_ethical_social true
+  end
+
   factory :census_hoc2017v1, parent: :census_submission, class: Census::CensusHoc2017v1 do
     submitter_name "Hoc Submitter"
   end
diff --git a/dashboard/test/models/census/census_your_school2017v5_test.rb b/dashboard/test/models/census/census_your_school2017v5_test.rb
index 38d95713dff90..1c6d8d12a509b 100644
--- a/dashboard/test/models/census/census_your_school2017v5_test.rb
+++ b/dashboard/test/models/census/census_your_school2017v5_test.rb
@@ -6,7 +6,7 @@ class Census::CensusYourSchool2017v5Test < ActiveSupport::TestCase
     assert submission.valid?, submission.errors.full_messages
   end
 
-  test "census 2017 v4 submission missing share_with_regional_partners" do
+  test "census 2017 v5 submission missing share_with_regional_partners" do
     submission = build(:census_your_school2017v5, share_with_regional_partners: nil)
     assert_not submission.valid?, submission.errors.full_messages
   end
diff --git a/dashboard/test/models/census/census_your_school2017v6_test.rb b/dashboard/test/models/census/census_your_school2017v6_test.rb
new file mode 100644
index 0000000000000..ed7764f59a684
--- /dev/null
+++ b/dashboard/test/models/census/census_your_school2017v6_test.rb
@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class Census::CensusYourSchool2017v6Test < ActiveSupport::TestCase
+  test "basic census 2017 v6 submission" do
+    submission = build(:census_your_school2017v6)
+    assert submission.valid?, submission.errors.full_messages
+  end
+
+  test "census 2017 v6 submission missing topic_ethical_social" do
+    submission = build(:census_your_school2017v6, :requiring_followup, topic_ethical_social: nil)
+    assert_not submission.valid?, submission.errors.full_messages
+  end
+end
diff --git a/pegasus/sites.v3/hourofcode.com/i18n/en.yml b/pegasus/sites.v3/hourofcode.com/i18n/en.yml
index fc3d7f95c068e..24d71e078f91f 100644
--- a/pegasus/sites.v3/hourofcode.com/i18n/en.yml
+++ b/pegasus/sites.v3/hourofcode.com/i18n/en.yml
@@ -4022,6 +4022,7 @@
   census_topics_data: "Data analysis"
   census_topics_web_design: "Web design using HTML and CSS"
   census_topics_game_design: "Game design using game layout tools without coding or computer programming"
+  census_topics_ethical_social: "Ethical and social issues in computing"
 
   teacher: "Teacher"
   administrator: "Administrator"
diff --git a/pegasus/sites.v3/hourofcode.com/views/census_questions_followup.haml b/pegasus/sites.v3/hourofcode.com/views/census_questions_followup.haml
index ca67d7160f1af..3d8c6f3eaf948 100644
--- a/pegasus/sites.v3/hourofcode.com/views/census_questions_followup.haml
+++ b/pegasus/sites.v3/hourofcode.com/views/census_questions_followup.haml
@@ -32,6 +32,10 @@
       name: "topic_game_design",
       label: hoc_s(:census_topics_game_design)
     },
+    {
+      name: "topic_ethical_social",
+      label: hoc_s(:census_topics_ethical_social)
+    },
     {
       name: "topic_other",
       label: hoc_s(:other_describe)

From c5872511c2f863e05334e66f5374d81fae1d4e66 Mon Sep 17 00:00:00 2001
From: Brendan Reville <brendan@code.org>
Date: Wed, 7 Mar 2018 14:41:58 -0800
Subject: [PATCH 10/56] Census: code review feedback

Remove social/ethics issues option from hourofcode.com census form.
Improve test assertion.
Update version posted by form.
---
 apps/src/templates/census2017/CensusForm.jsx                  | 2 +-
 dashboard/test/models/census/census_your_school2017v6_test.rb | 2 +-
 pegasus/sites.v3/hourofcode.com/i18n/en.yml                   | 1 -
 .../hourofcode.com/views/census_questions_followup.haml       | 4 ----
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/apps/src/templates/census2017/CensusForm.jsx b/apps/src/templates/census2017/CensusForm.jsx
index 29304f15edb57..f9c92836e4f5e 100644
--- a/apps/src/templates/census2017/CensusForm.jsx
+++ b/apps/src/templates/census2017/CensusForm.jsx
@@ -256,7 +256,7 @@ class CensusForm extends Component {
         !errors.country &&
         !errors.share) {
       $.ajax({
-        url: "/dashboardapi/v1/census/CensusYourSchool2017v5",
+        url: "/dashboardapi/v1/census/CensusYourSchool2017v6",
         type: "post",
         dataType: "json",
         data: $('#census-form').serialize()
diff --git a/dashboard/test/models/census/census_your_school2017v6_test.rb b/dashboard/test/models/census/census_your_school2017v6_test.rb
index ed7764f59a684..e99cf3da61f3e 100644
--- a/dashboard/test/models/census/census_your_school2017v6_test.rb
+++ b/dashboard/test/models/census/census_your_school2017v6_test.rb
@@ -8,6 +8,6 @@ class Census::CensusYourSchool2017v6Test < ActiveSupport::TestCase
 
   test "census 2017 v6 submission missing topic_ethical_social" do
     submission = build(:census_your_school2017v6, :requiring_followup, topic_ethical_social: nil)
-    assert_not submission.valid?, submission.errors.full_messages
+    refute submission.valid?
   end
 end
diff --git a/pegasus/sites.v3/hourofcode.com/i18n/en.yml b/pegasus/sites.v3/hourofcode.com/i18n/en.yml
index 24d71e078f91f..fc3d7f95c068e 100644
--- a/pegasus/sites.v3/hourofcode.com/i18n/en.yml
+++ b/pegasus/sites.v3/hourofcode.com/i18n/en.yml
@@ -4022,7 +4022,6 @@
   census_topics_data: "Data analysis"
   census_topics_web_design: "Web design using HTML and CSS"
   census_topics_game_design: "Game design using game layout tools without coding or computer programming"
-  census_topics_ethical_social: "Ethical and social issues in computing"
 
   teacher: "Teacher"
   administrator: "Administrator"
diff --git a/pegasus/sites.v3/hourofcode.com/views/census_questions_followup.haml b/pegasus/sites.v3/hourofcode.com/views/census_questions_followup.haml
index 3d8c6f3eaf948..ca67d7160f1af 100644
--- a/pegasus/sites.v3/hourofcode.com/views/census_questions_followup.haml
+++ b/pegasus/sites.v3/hourofcode.com/views/census_questions_followup.haml
@@ -32,10 +32,6 @@
       name: "topic_game_design",
       label: hoc_s(:census_topics_game_design)
     },
-    {
-      name: "topic_ethical_social",
-      label: hoc_s(:census_topics_ethical_social)
-    },
     {
       name: "topic_other",
       label: hoc_s(:other_describe)

From 696b448a183c459a272a519caaa12cbeedc2afda Mon Sep 17 00:00:00 2001
From: Caley Brock <caleybrock7@gmail.com>
Date: Wed, 7 Mar 2018 15:34:46 -0800
Subject: [PATCH 11/56] Turn on editing for google classroom and clever

---
 .../ManageStudentsActionsCell.jsx             | 25 +++++++++------
 .../manageStudents/ManageStudentsTable.jsx    | 31 +++++++++++++++----
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/apps/src/templates/manageStudents/ManageStudentsActionsCell.jsx b/apps/src/templates/manageStudents/ManageStudentsActionsCell.jsx
index 31f066227b146..a167a42e4649c 100644
--- a/apps/src/templates/manageStudents/ManageStudentsActionsCell.jsx
+++ b/apps/src/templates/manageStudents/ManageStudentsActionsCell.jsx
@@ -8,6 +8,7 @@ import {startEditingStudent, cancelEditingStudent, removeStudent, saveStudent, a
 import {connect} from 'react-redux';
 import BaseDialog from '../BaseDialog';
 import DialogFooter from "../teacherDashboard/DialogFooter";
+import {SectionLoginType} from '@cdo/apps/util/sharedConstants';
 import i18n from '@cdo/locale';
 
 const styles = {
@@ -27,6 +28,7 @@ class ManageStudentActionsCell extends Component {
     isSaving: PropTypes.bool,
     disableSaving: PropTypes.bool,
     rowType: PropTypes.oneOf(Object.values(RowType)),
+    loginType: PropTypes.string,
     // Provided by redux
     startEditingStudent: PropTypes.func,
     cancelEditingStudent: PropTypes.func,
@@ -89,7 +91,8 @@ class ManageStudentActionsCell extends Component {
   };
 
   render() {
-    const {rowType, isEditing} = this.props;
+    const {rowType, isEditing, loginType} = this.props;
+    const canDelete = [SectionLoginType.word, SectionLoginType.picture, SectionLoginType.email].includes(loginType);
     return (
       <div>
         {!isEditing &&
@@ -99,14 +102,18 @@ class ManageStudentActionsCell extends Component {
             >
               {i18n.edit()}
             </PopUpMenu.Item>
-            <MenuBreak/>
-            <PopUpMenu.Item
-              onClick={this.onRequestDelete}
-              color={color.red}
-            >
-              <FontAwesome icon="times-circle" style={styles.xIcon}/>
-              {i18n.removeStudent()}
-            </PopUpMenu.Item>
+            {canDelete &&
+              <MenuBreak/>
+            }
+            {canDelete &&
+              <PopUpMenu.Item
+                onClick={this.onRequestDelete}
+                color={color.red}
+              >
+                <FontAwesome icon="times-circle" style={styles.xIcon}/>
+                {i18n.removeStudent()}
+              </PopUpMenu.Item>
+            }
           </QuickActionsCell>
         }
         {(isEditing && (rowType !== RowType.ADD)) &&
diff --git a/apps/src/templates/manageStudents/ManageStudentsTable.jsx b/apps/src/templates/manageStudents/ManageStudentsTable.jsx
index 0ee927aa17aa9..35f8dcc341126 100644
--- a/apps/src/templates/manageStudents/ManageStudentsTable.jsx
+++ b/apps/src/templates/manageStudents/ManageStudentsTable.jsx
@@ -161,6 +161,7 @@ class ManageStudentsTable extends Component {
         isSaving={rowData.isSaving}
         disableSaving={disableSaving}
         rowType={rowData.rowType}
+        loginType={rowData.loginType}
       />
     );
   };
@@ -206,7 +207,7 @@ class ManageStudentsTable extends Component {
   getColumns = (sortable) => {
     const {loginType} = this.props;
     const passwordLabel = loginType === SectionLoginType.email ? i18n.password() : i18n.secret();
-    const dataColumns = [
+    let dataColumns = [
       {
         property: 'name',
         header: {
@@ -268,7 +269,7 @@ class ManageStudentsTable extends Component {
         }
       },
     ];
-    const controlsColumns = [
+    const passwordColumn = [
       {
         property: 'password',
         header: {
@@ -289,6 +290,8 @@ class ManageStudentsTable extends Component {
           }}
         }
       },
+    ];
+    const controlsColumn = [
       {
         property: 'actions',
         header: {
@@ -312,11 +315,27 @@ class ManageStudentsTable extends Component {
       },
     ];
 
-    if (loginType === SectionLoginType.word || loginType === SectionLoginType.picture || loginType === SectionLoginType.email) {
-      return dataColumns.concat(controlsColumns);
-    } else {
-      return dataColumns;
+    const allowedPasswordColumn = [
+      SectionLoginType.word,
+      SectionLoginType.picture,
+      SectionLoginType.email,
+    ];
+    const allowedControlsColumn = [
+      SectionLoginType.word,
+      SectionLoginType.picture,
+      SectionLoginType.email,
+      SectionLoginType.google_classroom,
+      SectionLoginType.clever,
+    ];
+
+    if (allowedPasswordColumn.includes(loginType)) {
+      dataColumns = dataColumns.concat(passwordColumn);
+    }
+    if (allowedControlsColumn.includes(loginType)) {
+      dataColumns = dataColumns.concat(controlsColumn);
     }
+
+    return dataColumns;
   };
 
   render() {

From 536e94ec6455d108fea8963199c7b9540abebe67 Mon Sep 17 00:00:00 2001
From: Erin Bond <erin.bond@code.org>
Date: Wed, 7 Mar 2018 15:06:11 -0800
Subject: [PATCH 12/56] clicking the cog icon opens a QuickActionsBox to edit
 all and control project sharing

---
 apps/i18n/common/en_us.json                   |  2 +
 .../ManageStudentsActionsHeaderCell.jsx       | 29 ++++++
 .../manageStudents/ManageStudentsTable.jsx    | 15 ++-
 .../src/templates/tables/QuickActionsCell.jsx | 94 ++++++++++++++-----
 .../tables/QuickActionsCell.story.jsx         | 23 ++++-
 apps/src/util/experiments.js                  |  1 +
 6 files changed, 136 insertions(+), 28 deletions(-)
 create mode 100644 apps/src/templates/manageStudents/ManageStudentsActionsHeaderCell.jsx

diff --git a/apps/i18n/common/en_us.json b/apps/i18n/common/en_us.json
index b7c6cdf246bf1..560b3114dce93 100644
--- a/apps/i18n/common/en_us.json
+++ b/apps/i18n/common/en_us.json
@@ -173,6 +173,7 @@
   "contractMatchBadName": "Your contract has the wrong name.",
   "contractMatchBadNameCase": "Function names are case-sensitive. Try changing the case of your contract's name.",
   "contractMatchBadRange": "Your contract has the wrong range.",
+  "controlProjectSharing": "Control project sharing",
   "copy": "Copy",
   "copyright": "Copyright",
   "correct": "Correct",
@@ -394,6 +395,7 @@
   "dropletBlock_whileBlock_description": "Creates a loop consisting of a conditional expression and a block of statements executed for each iteration of the loop. The loop continues to execute as long as the condition evaluates to true",
   "dropletBlock_whileBlock_signatureOverride": "while loop",
   "edit": "Edit",
+  "editAll": "Edit all",
   "editSectionDetails": "Edit Section Details",
   "editable": "Editable",
   "eligibilityExplanation": "In order to be eligible to receive a code for a subsidized Circuit Playground kit, you must meet the following requirements:",
diff --git a/apps/src/templates/manageStudents/ManageStudentsActionsHeaderCell.jsx b/apps/src/templates/manageStudents/ManageStudentsActionsHeaderCell.jsx
new file mode 100644
index 0000000000000..b9177b5b3b856
--- /dev/null
+++ b/apps/src/templates/manageStudents/ManageStudentsActionsHeaderCell.jsx
@@ -0,0 +1,29 @@
+import React, {Component} from 'react';
+import QuickActionsCell from "../tables/QuickActionsCell";
+import PopUpMenu, {MenuBreak} from "@cdo/apps/lib/ui/PopUpMenu";
+import i18n from '@cdo/locale';
+
+export default class ManageStudentsActionsHeaderCell extends Component {
+
+  render() {
+    return (
+      <div>
+        <QuickActionsCell
+          type="header"
+        >
+          <PopUpMenu.Item
+            onClick={() => console.log('edit all was clicked!')}
+          >
+            {i18n.editAll()}
+          </PopUpMenu.Item>
+          <MenuBreak/>
+          <PopUpMenu.Item
+            onClick={() => console.log('control project sharing was clicked!')}
+          >
+            {i18n.controlProjectSharing()}
+          </PopUpMenu.Item>
+        </QuickActionsCell>
+      </div>
+    );
+  }
+}
diff --git a/apps/src/templates/manageStudents/ManageStudentsTable.jsx b/apps/src/templates/manageStudents/ManageStudentsTable.jsx
index 179eb496f15e2..d3bd19688d184 100644
--- a/apps/src/templates/manageStudents/ManageStudentsTable.jsx
+++ b/apps/src/templates/manageStudents/ManageStudentsTable.jsx
@@ -11,11 +11,15 @@ import ManageStudentsNameCell from './ManageStudentsNameCell';
 import ManageStudentsAgeCell from './ManageStudentsAgeCell';
 import ManageStudentsGenderCell from './ManageStudentsGenderCell';
 import ManageStudentsActionsCell from './ManageStudentsActionsCell';
+import ManageStudentsActionsHeaderCell from './ManageStudentsActionsHeaderCell';
 import {convertStudentDataToArray, AddStatus, RowType, saveAllStudents} from './manageStudentsRedux';
 import { connect } from 'react-redux';
 import Notification, {NotificationType} from '../Notification';
 import AddMultipleStudents from './AddMultipleStudents';
 import Button from '../Button';
+import experiments from '@cdo/apps/util/experiments';
+
+const showShareColumn = experiments.isEnabled(experiments.SHARE_COLUMN);
 
 export const studentSectionDataPropType = PropTypes.shape({
   id: PropTypes.number.isRequired,
@@ -176,7 +180,16 @@ class ManageStudentsTable extends Component {
           />
         }
         {numberOfEditingRows <= 1 &&
-          i18n.actions()
+          <span>
+            <div style={{width: '40%', float: 'left'}}>
+              {i18n.actions()}
+            </div>
+            <div style={{width: '40%', float: 'left'}}>
+              {showShareColumn &&
+                <ManageStudentsActionsHeaderCell/>
+              }
+            </div>
+          </span>
         }
       </div>
     );
diff --git a/apps/src/templates/tables/QuickActionsCell.jsx b/apps/src/templates/tables/QuickActionsCell.jsx
index 13aee4f0c9801..7936fabb07cc4 100644
--- a/apps/src/templates/tables/QuickActionsCell.jsx
+++ b/apps/src/templates/tables/QuickActionsCell.jsx
@@ -1,30 +1,62 @@
 import React, {Component, PropTypes} from 'react';
+import Radium from 'radium';
 import color from "../../util/color";
 import PopUpMenu from "@cdo/apps/lib/ui/PopUpMenu";
 import styleConstants from '../../styleConstants';
 import throttle from 'lodash/debounce';
+import FontAwesome from '../FontAwesome';
+
+export const QuickActionsCellType = {
+  header: 'header',
+  body: 'body'
+};
 
 const styles = {
-  actionButton:{
-    border: '1px solid ' + color.white,
-    paddingLeft: 5,
-    paddingRight: 5,
-    paddingTop: 4,
-    paddingBottom: 4,
-    borderRadius: 5,
-    color: color.lighter_gray,
-    margin: 3,
-    cursor: 'pointer',
+  actionButton: {
+    [QuickActionsCellType.body]: {
+      border: '1px solid ' + color.white,
+      paddingLeft: 5,
+      paddingRight: 5,
+      paddingTop: 4,
+      paddingBottom: 4,
+      borderRadius: 5,
+      color: color.lighter_gray,
+      margin: 3,
+      cursor: 'pointer',
+    },
+    [QuickActionsCellType.header]: {
+      paddingLeft: 5,
+      paddingRight: 5,
+      paddingTop: 4,
+      paddingBottom: 4,
+      fontSize: 20,
+      marginTop: -3,
+      color: color.darker_gray,
+      cursor: 'pointer',
+    }
   },
   hoverFocus: {
-    backgroundColor: color.lighter_gray,
-    border: '1px solid ' + color.light_gray,
-    borderRadius: 5,
-    paddingTop: 4,
-    paddingBottom: 4,
-    paddingLeft: 5,
-    paddingRight: 5,
-    color: color.white,
+    [QuickActionsCellType.body]: {
+      backgroundColor: color.lighter_gray,
+      border: '1px solid ' + color.light_gray,
+      borderRadius: 5,
+      paddingTop: 4,
+      paddingBottom: 4,
+      paddingLeft: 5,
+      paddingRight: 5,
+      color: color.white,
+    },
+    [QuickActionsCellType.header]: {
+      paddingLeft: 5,
+      paddingRight: 5,
+      paddingTop: 4,
+      paddingBottom: 4,
+      fontSize: 20,
+      // float: 'right',
+      color: color.darker_gray,
+      margin: 3,
+      cursor: 'pointer',
+    }
   },
 };
 
@@ -33,7 +65,12 @@ class QuickActionsCell extends Component {
     children: PropTypes.oneOfType([
       PropTypes.node,
       PropTypes.array
-    ]).isRequired
+    ]).isRequired,
+    type: PropTypes.oneOf(Object.keys(QuickActionsCellType))
+  };
+
+  static defaultProps = {
+    type: 'body'
   };
 
   state = {
@@ -81,17 +118,22 @@ class QuickActionsCell extends Component {
   };
 
   render() {
+    const {type} = this.props;
     const targetPoint = {top: this.state.menuTop, left: this.state.menuLeft};
 
+    const icons = {
+      header: 'cog',
+      body: 'chevron-down'
+    };
+
     return (
       <span ref={span => this.icon = span}>
-        <a
-          icon="chevron-down"
-          style={this.state.open ? {...styles.actionButton, ...styles.hoverFocus} : styles.actionButton}
+        <FontAwesome
+          icon={icons[type]}
+          style={this.state.open ? styles.hoverFocus[type] : styles.actionButton[type]}
           onClick={this.state.canOpen ? this.open : undefined}
-        >
-          <i className="fa fa-chevron-down ui-test-section-dropdown"></i>
-        </a>
+          className="ui-test-section-dropdown"
+        />
         <PopUpMenu
           targetPoint={targetPoint}
           isOpen={this.state.open}
@@ -105,4 +147,4 @@ class QuickActionsCell extends Component {
   }
 }
 
-export default QuickActionsCell;
+export default Radium(QuickActionsCell);
diff --git a/apps/src/templates/tables/QuickActionsCell.story.jsx b/apps/src/templates/tables/QuickActionsCell.story.jsx
index 79402bb62c7f4..778a759195c29 100644
--- a/apps/src/templates/tables/QuickActionsCell.story.jsx
+++ b/apps/src/templates/tables/QuickActionsCell.story.jsx
@@ -7,7 +7,7 @@ export default storybook => {
     .storiesOf('QuickActionsCell', module)
     .addStoryTable([
         {
-          name: 'QuickActionsCell',
+          name: 'QuickActionsCell - 2 children',
           description: 'Shown with 2 QuickActions as children',
           story: () => (
             <QuickActionsCell>
@@ -25,5 +25,26 @@ export default storybook => {
             </QuickActionsCell>
           )
         },
+        {
+          name: 'QuickActionsCell - different icon',
+          description: 'Override the default cheveron down icon',
+          story: () => (
+            <QuickActionsCell
+              type="header"
+            >
+              <PopUpMenu.Item
+                onClick={() => {console.log("clicked");}}
+              >
+                {"Action 1"}
+              </PopUpMenu.Item>
+              <MenuBreak/>
+              <PopUpMenu.Item
+                onClick={() => {console.log("clicked");}}
+              >
+                {"Action 2"}
+              </PopUpMenu.Item>
+            </QuickActionsCell>
+          )
+        },
       ]);
   };
diff --git a/apps/src/util/experiments.js b/apps/src/util/experiments.js
index a79970008b7e2..7a4e520da3163 100644
--- a/apps/src/util/experiments.js
+++ b/apps/src/util/experiments.js
@@ -15,6 +15,7 @@ const STORAGE_KEY = 'experimentsList';
 const GA_EVENT = 'experiments';
 const EXPERIMENT_LIFESPAN_HOURS = 12;
 
+experiments.SHARE_COLUMN = 'shareColumn';
 /**
  * Get our query string. Provided as a method so that tests can mock this.
  */

From b3b46134e69f9d817d2b4f35c0639b6a8d9b7eca Mon Sep 17 00:00:00 2001
From: Caley Brock <caleybrock7@gmail.com>
Date: Wed, 7 Mar 2018 22:34:15 -0800
Subject: [PATCH 13/56] Add tests for manage students actions cell

---
 .../ManageStudentsActionsCellTest.js          | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/apps/test/unit/templates/manageStudents/ManageStudentsActionsCellTest.js b/apps/test/unit/templates/manageStudents/ManageStudentsActionsCellTest.js
index 7f21098c11c0f..3cfa7e8767f60 100644
--- a/apps/test/unit/templates/manageStudents/ManageStudentsActionsCellTest.js
+++ b/apps/test/unit/templates/manageStudents/ManageStudentsActionsCellTest.js
@@ -13,13 +13,56 @@ const DEFAULT_PROPS = {
 };
 
 describe('ManageStudentsActionsCell', () => {
-  it('renders the edit and remove option by default', () => {
+  it('renders the edit and remove option when a picture login', () => {
     const wrapper = shallow(
         <ManageStudentsActionsCell
           {...DEFAULT_PROPS}
+          loginType={"picture"}
         />
     );
     expect(wrapper).to.contain("Remove student");
     expect(wrapper).to.contain("Edit");
   });
+
+  it('renders the edit and remove option when a word login', () => {
+    const wrapper = shallow(
+        <ManageStudentsActionsCell
+          {...DEFAULT_PROPS}
+          loginType={"word"}
+        />
+    );
+    expect(wrapper).to.contain("Remove student");
+    expect(wrapper).to.contain("Edit");
+  });
+
+  it('renders the edit and remove option when a email login', () => {
+    const wrapper = shallow(
+        <ManageStudentsActionsCell
+          {...DEFAULT_PROPS}
+          loginType={"email"}
+        />
+    );
+    expect(wrapper).to.contain("Remove student");
+    expect(wrapper).to.contain("Edit");
+  });
+
+  it('renders the edit option when a clever login', () => {
+    const wrapper = shallow(
+        <ManageStudentsActionsCell
+          {...DEFAULT_PROPS}
+          loginType={"clever"}
+        />
+    );
+    expect(wrapper).to.contain("Edit");
+  });
+
+  it('renders the edit option when a google login', () => {
+    const wrapper = shallow(
+        <ManageStudentsActionsCell
+          {...DEFAULT_PROPS}
+          loginType={"google"}
+        />
+    );
+    expect(wrapper).to.contain("Edit");
+  });
 });

From 50ee807fd5ea245dd0dd8268c94ead0139d34260 Mon Sep 17 00:00:00 2001
From: Caley Brock <caleybrock7@gmail.com>
Date: Thu, 8 Mar 2018 10:34:34 -0800
Subject: [PATCH 14/56] Update get api to dashboardapi

---
 apps/src/templates/teacherDashboard/sections.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/src/templates/teacherDashboard/sections.js b/apps/src/templates/teacherDashboard/sections.js
index bc9f44799c250..e18c16c86c1c5 100644
--- a/apps/src/templates/teacherDashboard/sections.js
+++ b/apps/src/templates/teacherDashboard/sections.js
@@ -84,7 +84,7 @@ export function renderSectionTable(sectionId, loginType) {
   store.dispatch(setLoginType(loginType));
   store.dispatch(setSectionId(sectionId));
 
-  const dataUrl = `/v2/sections/${sectionId}/students`;
+  const dataUrl = `/dashboardapi/sections/${sectionId}/students`;
   const element = document.getElementById('student-table-react');
 
   $.ajax({

From befec2023f162f740d2b40c73d1753c8f37ec1e1 Mon Sep 17 00:00:00 2001
From: Caley Brock <caleybrock7@gmail.com>
Date: Thu, 8 Mar 2018 10:43:20 -0800
Subject: [PATCH 15/56] Update comment

---
 apps/src/templates/manageStudents/manageStudentsRedux.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/src/templates/manageStudents/manageStudentsRedux.js b/apps/src/templates/manageStudents/manageStudentsRedux.js
index e0275fb4ab264..0a265d30fc7fd 100644
--- a/apps/src/templates/manageStudents/manageStudentsRedux.js
+++ b/apps/src/templates/manageStudents/manageStudentsRedux.js
@@ -387,7 +387,7 @@ export default function manageStudents(state=initialState, action) {
   return state;
 }
 
-// Converts data from /v2/sections/sectionid/students to a set of key/value
+// Converts data from /dashboardapi/sections/sectionid/students to a set of key/value
 // objects for the redux store
 export const convertStudentServerData = (studentData, loginType, sectionId) => {
   let studentLookup = {};

From d61835eb4afca4cc42666aa0c2cfc75b2554fb5e Mon Sep 17 00:00:00 2001
From: Ram Kandasamy <ram@code.org>
Date: Thu, 8 Mar 2018 10:48:35 -0800
Subject: [PATCH 16/56] Add a uses_droplet unit test

---
 dashboard/test/models/blockly_test.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/dashboard/test/models/blockly_test.rb b/dashboard/test/models/blockly_test.rb
index d00057782d375..f3fc1d062face 100644
--- a/dashboard/test/models/blockly_test.rb
+++ b/dashboard/test/models/blockly_test.rb
@@ -221,4 +221,24 @@ def assert_equal_xml(a, b)
 
     assert_nil level.localized_authored_hints
   end
+
+  test 'uses_droplet for StudioEC levels' do
+    level = Level.new(
+      name: 'test studioEC level',
+      type: 'Blockly',
+      game: Game.studio_ec,
+    )
+
+    assert level.uses_droplet?
+  end
+
+  test 'does not use droplet for maze levels' do
+    level = Level.new(
+      name: 'test studioEC level',
+      type: 'Blockly',
+      game_id: Game.by_name('Maze'),
+    )
+
+    refute level.uses_droplet?
+  end
 end

From 62ee6ac03cd707a1f80633e309817b34c9f99dc4 Mon Sep 17 00:00:00 2001
From: Drew Samnick <drew.samnick@code.org>
Date: Thu, 8 Mar 2018 11:21:25 -0800
Subject: [PATCH 17/56] Add S3 upload scripts for IB and AP data

---
 bin/oneoff/census/ap-data/README.md           |  4 +-
 .../census/ap-data/upload-ap-offering-data.rb | 62 +++++++++++++++++++
 .../ap-data/upload-ap-school-code-data.rb     | 48 ++++++++++++++
 .../census/ib-data/upload-ib-offering-data.rb | 55 ++++++++++++++++
 .../ib-data/upload-ib-school-code-data.rb     | 48 ++++++++++++++
 dashboard/app/models/census/ap_cs_offering.rb |  6 +-
 dashboard/app/models/census/ib_cs_offering.rb |  6 +-
 7 files changed, 226 insertions(+), 3 deletions(-)
 create mode 100755 bin/oneoff/census/ap-data/upload-ap-offering-data.rb
 create mode 100644 bin/oneoff/census/ap-data/upload-ap-school-code-data.rb
 create mode 100755 bin/oneoff/census/ib-data/upload-ib-offering-data.rb
 create mode 100644 bin/oneoff/census/ib-data/upload-ib-school-code-data.rb

diff --git a/bin/oneoff/census/ap-data/README.md b/bin/oneoff/census/ap-data/README.md
index bbb218dabce00..c51d1216201ae 100644
--- a/bin/oneoff/census/ap-data/README.md
+++ b/bin/oneoff/census/ap-data/README.md
@@ -6,4 +6,6 @@ When the College Board gives us data about which schools teach AP Computer Scien
 * `map-ap-school-data.rb` - This script reads in `ap-school-data.csv`, normalizing the school addresses. It then iterates over every school in the database, normalizes that address, and compares it with the addresses from the AP data. Any matches are output to `ap-school-code-map.csv`
 * `dedupe-ap-school-codes.rb` - After the mapping above, we may have multiple matches for a given school code. This is because there can be multiple schools at the same address. This script reads `ap-school-code-map.csv`, groups the data by school code, and asks the user to select the best match for any code with multiple NCES school matches. The deduped data is output to `ap-school-code-map-deduped.csv`
 * `merge-ap-school-codes.rb` - Reads in `ap-school-code-map-deduped.csv` and merges that data with the data from the NCES/AI crosswalk and what already exists in the database. Outputs to `ap-school-code-map-merged.csv`
-* `check-school-codes.rb` - This script was initially used to compare the mapping between AP school codes and NCES ids that we got from the College Board. That mapping had multiple AP codes for the same NCES id and this script showed that even for the schools without duplicates there were many mapping that seemed to be incorrect since they disagreed on either the state or zip code.
\ No newline at end of file
+* `check-school-codes.rb` - This script was initially used to compare the mapping between AP school codes and NCES ids that we got from the College Board. That mapping had multiple AP codes for the same NCES id and this script showed that even for the schools without duplicates there were many mapping that seemed to be incorrect since they disagreed on either the state or zip code.
+* `upload-ap-school-code-data.rb` - Used to upload a the school code mapping data file to S3.
+* `upload-ap-offering-data.rb` - Used to upload a data file to S3 for a given AP course and school year.
diff --git a/bin/oneoff/census/ap-data/upload-ap-offering-data.rb b/bin/oneoff/census/ap-data/upload-ap-offering-data.rb
new file mode 100755
index 0000000000000..177c37135f3b1
--- /dev/null
+++ b/bin/oneoff/census/ap-data/upload-ap-offering-data.rb
@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+
+require_relative '../../../../dashboard/config/environment'
+require 'optparse'
+
+CDO.log = Logger.new(STDERR)
+
+ap_courses = Census::ApCsOffering::COURSES.values
+
+options = {
+  filename: nil,
+  course: nil,
+  school_year: nil,
+}
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options]"
+  opts.on('-f', '--filename FILENAME', 'File containing the data to upload') do |f|
+    options[:filename] = f
+  end
+  opts.on('-c', '--course AP_COURSE_NAME', ap_courses.join(' or ')) do |c|
+    options[:course] = c
+  end
+  opts.on('-y', '--school_year YEAR', 'The school year for the data. This should be the calendar year in which the school year began (e.g., 2017 for the 2017-2018 school year)') do |y|
+    options[:school_year] = y
+  end
+  opts.on('-h', '--help', 'Prints this help') do
+    puts opts
+    exit
+  end
+end.parse!
+
+missing_args = [:filename, :course, :school_year].select {|arg| options[arg].nil?}
+raise OptionParser::MissingArgument.new(missing_args.join(', ')) unless missing_args.empty?
+raise OptionParser::InvalidOption.new("Course must be one of #{ap_courses.join(' or ')}") unless ap_courses.include? options[:course]
+raise OptionParser::InvalidOption.new("School year must be four digits") unless options[:school_year] =~ /^\d{4}$/
+
+bucket_name = Census::ApCsOffering::CENSUS_BUCKET_NAME
+object_key = Census::ApCsOffering.construct_object_key(options[:course], options[:school_year].to_i)
+backup_object_key = "#{object_key}.backup.#{DateTime.now.strftime('%Y-%m-%d-%H-%M-%S')}"
+
+begin
+  AWS::S3.process_file(bucket_name, object_key) do |filename|
+    CDO.log.info "Backing up '#{object_key}' to '#{backup_object_key}' in '#{bucket_name}' bucket in S3"
+    AWS::S3.upload_to_bucket(
+      bucket_name,
+      backup_object_key,
+      open(filename),
+      no_random: true
+    )
+  end
+rescue Aws::S3::Errors::NoSuchKey
+  CDO.log.info "'#{object_key}' not found in S3 - skipping backup."
+end
+
+CDO.log.info "Uploading '#{options[:filename]}' to '#{bucket_name}' bucket in S3 with object key '#{object_key}'"
+
+AWS::S3.upload_to_bucket(
+  bucket_name,
+  object_key,
+  open(options[:filename]),
+  no_random: true
+)
diff --git a/bin/oneoff/census/ap-data/upload-ap-school-code-data.rb b/bin/oneoff/census/ap-data/upload-ap-school-code-data.rb
new file mode 100644
index 0000000000000..e54d781993d6c
--- /dev/null
+++ b/bin/oneoff/census/ap-data/upload-ap-school-code-data.rb
@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+
+require_relative '../../../../dashboard/config/environment'
+require 'optparse'
+
+CDO.log = Logger.new(STDERR)
+
+filename = nil
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options]"
+  opts.on('-f', '--filename FILENAME', 'File containing the data to upload') do |f|
+    filename = f
+  end
+  opts.on('-h', '--help', 'Prints this help') do
+    puts opts
+    exit
+  end
+end.parse!
+
+raise OptionParser::MissingArgument.new(missing_args.join(', ')) unless filename.nil?
+
+bucket_name = Census::ApSchoolCode::CENSUS_BUCKET_NAME
+object_key = Census::ApSchoolCode::CSV_OBJECT_KEY
+backup_object_key = "#{object_key}.backup.#{DateTime.now.strftime('%Y-%m-%d-%H-%M-%S')}"
+
+begin
+  AWS::S3.process_file(bucket_name, object_key) do |file_name|
+    CDO.log.info "Backing up '#{object_key}' to '#{backup_object_key}' in '#{bucket_name}' bucket in S3"
+    AWS::S3.upload_to_bucket(
+      bucket_name,
+      backup_object_key,
+      open(file_name),
+      no_random: true
+    )
+  end
+rescue Aws::S3::Errors::NoSuchKey
+  CDO.log.info "'#{object_key}' not found in S3 - skipping backup."
+end
+
+CDO.log.info "Uploading '#{options[:filename]}' to '#{bucket_name}' bucket in S3 with object key '#{object_key}'"
+
+AWS::S3.upload_to_bucket(
+  bucket_name,
+  object_key,
+  open(options[:filename]),
+  no_random: true
+)
diff --git a/bin/oneoff/census/ib-data/upload-ib-offering-data.rb b/bin/oneoff/census/ib-data/upload-ib-offering-data.rb
new file mode 100755
index 0000000000000..b418ca8311040
--- /dev/null
+++ b/bin/oneoff/census/ib-data/upload-ib-offering-data.rb
@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+
+require_relative '../../../../dashboard/config/environment'
+require 'optparse'
+
+CDO.log = Logger.new(STDERR)
+
+options = {
+  filename: nil,
+  school_year: nil,
+}
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options]"
+  opts.on('-f', '--filename FILENAME', 'File containing the data to upload') do |f|
+    options[:filename] = f
+  end
+  opts.on('-y', '--school_year YEAR', 'The school year for the data. This should be the calendar year in which the school year began (e.g., 2017 for the 2017-2018 school year)') do |y|
+    options[:school_year] = y
+  end
+  opts.on('-h', '--help', 'Prints this help') do
+    puts opts
+    exit
+  end
+end.parse!
+
+missing_args = [:filename, :school_year].select {|arg| options[arg].nil?}
+raise OptionParser::MissingArgument.new(missing_args.join(', ')) unless missing_args.empty?
+raise OptionParser::InvalidOption.new("School year must be four digits") unless options[:school_year] =~ /^\d{4}$/
+
+bucket_name = Census::IbCsOffering::CENSUS_BUCKET_NAME
+object_key = Census::IbCsOffering.construct_object_key(options[:school_year].to_i)
+backup_object_key = "#{object_key}.backup.#{DateTime.now.strftime('%Y-%m-%d-%H-%M-%S')}"
+
+begin
+  AWS::S3.process_file(bucket_name, object_key) do |filename|
+    CDO.log.info "Backing up '#{object_key}' to '#{backup_object_key}' in '#{bucket_name}' bucket in S3"
+    AWS::S3.upload_to_bucket(
+      bucket_name,
+      backup_object_key,
+      open(filename),
+      no_random: true
+    )
+  end
+rescue Aws::S3::Errors::NoSuchKey
+  CDO.log.info "'#{object_key}' not found in S3 - skipping backup."
+end
+
+CDO.log.info "Uploading '#{options[:filename]}' to '#{bucket_name}' bucket in S3 with object key '#{object_key}'"
+
+AWS::S3.upload_to_bucket(
+  bucket_name,
+  object_key,
+  open(options[:filename]),
+  no_random: true
+)
diff --git a/bin/oneoff/census/ib-data/upload-ib-school-code-data.rb b/bin/oneoff/census/ib-data/upload-ib-school-code-data.rb
new file mode 100644
index 0000000000000..9c4c273493272
--- /dev/null
+++ b/bin/oneoff/census/ib-data/upload-ib-school-code-data.rb
@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+
+require_relative '../../../../dashboard/config/environment'
+require 'optparse'
+
+CDO.log = Logger.new(STDERR)
+
+filename = nil
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options]"
+  opts.on('-f', '--filename FILENAME', 'File containing the data to upload') do |f|
+    filename = f
+  end
+  opts.on('-h', '--help', 'Prints this help') do
+    puts opts
+    exit
+  end
+end.parse!
+
+raise OptionParser::MissingArgument.new(missing_args.join(', ')) unless filename.nil?
+
+bucket_name = Census::IbSchoolCode::CENSUS_BUCKET_NAME
+object_key = Census::IbSchoolCode::CSV_OBJECT_KEY
+backup_object_key = "#{object_key}.backup.#{DateTime.now.strftime('%Y-%m-%d-%H-%M-%S')}"
+
+begin
+  AWS::S3.process_file(bucket_name, object_key) do |file_name|
+    CDO.log.info "Backing up '#{object_key}' to '#{backup_object_key}' in '#{bucket_name}' bucket in S3"
+    AWS::S3.upload_to_bucket(
+      bucket_name,
+      backup_object_key,
+      open(file_name),
+      no_random: true
+    )
+  end
+rescue Aws::S3::Errors::NoSuchKey
+  CDO.log.info "'#{object_key}' not found in S3 - skipping backup."
+end
+
+CDO.log.info "Uploading '#{options[:filename]}' to '#{bucket_name}' bucket in S3 with object key '#{object_key}'"
+
+AWS::S3.upload_to_bucket(
+  bucket_name,
+  object_key,
+  open(options[:filename]),
+  no_random: true
+)
diff --git a/dashboard/app/models/census/ap_cs_offering.rb b/dashboard/app/models/census/ap_cs_offering.rb
index e3cc5deac1093..d73c4475e3ffb 100644
--- a/dashboard/app/models/census/ap_cs_offering.rb
+++ b/dashboard/app/models/census/ap_cs_offering.rb
@@ -54,6 +54,10 @@ def self.seed_from_csv(course, school_year, filename)
 
   CENSUS_BUCKET_NAME = "cdo-census".freeze
 
+  def self.construct_object_key(course, school_year)
+    "ap_cs_offerings/#{course}-#{school_year}-#{school_year + 1}.csv"
+  end
+
   def self.seed_from_s3
     # AP CS Offering data files in S3 are named
     # "ap_cs_offerings/<COURSE>-<SCHOOL_YEAR_START>-<SCHOOL_YEAR_END>.csv"
@@ -62,7 +66,7 @@ def self.seed_from_s3
     current_year = Date.today.year
     (2016..current_year).each do |school_year|
       ['CSP', 'CSA'].each do |course|
-        object_key = "ap_cs_offerings/#{course}-#{school_year}-#{school_year + 1}.csv"
+        object_key = construct_object_key(course, school_year)
         begin
           AWS::S3.seed_from_file(CENSUS_BUCKET_NAME, object_key) do |filename|
             seed_from_csv(course, school_year, filename)
diff --git a/dashboard/app/models/census/ib_cs_offering.rb b/dashboard/app/models/census/ib_cs_offering.rb
index a56395c84d62a..533ae1fc02174 100644
--- a/dashboard/app/models/census/ib_cs_offering.rb
+++ b/dashboard/app/models/census/ib_cs_offering.rb
@@ -57,13 +57,17 @@ def self.seed_from_csv(school_year, filename)
 
   CENSUS_BUCKET_NAME = "cdo-census".freeze
 
+  def self.construct_object_key(school_year)
+    "ib_cs_offerings/#{school_year}-#{school_year + 1}.csv"
+  end
+
   def self.seed_from_s3
     # IB CS Offering data files in S3 are named
     # "ib_cs_offerings/<SCHOOL_YEAR_START>-<SCHOOL_YEAR_END>.csv"
     # The first school year where we have data is 2017-2018
     current_year = Date.today.year
     (2017..current_year).each do |school_year|
-      object_key = "ib_cs_offerings/#{school_year}-#{school_year + 1}.csv"
+      object_key = construct_object_key(school_year)
       begin
         AWS::S3.seed_from_file(CENSUS_BUCKET_NAME, object_key) do |filename|
           seed_from_csv(school_year, filename)

From 9db5f3a8fd4c79690d518b15bde5d45cdeec3143 Mon Sep 17 00:00:00 2001
From: Brad Buchanan <brad@code.org>
Date: Thu, 8 Mar 2018 11:40:44 -0800
Subject: [PATCH 18/56] SectionTable -> OwnedSectionsTable

---
 .../teacherDashboard/OwnedSections.jsx        |  6 +++---
 ...ectionTable.jsx => OwnedSectionsTable.jsx} |  8 ++++----
 ...story.jsx => OwnedSectionsTable.story.jsx} |  6 +++---
 ...TableTest.js => OwnedSectionsTableTest.js} | 12 +++++------
 .../teacherDashboard/OwnedSectionsTest.js     | 20 +++++++++----------
 5 files changed, 26 insertions(+), 26 deletions(-)
 rename apps/src/templates/teacherDashboard/{SectionTable.jsx => OwnedSectionsTable.jsx} (97%)
 rename apps/src/templates/teacherDashboard/{SectionTable.story.jsx => OwnedSectionsTable.story.jsx} (96%)
 rename apps/test/unit/templates/teacherDashboard/{SectionTableTest.js => OwnedSectionsTableTest.js} (96%)

diff --git a/apps/src/templates/teacherDashboard/OwnedSections.jsx b/apps/src/templates/teacherDashboard/OwnedSections.jsx
index 9a9114436ba0d..95fd6212528e4 100644
--- a/apps/src/templates/teacherDashboard/OwnedSections.jsx
+++ b/apps/src/templates/teacherDashboard/OwnedSections.jsx
@@ -3,7 +3,7 @@
 import React, {PropTypes} from 'react';
 import {connect} from 'react-redux';
 import _ from 'lodash';
-import SectionTable from './SectionTable';
+import OwnedSectionsTable from './OwnedSectionsTable';
 import RosterDialog from './RosterDialog';
 import Button from '@cdo/apps/templates/Button';
 import {
@@ -109,7 +109,7 @@ class OwnedSections extends React.Component {
               buttonClassName="uitest-newsection"
             />
             {visibleSectionIds.length > 0 &&
-              <SectionTable
+              <OwnedSectionsTable
                 sectionIds={visibleSectionIds}
                 onEdit={beginEditingSection}
               />
@@ -130,7 +130,7 @@ class OwnedSections extends React.Component {
                 <div style={styles.hiddenSectionLabel}>
                   {i18n.hiddenSections()}
                 </div>
-                <SectionTable
+                <OwnedSectionsTable
                   sectionIds={hiddenSectionIds}
                   onEdit={beginEditingSection}
                 />
diff --git a/apps/src/templates/teacherDashboard/SectionTable.jsx b/apps/src/templates/teacherDashboard/OwnedSectionsTable.jsx
similarity index 97%
rename from apps/src/templates/teacherDashboard/SectionTable.jsx
rename to apps/src/templates/teacherDashboard/OwnedSectionsTable.jsx
index 6fd01da09a0f0..0c47dd59fa431 100644
--- a/apps/src/templates/teacherDashboard/SectionTable.jsx
+++ b/apps/src/templates/teacherDashboard/OwnedSectionsTable.jsx
@@ -54,7 +54,7 @@ const styles = {
   },
 };
 
-// Cell formatters for sortable SectionTable.
+// Cell formatters for sortable OwnedSectionsTable.
 export const sectionLinkFormatter = function (name, {rowData}) {
   const pegasusUrl = pegasus('/teacher-dashboard#/sections/' + rowData.id);
   return <a style={tableLayoutStyles.link} href={pegasusUrl}>{rowData.name}</a>;
@@ -139,7 +139,7 @@ const hiddenFormatter = function (id) {
  * Long term it would be ideal if section_api_helpers went away and both components
  * used dashboard.
  */
-class SectionTable extends Component {
+class OwnedSectionsTable extends Component {
   static propTypes = {
     sectionIds: PropTypes.arrayOf(PropTypes.number).isRequired,
     onEdit: PropTypes.func.isRequired,
@@ -289,8 +289,8 @@ class SectionTable extends Component {
   }
 }
 
-export const UnconnectedSectionTable = SectionTable;
+export const UnconnectedOwnedSectionsTable = OwnedSectionsTable;
 
 export default connect((state, ownProps) => ({
   sectionRows: getSectionRows(state, ownProps.sectionIds)
-}))(SectionTable);
+}))(OwnedSectionsTable);
diff --git a/apps/src/templates/teacherDashboard/SectionTable.story.jsx b/apps/src/templates/teacherDashboard/OwnedSectionsTable.story.jsx
similarity index 96%
rename from apps/src/templates/teacherDashboard/SectionTable.story.jsx
rename to apps/src/templates/teacherDashboard/OwnedSectionsTable.story.jsx
index 115ce013062cc..e91321aa06d4d 100644
--- a/apps/src/templates/teacherDashboard/SectionTable.story.jsx
+++ b/apps/src/templates/teacherDashboard/OwnedSectionsTable.story.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import {Provider} from 'react-redux';
 import {combineReducers, createStore} from 'redux';
-import SectionTable from './SectionTable';
+import OwnedSectionsTable from './OwnedSectionsTable';
 import teacherSections, {
   setValidGrades,
   setValidAssignments,
@@ -166,7 +166,7 @@ const validCourses = [
 
 export default storybook => {
   storybook
-    .storiesOf('SectionTable (teacher dashboard)', module)
+    .storiesOf('OwnedSectionsTable (teacher dashboard)', module)
     .addStoryTable([
       {
         name: 'section table',
@@ -177,7 +177,7 @@ export default storybook => {
           store.dispatch(setSections(serverSections));
           return (
             <Provider store={store}>
-              <SectionTable
+              <OwnedSectionsTable
                 sectionIds={[11, 12, 20, 21, 307]}
                 onEdit={() => {}}
               />
diff --git a/apps/test/unit/templates/teacherDashboard/SectionTableTest.js b/apps/test/unit/templates/teacherDashboard/OwnedSectionsTableTest.js
similarity index 96%
rename from apps/test/unit/templates/teacherDashboard/SectionTableTest.js
rename to apps/test/unit/templates/teacherDashboard/OwnedSectionsTableTest.js
index 36fd773810564..a17861494b524 100644
--- a/apps/test/unit/templates/teacherDashboard/SectionTableTest.js
+++ b/apps/test/unit/templates/teacherDashboard/OwnedSectionsTableTest.js
@@ -3,13 +3,13 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import {Table} from 'reactabular';
 import {
-  UnconnectedSectionTable as SectionTable,
+  UnconnectedOwnedSectionsTable as OwnedSectionsTable,
   sectionLinkFormatter,
   courseLinkFormatter,
   gradeFormatter,
   loginInfoFormatter,
   studentsFormatter
-} from '@cdo/apps/templates/teacherDashboard/SectionTable';
+} from '@cdo/apps/templates/teacherDashboard/OwnedSectionsTable';
 import {pegasus} from '@cdo/apps/lib/util/urlHelpers';
 import Button from '@cdo/apps/templates/Button';
 
@@ -70,10 +70,10 @@ const sectionRowData = [
   },
 ];
 
-describe('SectionTable', () => {
+describe('OwnedSectionsTable', () => {
   it('has a header and a body', () => {
     const wrapper = shallow(
-      <SectionTable
+      <OwnedSectionsTable
         sectionIds={[1]}
         sectionRows={sectionRowData.slice(0, 1)}
         onEdit={() => {}}
@@ -88,7 +88,7 @@ describe('SectionTable', () => {
 
   it('is 970px wide', () => {
     const wrapper = shallow(
-      <SectionTable
+      <OwnedSectionsTable
         sectionIds={[1]}
         sectionRows={sectionRowData.slice(0, 1)}
         onEdit={() => {}}
@@ -97,7 +97,7 @@ describe('SectionTable', () => {
     expect(style).to.include({'width': 970});
   });
 
-  describe('SectionTableFormatters', () => {
+  describe('OwnedSectionsTable Formatters', () => {
     it('studentsFormatter provides a link to add or manage students', () => {
       const rowData = sectionRowData[0];
       const studentsCol = shallow(studentsFormatter(null, {rowData}));
diff --git a/apps/test/unit/templates/teacherDashboard/OwnedSectionsTest.js b/apps/test/unit/templates/teacherDashboard/OwnedSectionsTest.js
index aae9a334a59cf..c758b90159afe 100644
--- a/apps/test/unit/templates/teacherDashboard/OwnedSectionsTest.js
+++ b/apps/test/unit/templates/teacherDashboard/OwnedSectionsTest.js
@@ -38,31 +38,31 @@ describe('OwnedSections', () => {
     );
   });
 
-  it('renders a SectionTable with no extra button if no hidden sections', () => {
+  it('renders a OwnedSectionsTable with no extra button if no hidden sections', () => {
     const wrapper = shallow(
       <OwnedSections
         {...defaultProps}
       />
     );
-    expect(wrapper.find('Connect(SectionTable)').length).to.equal(1);
+    expect(wrapper.find('Connect(OwnedSectionsTable)').length).to.equal(1);
     // No button to view hidden (notification button not counted)
     expect(wrapper.find('Button').length).to.equal(0);
   });
 
-  it('renders a SectionTable with view button if hidden sections', () => {
+  it('renders a OwnedSectionsTable with view button if hidden sections', () => {
     const wrapper = shallow(
       <OwnedSections
         {...defaultProps}
         hiddenSectionIds={[13]}
       />
     );
-    expect(wrapper.find('Connect(SectionTable)').length).to.equal(1);
+    expect(wrapper.find('Connect(OwnedSectionsTable)').length).to.equal(1);
     // Button to view hidden (notification not counted)
     expect(wrapper.find('Button').length).to.equal(1);
     expect(wrapper.find('Button').at(0).props().text, 'View hidden sections');
   });
 
-  it('renders two SectionsTables if view hidden sections clicked', () => {
+  it('renders two OwnedSectionsTables if view hidden sections clicked', () => {
     const wrapper = shallow(
       <OwnedSections
         {...defaultProps}
@@ -70,9 +70,9 @@ describe('OwnedSections', () => {
       />
     );
     wrapper.find('Button').at(0).simulate('click');
-    expect(wrapper.find('Connect(SectionTable)').length).to.equal(2);
-    expect(wrapper.find('Connect(SectionTable)').at(0).props().sectionIds).to.deep.equal([11,12]);
-    expect(wrapper.find('Connect(SectionTable)').at(1).props().sectionIds).to.deep.equal([13]);
+    expect(wrapper.find('Connect(OwnedSectionsTable)').length).to.equal(2);
+    expect(wrapper.find('Connect(OwnedSectionsTable)').at(0).props().sectionIds).to.deep.equal([11,12]);
+    expect(wrapper.find('Connect(OwnedSectionsTable)').at(1).props().sectionIds).to.deep.equal([13]);
     expect(wrapper.find('Button').at(0).props().text).to.equal('Hide hidden sections');
   });
 
@@ -85,8 +85,8 @@ describe('OwnedSections', () => {
     );
     wrapper.find('Button').at(1).simulate('click');
     wrapper.find('Button').at(1).simulate('click');
-    expect(wrapper.find('Connect(SectionTable)').length).to.equal(1);
-    expect(wrapper.find('Connect(SectionTable)').props().sectionIds).to.deep.equal([11,12]);
+    expect(wrapper.find('Connect(OwnedSectionsTable)').length).to.equal(1);
+    expect(wrapper.find('Connect(OwnedSectionsTable)').props().sectionIds).to.deep.equal([11,12]);
   });
 
   it('renders a Notification about adding a new section', () => {

From c0d4ac4090aa033a26fe6afa38a6eee1f8cd2b36 Mon Sep 17 00:00:00 2001
From: Brad Buchanan <brad@code.org>
Date: Thu, 8 Mar 2018 11:46:14 -0800
Subject: [PATCH 19/56] SectionsTable -> SectionsAsStudentTable

---
 ...tionsTable.jsx => SectionsAsStudentTable.jsx} |  4 ++--
 ...tory.jsx => SectionsAsStudentTable.story.jsx} | 10 +++++-----
 .../studioHomepages/StudentSections.jsx          |  4 ++--
 .../teacherDashboard/OwnedSectionsTable.jsx      |  2 +-
 ...ableTest.js => SectionsAsStudentTableTest.js} | 16 ++++++++--------
 .../studioHomepages/StudentHomepageTest.js       |  4 ++--
 .../studioHomepages/StudentSectionsTest.jsx      |  8 ++++----
 .../teacherDashboard/OwnedSectionsTest.js        |  2 +-
 dashboard/app/models/sections/section.rb         |  2 +-
 9 files changed, 26 insertions(+), 26 deletions(-)
 rename apps/src/templates/studioHomepages/{SectionsTable.jsx => SectionsAsStudentTable.jsx} (98%)
 rename apps/src/templates/studioHomepages/{SectionsTable.story.jsx => SectionsAsStudentTable.story.jsx} (93%)
 rename apps/test/unit/templates/studioHomepages/{SectionsTableTest.js => SectionsAsStudentTableTest.js} (90%)

diff --git a/apps/src/templates/studioHomepages/SectionsTable.jsx b/apps/src/templates/studioHomepages/SectionsAsStudentTable.jsx
similarity index 98%
rename from apps/src/templates/studioHomepages/SectionsTable.jsx
rename to apps/src/templates/studioHomepages/SectionsAsStudentTable.jsx
index 475eca8844186..ffe61654f746b 100644
--- a/apps/src/templates/studioHomepages/SectionsTable.jsx
+++ b/apps/src/templates/studioHomepages/SectionsAsStudentTable.jsx
@@ -99,7 +99,7 @@ const styles = {
   }
 };
 
-class SectionsTable extends React.Component {
+class SectionsAsStudentTable extends React.Component {
   // isTeacher will be set false for teachers who are seeing this table as a student in another teacher's section.
   static propTypes = {
     sections: shapes.sections,
@@ -237,4 +237,4 @@ class SectionsTable extends React.Component {
 
 export default connect(state => ({
   isRtl: state.isRtl,
-}))(SectionsTable);
+}))(SectionsAsStudentTable);
diff --git a/apps/src/templates/studioHomepages/SectionsTable.story.jsx b/apps/src/templates/studioHomepages/SectionsAsStudentTable.story.jsx
similarity index 93%
rename from apps/src/templates/studioHomepages/SectionsTable.story.jsx
rename to apps/src/templates/studioHomepages/SectionsAsStudentTable.story.jsx
index cf3827906991e..9c3eab54e8afe 100644
--- a/apps/src/templates/studioHomepages/SectionsTable.story.jsx
+++ b/apps/src/templates/studioHomepages/SectionsAsStudentTable.story.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import SectionsTable from './SectionsTable';
+import SectionsAsStudentTable from './SectionsAsStudentTable';
 import {action} from '@storybook/addon-actions';
 
 const sections = [
@@ -62,14 +62,14 @@ const sections = [
 
 export default storybook => {
   return storybook
-    .storiesOf('SectionsTable', module)
+    .storiesOf('SectionsAsStudentTable', module)
     .withReduxStore()
     .addStoryTable([
       {
         name: 'Section Table - three sections for Teacher',
         description: 'This is an example of a basic Section Table when the teacher has three sections',
         story: () => (
-          <SectionsTable
+          <SectionsAsStudentTable
             sections={sections}
             isTeacher={true}
             canLeave={false}
@@ -82,7 +82,7 @@ export default storybook => {
         name: 'Section Table - three sections for students, can NOT leave',
         description: 'This is an example of a basic Section Table when a student has three sections and does not have permission to leave those sections',
         story: () => (
-          <SectionsTable
+          <SectionsAsStudentTable
             sections={sections}
             isTeacher={false}
             canLeave={false}
@@ -95,7 +95,7 @@ export default storybook => {
         name: 'Section Table - three sections for students, can leave',
         description: 'This is an example of a basic Section Table when a student has three sections and does not have permission to leave those sections',
         story: () => (
-          <SectionsTable
+          <SectionsAsStudentTable
             sections={sections}
             isTeacher={false}
             canLeave={true}
diff --git a/apps/src/templates/studioHomepages/StudentSections.jsx b/apps/src/templates/studioHomepages/StudentSections.jsx
index 5c217e1656112..f817660d7cdc8 100644
--- a/apps/src/templates/studioHomepages/StudentSections.jsx
+++ b/apps/src/templates/studioHomepages/StudentSections.jsx
@@ -3,7 +3,7 @@ import i18n from "@cdo/locale";
 import ContentContainer from '../ContentContainer';
 import JoinSection from './JoinSection';
 import JoinSectionNotifications from './JoinSectionNotifications';
-import SectionsTable from '../studioHomepages/SectionsTable';
+import SectionsAsStudentTable from './SectionsAsStudentTable';
 
 export default class StudentSections extends Component {
   // isTeacher will be set false for teachers who are seeing this as a student in another teacher's section.
@@ -54,7 +54,7 @@ export default class StudentSections extends Component {
           id={resultId}
         />
         {enrolledInASection &&
-          <SectionsTable
+          <SectionsAsStudentTable
             sections={sections}
             isTeacher={false}
             canLeave={canLeave}
diff --git a/apps/src/templates/teacherDashboard/OwnedSectionsTable.jsx b/apps/src/templates/teacherDashboard/OwnedSectionsTable.jsx
index 0c47dd59fa431..48f05caa582a4 100644
--- a/apps/src/templates/teacherDashboard/OwnedSectionsTable.jsx
+++ b/apps/src/templates/teacherDashboard/OwnedSectionsTable.jsx
@@ -130,7 +130,7 @@ const hiddenFormatter = function (id) {
 /**
  * This is a component that shows information about the sections that a teacher
  * owns, and allows for editing, deleting and sorting them.
- * It shows some of the same information as the SectionsTable used on the teacher
+ * It shows some of the same information as the SectionsAsStudentTable used on the teacher
  * homepage. However, for historical reasons it unfortunately has a somewhat
  * different set/shape of input data. This component gets its data from
  * section_api_helpers in pegasus via an AJAX call, whereas that component gets
diff --git a/apps/test/unit/templates/studioHomepages/SectionsTableTest.js b/apps/test/unit/templates/studioHomepages/SectionsAsStudentTableTest.js
similarity index 90%
rename from apps/test/unit/templates/studioHomepages/SectionsTableTest.js
rename to apps/test/unit/templates/studioHomepages/SectionsAsStudentTableTest.js
index 1496c68c18bf8..e3cbd69e725e0 100644
--- a/apps/test/unit/templates/studioHomepages/SectionsTableTest.js
+++ b/apps/test/unit/templates/studioHomepages/SectionsAsStudentTableTest.js
@@ -3,16 +3,16 @@ import {shallow} from 'enzyme';
 import {expect} from '../../../util/configuredChai';
 import i18n from '@cdo/locale';
 import {joinedSections} from './homepagesTestData';
-import SectionsTable from '@cdo/apps/templates/studioHomepages/SectionsTable';
+import SectionsAsStudentTable from '@cdo/apps/templates/studioHomepages/SectionsAsStudentTable';
 import {combineReducers, createStore} from 'redux';
 import isRtl from '@cdo/apps/code-studio/isRtlRedux';
 
-describe('SectionsTable', () => {
+describe('SectionsAsStudentTable', () => {
   const store = createStore(combineReducers({isRtl}));
 
   it('shows column headers for students', () => {
     const wrapper = shallow(
-      <SectionsTable
+      <SectionsAsStudentTable
         sections={joinedSections}
         isTeacher={false}
         canLeave={false}
@@ -36,7 +36,7 @@ describe('SectionsTable', () => {
 
   it('shows column headers for teachers', () => {
     const wrapper = shallow(
-      <SectionsTable
+      <SectionsAsStudentTable
         sections={joinedSections}
         isTeacher={true}
         canLeave={false}
@@ -60,7 +60,7 @@ describe('SectionsTable', () => {
 
   it('does not show a leave section button for teacher-managed student accounts', () => {
     const wrapper = shallow(
-      <SectionsTable
+      <SectionsAsStudentTable
         sections={joinedSections}
         isTeacher={false}
         canLeave={false}
@@ -71,7 +71,7 @@ describe('SectionsTable', () => {
 
   it('shows a leave section button for students who do not have teacher-managed accounts', () => {
     const wrapper = shallow(
-      <SectionsTable
+      <SectionsAsStudentTable
         sections={joinedSections}
         isTeacher={false}
         canLeave={true}
@@ -82,7 +82,7 @@ describe('SectionsTable', () => {
 
   it('does not show a leave section button for teacher accounts', () => {
     const wrapper = shallow(
-      <SectionsTable
+      <SectionsAsStudentTable
         sections={joinedSections}
         isTeacher={true}
         canLeave={false}
@@ -93,7 +93,7 @@ describe('SectionsTable', () => {
 
   it('renders a row for each joined section', () => {
     const wrapper = shallow(
-      <SectionsTable
+      <SectionsAsStudentTable
         sections={joinedSections}
         isTeacher={false}
         canLeave={false}
diff --git a/apps/test/unit/templates/studioHomepages/StudentHomepageTest.js b/apps/test/unit/templates/studioHomepages/StudentHomepageTest.js
index 181c230535256..8b5a55b7373b4 100644
--- a/apps/test/unit/templates/studioHomepages/StudentHomepageTest.js
+++ b/apps/test/unit/templates/studioHomepages/StudentHomepageTest.js
@@ -3,7 +3,7 @@ import { assert, expect } from 'chai';
 import { shallow } from 'enzyme';
 import StudentHomepage from '@cdo/apps/templates/studioHomepages/StudentHomepage';
 import HeaderBanner from '@cdo/apps/templates/HeaderBanner';
-import SectionsTable from '@cdo/apps/templates/studioHomepages/SectionsTable';
+import SectionsAsStudentTable from '@cdo/apps/templates/studioHomepages/SectionsAsStudentTable';
 import StudentSections from '@cdo/apps/templates/studioHomepages/StudentSections';
 import { courses, topCourse, joinedSections } from './homepagesTestData';
 import { combineReducers, createStore } from 'redux';
@@ -98,7 +98,7 @@ describe('StudentHomepage', () => {
           codeOrgUrlPrefix="http://localhost:3000/"
           canLeave={false}
         />
-    ).find(StudentSections).dive().find(SectionsTable).dive({context: {store}}).dive();
+    ).find(StudentSections).dive().find(SectionsAsStudentTable).dive({context: {store}}).dive();
     expect(wrapper).to.containMatchingElement(
         <td>ClassOneCode</td>
     );
diff --git a/apps/test/unit/templates/studioHomepages/StudentSectionsTest.jsx b/apps/test/unit/templates/studioHomepages/StudentSectionsTest.jsx
index ff0762b6777fb..01313cb1cc0d7 100644
--- a/apps/test/unit/templates/studioHomepages/StudentSectionsTest.jsx
+++ b/apps/test/unit/templates/studioHomepages/StudentSectionsTest.jsx
@@ -7,7 +7,7 @@ import StudentSections from '@cdo/apps/templates/studioHomepages/StudentSections
 import ContentContainer from "@cdo/apps/templates/ContentContainer";
 import JoinSection from "@cdo/apps/templates/studioHomepages/JoinSection";
 import JoinSectionNotifications from "@cdo/apps/templates/studioHomepages/JoinSectionNotifications";
-import SectionsTable from "@cdo/apps/templates/studioHomepages/SectionsTable";
+import SectionsAsStudentTable from "@cdo/apps/templates/studioHomepages/SectionsAsStudentTable";
 
 describe('StudentSections', () => {
   const defaultProps = {
@@ -15,7 +15,7 @@ describe('StudentSections', () => {
     canLeave: false,
   };
 
-  it('does not render a SectionsTable when not enrolled in any sections', () => {
+  it('does not render a SectionsAsStudentTable when not enrolled in any sections', () => {
     const wrapper = shallow(
       <StudentSections
         {...defaultProps}
@@ -38,7 +38,7 @@ describe('StudentSections', () => {
     );
   });
 
-  it('renders a SectionsTable when enrolled in one or more sections', () => {
+  it('renders a SectionsAsStudentTable when enrolled in one or more sections', () => {
     const wrapper = shallow(
       <StudentSections
         {...defaultProps}
@@ -52,7 +52,7 @@ describe('StudentSections', () => {
         description={i18n.enrollmentDescription()}
       >
         <JoinSectionNotifications/>
-        <SectionsTable
+        <SectionsAsStudentTable
           sections={sections}
           isTeacher={false}
           canLeave={defaultProps.canLeave}
diff --git a/apps/test/unit/templates/teacherDashboard/OwnedSectionsTest.js b/apps/test/unit/templates/teacherDashboard/OwnedSectionsTest.js
index c758b90159afe..94679c157b0bf 100644
--- a/apps/test/unit/templates/teacherDashboard/OwnedSectionsTest.js
+++ b/apps/test/unit/templates/teacherDashboard/OwnedSectionsTest.js
@@ -76,7 +76,7 @@ describe('OwnedSections', () => {
     expect(wrapper.find('Button').at(0).props().text).to.equal('Hide hidden sections');
   });
 
-  it('renders just unhidden SectionsTable if hide sections clicked', () => {
+  it('renders just unhidden SectionsAsStudentTable if hide sections clicked', () => {
     const wrapper = shallow(
       <OwnedSections
         {...defaultProps}
diff --git a/dashboard/app/models/sections/section.rb b/dashboard/app/models/sections/section.rb
index 0311f8eda17d2..63793f6fef3e4 100644
--- a/dashboard/app/models/sections/section.rb
+++ b/dashboard/app/models/sections/section.rb
@@ -211,7 +211,7 @@ def default_script
     return course.try(:default_course_scripts).try(:first).try(:script)
   end
 
-  # Provides some information about a section. This is consumed by our SectionsTable
+  # Provides some information about a section. This is consumed by our SectionsAsStudentTable
   # React component on the teacher homepage and student homepage
   def summarize
     base_url = CDO.code_org_url('/teacher-dashboard#/sections/')

From cae16c6069bf6c29ed28923e4e0a0e7669b23b3f Mon Sep 17 00:00:00 2001
From: Ram Kandasamy <ram@code.org>
Date: Thu, 8 Mar 2018 11:43:55 -0800
Subject: [PATCH 20/56] Add a show title block

---
 apps/src/block_utils.js                   | 23 +++++++++++++++++++++--
 apps/src/gamelab/GameLabJr.interpreted.js | 17 +++++++++++++++++
 apps/src/gamelab/blocks.js                | 18 ++++++++++++++++++
 dashboard/app/models/levels/gamelab_jr.rb |  6 ++++++
 4 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/apps/src/block_utils.js b/apps/src/block_utils.js
index 14ee3a8b0cb06..ef1ca797c49b5 100644
--- a/apps/src/block_utils.js
+++ b/apps/src/block_utils.js
@@ -426,6 +426,20 @@ const interpolateInputs = function (blockly, block, inputs) {
 };
 exports.interpolateInputs = interpolateInputs;
 
+/**
+ * Add pre-labeled inputs
+ */
+const addInputs = function (blockly, block, args) {
+  block.appendDummyInput()
+    .appendTitle('show title screen');
+  args.forEach(arg => {
+    block.appendValueInput(arg.name)
+      .setCheck(arg.type || Blockly.BlockValueType.NONE)
+      .setAlign(Blockly.ALIGN_RIGHT)
+      .appendTitle(arg.label);
+  });
+};
+
 /**
  * Create a block generator that creats blocks that directly map to a javascript
  * function call, method call, or other (hopefully simple) expression.
@@ -488,6 +502,7 @@ exports.createJsWrapperBlockCreator = function (
     methodCall,
     eventBlock,
     eventLoopBlock,
+    inline,
   }) => {
     if (!func === !expression) {
       throw new Error('Provide either func or expression, but not both');
@@ -510,9 +525,13 @@ exports.createJsWrapperBlockCreator = function (
           });
         }
 
-        interpolateInputs(blockly, this, determineInputs(blockText, inputs));
+        if (inline === false) {
+          addInputs(blockly, this, args);
+        } else {
+          interpolateInputs(blockly, this, determineInputs(blockText, inputs));
+          this.setInputsInline(true);
+        }
 
-        this.setInputsInline(true);
         if (returnType) {
           this.setOutput(true, returnType);
         } else if (eventLoopBlock) {
diff --git a/apps/src/gamelab/GameLabJr.interpreted.js b/apps/src/gamelab/GameLabJr.interpreted.js
index 4ec78cafc6ea8..98a004e8e76a2 100644
--- a/apps/src/gamelab/GameLabJr.interpreted.js
+++ b/apps/src/gamelab/GameLabJr.interpreted.js
@@ -31,6 +31,7 @@ let sprites = [];
 let score = 0;
 let game_over = false;
 let show_score = false;
+let title = '', subTitle = '';
 
 // Behaviors
 
@@ -233,6 +234,15 @@ function isDestroyed(sprite) {
   return World.allSprites.indexOf(sprite) === -1;
 }
 
+function showTitleScreen(titleArg, subTitleArg) {
+  title = titleArg;
+  subTitle = subTitleArg;
+}
+
+function hideTitleScreen() {
+  title = subTitle = '';
+}
+
 function draw() {
   background(World.background_color || "white");
 
@@ -303,5 +313,12 @@ function draw() {
     textAlign(CENTER);
     textSize(50);
     text("Game Over", 200, 200);
+  } else if (title) {
+    fill("black");
+    textAlign(CENTER);
+    textSize(50);
+    text(title, 200, 150);
+    textSize(35);
+    text(subTitle, 200, 250);
   }
 }
diff --git a/apps/src/gamelab/blocks.js b/apps/src/gamelab/blocks.js
index 0739603b7c082..bd7b65cc7e4b2 100644
--- a/apps/src/gamelab/blocks.js
+++ b/apps/src/gamelab/blocks.js
@@ -245,5 +245,23 @@ export default {
       ],
       methodCall: true,
     });
+
+    createJsWrapperBlock({
+      color: WORLD_COLOR,
+      func: 'showTitleScreen',
+      blockText: 'show title screen',
+      args: [
+        { name: 'TITLE', label: 'title', type: blockly.BlockValueType.STRING },
+        { name: 'SUBTITLE', label: 'text', type: blockly.BlockValueType.STRING }
+      ],
+      inline: false,
+    });
+
+    createJsWrapperBlock({
+      color: WORLD_COLOR,
+      func: 'hideTitleScreen',
+      blockText: 'hide title screen',
+      args: [],
+    });
   },
 };
diff --git a/dashboard/app/models/levels/gamelab_jr.rb b/dashboard/app/models/levels/gamelab_jr.rb
index 67773d0ef82ac..a07a6fbf104ca 100644
--- a/dashboard/app/models/levels/gamelab_jr.rb
+++ b/dashboard/app/models/levels/gamelab_jr.rb
@@ -58,6 +58,8 @@ def common_blocks(type)
       <block type="colour_picker"></block>
     </value>
   </block>
+  <block type="gamelab_showTitleScreen" />
+  <block type="gamelab_hideTitleScreen" />
 </category>
 <category name="Sprites">
   <block type="gamelab_makeNewSprite" />
@@ -145,6 +147,10 @@ def common_blocks(type)
     </value>
   </block>
   <block type="controls_flow_statements" />
+</category>
+<category name="Text">
+  <block type="text_join_simple" inputcount="2" />
+  <block type="text" />
 </category>
     XML
   end

From b9f0103bd45cc66e8a5134039262a535a77d200a Mon Sep 17 00:00:00 2001
From: Erin <erin@code.org>
Date: Thu, 8 Mar 2018 10:58:02 -0800
Subject: [PATCH 21/56] UI test for error dialog for blank animation

---
 .../AnimationPickerListItem.jsx               |  2 +-
 .../ui/features/step_definitions/gamelab.rb   | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/apps/src/gamelab/AnimationPicker/AnimationPickerListItem.jsx b/apps/src/gamelab/AnimationPicker/AnimationPickerListItem.jsx
index 02fdd3bca35d9..fab6077aa29c7 100644
--- a/apps/src/gamelab/AnimationPicker/AnimationPickerListItem.jsx
+++ b/apps/src/gamelab/AnimationPicker/AnimationPickerListItem.jsx
@@ -77,7 +77,7 @@ class AnimationPickerListItem extends React.Component {
     const iconImageSrc = this.props.category ? `/blockly/media/gamelab/animation-previews/${this.props.category}.png` : '';
 
     return (
-      <div style={styles.root} onClick={this.props.onClick}>
+      <div style={styles.root} onClick={this.props.onClick} className="uitest-animation-picker-item">
         <div style={thumbnailStyle}>
           {this.props.animationProps &&
               <AnimationPreview
diff --git a/dashboard/test/ui/features/step_definitions/gamelab.rb b/dashboard/test/ui/features/step_definitions/gamelab.rb
index 234f6834ecba3..ad8f6c41d290a 100644
--- a/dashboard/test/ui/features/step_definitions/gamelab.rb
+++ b/dashboard/test/ui/features/step_definitions/gamelab.rb
@@ -36,6 +36,10 @@
   steps 'When I press "animationMode"'
 end
 
+When /^I switch to(?: the)? code (?:mode|tab)$/ do
+  @browser.execute_script("$(\"#codeMode\")[0].click();")
+end
+
 Then /^I do not see "([^"]*)" in the Game Lab console$/ do |message|
   expect(element_contains_text?('#debug-output', message)).to be false
 end
@@ -44,6 +48,21 @@
   expect(@browser.execute_script('return $(".animationList>div>div").not(".newListItem").length')).to eq num_animations.to_i
 end
 
+Then /^I open the animation picker$/ do
+  @browser.execute_script("$(\".animationList>div>div\")[0].click();")
+end
+
+Then /^I select a blank animation$/ do
+  @browser.execute_script("$(\".uitest-animation-picker-item\")[0].click();")
+end
+
+Then /^I add a new, blank animation$/ do
+  steps <<-STEPS
+    And I open the animation picker
+    And I select a blank animation
+  STEPS
+end
+
 Then /^I append gamelab code to draw a ninja$/ do
   code = <<CODE.gsub(/\n/, '\\n')
 function draw() {

From 6a1ee459d7ce18f78d7ef7b3a1e0f2865e024b42 Mon Sep 17 00:00:00 2001
From: Brad Buchanan <brad@code.org>
Date: Thu, 8 Mar 2018 12:19:22 -0800
Subject: [PATCH 22/56] Comment in addBlankAnimation() [ci skip]

---
 apps/src/gamelab/animationListModule.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/src/gamelab/animationListModule.js b/apps/src/gamelab/animationListModule.js
index 557449181bd0f..a6bfd3da414db 100644
--- a/apps/src/gamelab/animationListModule.js
+++ b/apps/src/gamelab/animationListModule.js
@@ -321,6 +321,11 @@ export function setInitialAnimationList(serializedAnimationList) {
 }
 
 export function addBlankAnimation() {
+  // To avoid special cases and saving tons of blank animations to our server,
+  // we're actually adding a secret blank library animation any time the user
+  // picks "Draw my own."  As soon as the user makes any changes to the
+  // animation it gets saved as a custom animation in their own project, just
+  // like we do with other library animations.
   return addLibraryAnimation(
     {
       name: 'animation',

From 982dade087219b2cbaf093f6c9de7df3cfa458a8 Mon Sep 17 00:00:00 2001
From: Brad Buchanan <brad@code.org>
Date: Thu, 8 Mar 2018 12:20:05 -0800
Subject: [PATCH 23/56] Remove unneeded props for blank animation

---
 apps/src/gamelab/animationListModule.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/src/gamelab/animationListModule.js b/apps/src/gamelab/animationListModule.js
index a6bfd3da414db..4c9605b078543 100644
--- a/apps/src/gamelab/animationListModule.js
+++ b/apps/src/gamelab/animationListModule.js
@@ -335,8 +335,6 @@ export function addBlankAnimation() {
       looping: true,
       frameDelay: 4,
       version: 'mUlvnlbeZ5GHYr_Lb4NIuMwPs7kGxHWz',
-      loadedFromSource: true,
-      saved: false
     }
   );
 }

From b815ee0e6e4bf32f00639f012558618c067b4d55 Mon Sep 17 00:00:00 2001
From: Caley Brock <caleybrock7@gmail.com>
Date: Thu, 8 Mar 2018 12:46:31 -0800
Subject: [PATCH 24/56] Make settings a constant

---
 .../manageStudents/ManageStudentsTable.jsx    | 30 +++++++++----------
 .../manageStudents/manageStudentsRedux.js     |  1 +
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/apps/src/templates/manageStudents/ManageStudentsTable.jsx b/apps/src/templates/manageStudents/ManageStudentsTable.jsx
index 52de029290784..7a804e9444e19 100644
--- a/apps/src/templates/manageStudents/ManageStudentsTable.jsx
+++ b/apps/src/templates/manageStudents/ManageStudentsTable.jsx
@@ -28,6 +28,19 @@ const styles = {
 
 const showShareColumn = experiments.isEnabled(experiments.SHARE_COLUMN);
 
+const LOGIN_TYPES_WITH_PASSWORD_COLUMN = [
+  SectionLoginType.word,
+  SectionLoginType.picture,
+  SectionLoginType.email,
+];
+const LOGIN_TYPES_WITH_ACTIONS_COLUMN = [
+  SectionLoginType.word,
+  SectionLoginType.picture,
+  SectionLoginType.email,
+  SectionLoginType.google_classroom,
+  SectionLoginType.clever,
+];
+
 export const studentSectionDataPropType = PropTypes.shape({
   id: PropTypes.number.isRequired,
   name: PropTypes.string,
@@ -331,23 +344,10 @@ class ManageStudentsTable extends Component {
       },
     ];
 
-    const allowedPasswordColumn = [
-      SectionLoginType.word,
-      SectionLoginType.picture,
-      SectionLoginType.email,
-    ];
-    const allowedControlsColumn = [
-      SectionLoginType.word,
-      SectionLoginType.picture,
-      SectionLoginType.email,
-      SectionLoginType.google_classroom,
-      SectionLoginType.clever,
-    ];
-
-    if (allowedPasswordColumn.includes(loginType)) {
+    if (LOGIN_TYPES_WITH_PASSWORD_COLUMN.includes(loginType)) {
       dataColumns = dataColumns.concat(passwordColumn);
     }
-    if (allowedControlsColumn.includes(loginType)) {
+    if (LOGIN_TYPES_WITH_ACTIONS_COLUMN.includes(loginType)) {
       dataColumns = dataColumns.concat(controlsColumn);
     }
 
diff --git a/apps/src/templates/manageStudents/manageStudentsRedux.js b/apps/src/templates/manageStudents/manageStudentsRedux.js
index e0275fb4ab264..265e3afe0455e 100644
--- a/apps/src/templates/manageStudents/manageStudentsRedux.js
+++ b/apps/src/templates/manageStudents/manageStudentsRedux.js
@@ -426,6 +426,7 @@ const updateStudentOnServer = (updatedStudentInfo, onComplete) => {
     name: updatedStudentInfo.name,
     age: updatedStudentInfo.age,
     gender: updatedStudentInfo.gender,
+    sharing_disabled: true,
   };
   $.ajax({
     url: `/v2/students/${dataToUpdate.id}/update`,

From 8a8a38a2ad658fb2fdc2ea76c45ed0b170859dba Mon Sep 17 00:00:00 2001
From: Erin Bond <erin.bond@code.org>
Date: Thu, 8 Mar 2018 13:04:52 -0800
Subject: [PATCH 25/56] remove redundant styles, better name stories

---
 .../manageStudents/ManageStudentsTable.jsx    | 11 ++++-
 .../src/templates/tables/QuickActionsCell.jsx | 45 ++++++++-----------
 .../tables/QuickActionsCell.story.jsx         |  8 ++--
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/apps/src/templates/manageStudents/ManageStudentsTable.jsx b/apps/src/templates/manageStudents/ManageStudentsTable.jsx
index fbd9e61c06361..f9a56c2771bbc 100644
--- a/apps/src/templates/manageStudents/ManageStudentsTable.jsx
+++ b/apps/src/templates/manageStudents/ManageStudentsTable.jsx
@@ -21,6 +21,13 @@ import experiments from '@cdo/apps/util/experiments';
 
 const showShareColumn = experiments.isEnabled(experiments.SHARE_COLUMN);
 
+const styles = {
+  inline: {
+    width: '40%',
+    float: 'left',
+  },
+};
+
 export const studentSectionDataPropType = PropTypes.shape({
   id: PropTypes.number.isRequired,
   name: PropTypes.string,
@@ -182,10 +189,10 @@ class ManageStudentsTable extends Component {
         }
         {numberOfEditingRows <= 1 &&
           <span>
-            <div style={{width: '40%', float: 'left'}}>
+            <div style={styles.inline}>
               {i18n.actions()}
             </div>
-            <div style={{width: '40%', float: 'left'}}>
+            <div style={styles.inline}>
               {showShareColumn &&
                 <ManageStudentsActionsHeaderCell/>
               }
diff --git a/apps/src/templates/tables/QuickActionsCell.jsx b/apps/src/templates/tables/QuickActionsCell.jsx
index 7936fabb07cc4..cc7e0a0397151 100644
--- a/apps/src/templates/tables/QuickActionsCell.jsx
+++ b/apps/src/templates/tables/QuickActionsCell.jsx
@@ -12,27 +12,24 @@ export const QuickActionsCellType = {
 };
 
 const styles = {
+  icon: {
+    paddingLeft: 5,
+    paddingRight: 5,
+    paddingTop: 4,
+    paddingBottom: 4,
+    cursor: 'pointer',
+  },
   actionButton: {
     [QuickActionsCellType.body]: {
       border: '1px solid ' + color.white,
-      paddingLeft: 5,
-      paddingRight: 5,
-      paddingTop: 4,
-      paddingBottom: 4,
       borderRadius: 5,
       color: color.lighter_gray,
       margin: 3,
-      cursor: 'pointer',
     },
     [QuickActionsCellType.header]: {
-      paddingLeft: 5,
-      paddingRight: 5,
-      paddingTop: 4,
-      paddingBottom: 4,
       fontSize: 20,
       marginTop: -3,
       color: color.darker_gray,
-      cursor: 'pointer',
     }
   },
   hoverFocus: {
@@ -40,23 +37,8 @@ const styles = {
       backgroundColor: color.lighter_gray,
       border: '1px solid ' + color.light_gray,
       borderRadius: 5,
-      paddingTop: 4,
-      paddingBottom: 4,
-      paddingLeft: 5,
-      paddingRight: 5,
       color: color.white,
     },
-    [QuickActionsCellType.header]: {
-      paddingLeft: 5,
-      paddingRight: 5,
-      paddingTop: 4,
-      paddingBottom: 4,
-      fontSize: 20,
-      // float: 'right',
-      color: color.darker_gray,
-      margin: 3,
-      cursor: 'pointer',
-    }
   },
 };
 
@@ -126,11 +108,22 @@ class QuickActionsCell extends Component {
       body: 'chevron-down'
     };
 
+    const styleByType = type === "header" ?
+      styles.actionButton["header"] :
+      this.state.open ?
+        styles.hoverFocus["body"] :
+        styles.actionButton["body"];
+
+    const iconStyle = {
+      ...styles.icon,
+      ...styleByType
+    };
+
     return (
       <span ref={span => this.icon = span}>
         <FontAwesome
           icon={icons[type]}
-          style={this.state.open ? styles.hoverFocus[type] : styles.actionButton[type]}
+          style={iconStyle}
           onClick={this.state.canOpen ? this.open : undefined}
           className="ui-test-section-dropdown"
         />
diff --git a/apps/src/templates/tables/QuickActionsCell.story.jsx b/apps/src/templates/tables/QuickActionsCell.story.jsx
index 778a759195c29..395a0257989a0 100644
--- a/apps/src/templates/tables/QuickActionsCell.story.jsx
+++ b/apps/src/templates/tables/QuickActionsCell.story.jsx
@@ -7,8 +7,8 @@ export default storybook => {
     .storiesOf('QuickActionsCell', module)
     .addStoryTable([
         {
-          name: 'QuickActionsCell - 2 children',
-          description: 'Shown with 2 QuickActions as children',
+          name: 'QuickActionsCell - default body',
+          description: 'Shown with 2 QuickActions as children, the default body cell has a down chevron',
           story: () => (
             <QuickActionsCell>
               <PopUpMenu.Item
@@ -26,8 +26,8 @@ export default storybook => {
           )
         },
         {
-          name: 'QuickActionsCell - different icon',
-          description: 'Override the default cheveron down icon',
+          name: 'QuickActionsCell - header',
+          description: 'Override the default cheveron down icon for use in the header cell',
           story: () => (
             <QuickActionsCell
               type="header"

From 696549ded1ef3572932c714d1f744a56ba5133fa Mon Sep 17 00:00:00 2001
From: Drew Samnick <drew.samnick@code.org>
Date: Thu, 8 Mar 2018 13:09:56 -0800
Subject: [PATCH 26/56] Widen census_summaries.teaches_cs to 2 characters

---
 dashboard/app/models/census/census_summary.rb            | 2 +-
 .../20180308210145_change_census_summaries_teaches_cs.rb | 9 +++++++++
 dashboard/db/schema.rb                                   | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 dashboard/db/migrate/20180308210145_change_census_summaries_teaches_cs.rb

diff --git a/dashboard/app/models/census/census_summary.rb b/dashboard/app/models/census/census_summary.rb
index fa33a0c3ebb52..0cc7bc059b41e 100644
--- a/dashboard/app/models/census/census_summary.rb
+++ b/dashboard/app/models/census/census_summary.rb
@@ -5,7 +5,7 @@
 #  id          :integer          not null, primary key
 #  school_id   :string(12)       not null
 #  school_year :integer          not null
-#  teaches_cs  :string(1)
+#  teaches_cs  :string(2)
 #  audit_data  :text(65535)      not null
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
diff --git a/dashboard/db/migrate/20180308210145_change_census_summaries_teaches_cs.rb b/dashboard/db/migrate/20180308210145_change_census_summaries_teaches_cs.rb
new file mode 100644
index 0000000000000..e197a2605cd9d
--- /dev/null
+++ b/dashboard/db/migrate/20180308210145_change_census_summaries_teaches_cs.rb
@@ -0,0 +1,9 @@
+class ChangeCensusSummariesTeachesCs < ActiveRecord::Migration[5.0]
+  def up
+    change_column :census_summaries, :teaches_cs, :string, limit: 2, null: true
+  end
+
+  def down
+    change_column :census_summaries, :teaches_cs, :string, limit: 1, null: true
+  end
+end
diff --git a/dashboard/db/schema.rb b/dashboard/db/schema.rb
index 680d9985dce16..36258d39595c2 100644
--- a/dashboard/db/schema.rb
+++ b/dashboard/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180305045530) do
+ActiveRecord::Schema.define(version: 20180308210145) do
 
   create_table "activities", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
     t.integer  "user_id"
@@ -136,7 +136,7 @@
   create_table "census_summaries", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
     t.string   "school_id",   limit: 12,    null: false
     t.integer  "school_year", limit: 2,     null: false
-    t.string   "teaches_cs",  limit: 1
+    t.string   "teaches_cs",  limit: 2
     t.text     "audit_data",  limit: 65535, null: false
     t.datetime "created_at",                null: false
     t.datetime "updated_at",                null: false

From 1de5996df066cbc5658c167ee33a9df3c55a11e4 Mon Sep 17 00:00:00 2001
From: Caley Brock <caleybrock7@gmail.com>
Date: Thu, 8 Mar 2018 13:12:37 -0800
Subject: [PATCH 27/56] Oops - this was for testing, not needed in PR

---
 apps/src/templates/manageStudents/manageStudentsRedux.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/src/templates/manageStudents/manageStudentsRedux.js b/apps/src/templates/manageStudents/manageStudentsRedux.js
index 265e3afe0455e..e0275fb4ab264 100644
--- a/apps/src/templates/manageStudents/manageStudentsRedux.js
+++ b/apps/src/templates/manageStudents/manageStudentsRedux.js
@@ -426,7 +426,6 @@ const updateStudentOnServer = (updatedStudentInfo, onComplete) => {
     name: updatedStudentInfo.name,
     age: updatedStudentInfo.age,
     gender: updatedStudentInfo.gender,
-    sharing_disabled: true,
   };
   $.ajax({
     url: `/v2/students/${dataToUpdate.id}/update`,

From 34fa032a15f97e01d9382e26c80f8db34f0e2c86 Mon Sep 17 00:00:00 2001
From: Erin <erin@code.org>
Date: Thu, 8 Mar 2018 13:25:13 -0800
Subject: [PATCH 28/56] Actually add the test file this time. Fix ambiguity in
 step def for code mode

---
 .../ui/features/gamelab/loadingAnimations.feature   | 13 +++++++++++++
 .../test/ui/features/step_definitions/gamelab.rb    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 dashboard/test/ui/features/gamelab/loadingAnimations.feature

diff --git a/dashboard/test/ui/features/gamelab/loadingAnimations.feature b/dashboard/test/ui/features/gamelab/loadingAnimations.feature
new file mode 100644
index 0000000000000..736ddbbaa7ced
--- /dev/null
+++ b/dashboard/test/ui/features/gamelab/loadingAnimations.feature
@@ -0,0 +1,13 @@
+@as_student
+Feature: Game Lab Loading Animations
+
+Scenario: Reload the project with a blank animation
+  Given I start a new Game Lab project
+  And I switch to the animation tab
+  And I add a new, blank animation
+  And I switch to the code tab in Game Lab
+  And I press "runButton"
+
+  Then I reload the page
+  And I wait for the page to fully load
+  And element ".modal-body" does not contain text "Sorry, we couldn't load animation"
\ No newline at end of file
diff --git a/dashboard/test/ui/features/step_definitions/gamelab.rb b/dashboard/test/ui/features/step_definitions/gamelab.rb
index ad8f6c41d290a..22b22a8f43a2b 100644
--- a/dashboard/test/ui/features/step_definitions/gamelab.rb
+++ b/dashboard/test/ui/features/step_definitions/gamelab.rb
@@ -36,7 +36,7 @@
   steps 'When I press "animationMode"'
 end
 
-When /^I switch to(?: the)? code (?:mode|tab)$/ do
+When /^I switch to(?: the)? code (?:mode|tab)$ in Game Lab/ do
   @browser.execute_script("$(\"#codeMode\")[0].click();")
 end
 

From 98e45bc51d2bfcd97d5458d7c90340fea4756531 Mon Sep 17 00:00:00 2001
From: Caley Brock <caleybrock7@gmail.com>
Date: Thu, 8 Mar 2018 13:27:51 -0800
Subject: [PATCH 29/56] Use id as row identifier

---
 apps/src/templates/manageStudents/ManageStudentsTable.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/src/templates/manageStudents/ManageStudentsTable.jsx b/apps/src/templates/manageStudents/ManageStudentsTable.jsx
index dca5d74a43ba2..995944af6cc57 100644
--- a/apps/src/templates/manageStudents/ManageStudentsTable.jsx
+++ b/apps/src/templates/manageStudents/ManageStudentsTable.jsx
@@ -375,7 +375,7 @@ class ManageStudentsTable extends Component {
           style={tableLayoutStyles.table}
         >
           <Table.Header />
-          <Table.Body rows={sortedRows} rowKey="name" />
+          <Table.Body rows={sortedRows} rowKey="id" />
         </Table.Provider>
       </div>
     );

From 1226a59a06930cc1502290291a2e1b7a1b75fff6 Mon Sep 17 00:00:00 2001
From: Erin <erin@code.org>
Date: Thu, 8 Mar 2018 13:37:19 -0800
Subject: [PATCH 30/56] Fix styles in resource link

---
 apps/src/templates/instructions/ResourceLink.jsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/src/templates/instructions/ResourceLink.jsx b/apps/src/templates/instructions/ResourceLink.jsx
index 6cb1870e32c61..2b4831f5c4752 100644
--- a/apps/src/templates/instructions/ResourceLink.jsx
+++ b/apps/src/templates/instructions/ResourceLink.jsx
@@ -63,10 +63,14 @@ class ResourceLink extends React.Component {
   };
 
   render() {
-    const { icon, reference, text, highlight} = this.props;
+    const {icon, reference, text, highlight} = this.props;
 
-    const iconStyle = highlight ? {...styles.commonIcon, ...styles.mapIcon} : {...styles.commonIcon, ...styles.resourceIcon};
-    const thumbnailStyle = highlight ? {...styles.commonThumbnail, ...styles.mapThumbnail} : {...styles.commonThumbnail};
+    const iconStyle = {
+      ...styles.commonIcon,
+      ...(highlight ? styles.mapIcon : styles.resourceIcon)};
+    const thumbnailStyle = {
+      ...styles.commonThumbnail,
+      ...(highlight && styles.mapThumbnail)};
 
     return (
       <div>

From 66653b561e3029b2d98cd7bd506e09debc7a2dce Mon Sep 17 00:00:00 2001
From: bencodeorg <ben@code.org>
Date: Thu, 8 Mar 2018 14:38:10 -0800
Subject: [PATCH 31/56] Remove K-6 schools from middle school designation [ci
 skip]

---
 aws/redshift/views/school_stats.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aws/redshift/views/school_stats.sql b/aws/redshift/views/school_stats.sql
index f9c87f6f8e8ac..b6ea19660115a 100644
--- a/aws/redshift/views/school_stats.sql
+++ b/aws/redshift/views/school_stats.sql
@@ -22,6 +22,8 @@ CREATE OR REPLACE VIEW analysis.school_stats AS
            (CASE WHEN (grade_06_offered +
                        grade_07_offered +
                        grade_08_offered) > 0
+                 -- exclude K-6 and pre-K-6 schools from being classified as middle schools
+                 AND ((grades_offered_lo = 'PK' and grades_offered_hi = '06') or (grades_offered_lo = 'KG' and grades_offered_hi = '06')) = 0                                      
                  THEN 1
                  ELSE 0 END)                        AS stage_mi,
            (CASE WHEN (grade_09_offered +

From 4f91d2687027081da65e52eeec8a50f984c03e72 Mon Sep 17 00:00:00 2001
From: Erin Bond <erin.bond@code.org>
Date: Thu, 8 Mar 2018 15:17:23 -0800
Subject: [PATCH 32/56] remove Radium, use QuickActionsCellType.type instead of
 strings

---
 apps/src/templates/tables/QuickActionsCell.jsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/src/templates/tables/QuickActionsCell.jsx b/apps/src/templates/tables/QuickActionsCell.jsx
index cc7e0a0397151..c0116683f2023 100644
--- a/apps/src/templates/tables/QuickActionsCell.jsx
+++ b/apps/src/templates/tables/QuickActionsCell.jsx
@@ -1,5 +1,4 @@
 import React, {Component, PropTypes} from 'react';
-import Radium from 'radium';
 import color from "../../util/color";
 import PopUpMenu from "@cdo/apps/lib/ui/PopUpMenu";
 import styleConstants from '../../styleConstants';
@@ -42,7 +41,7 @@ const styles = {
   },
 };
 
-class QuickActionsCell extends Component {
+export default class QuickActionsCell extends Component {
   static propTypes = {
     children: PropTypes.oneOfType([
       PropTypes.node,
@@ -52,7 +51,7 @@ class QuickActionsCell extends Component {
   };
 
   static defaultProps = {
-    type: 'body'
+    type: QuickActionsCellType.body
   };
 
   state = {
@@ -108,7 +107,7 @@ class QuickActionsCell extends Component {
       body: 'chevron-down'
     };
 
-    const styleByType = type === "header" ?
+    const styleByType = type === QuickActionsCellType.header ?
       styles.actionButton["header"] :
       this.state.open ?
         styles.hoverFocus["body"] :
@@ -139,5 +138,3 @@ class QuickActionsCell extends Component {
     );
   }
 }
-
-export default Radium(QuickActionsCell);

From 95faf1fca6d67e68ef133eea69e0bf8738e3babf Mon Sep 17 00:00:00 2001
From: Erin Bond <erin.bond@code.org>
Date: Thu, 8 Mar 2018 15:32:51 -0800
Subject: [PATCH 33/56] remove negative margin in favor of lineHeight

---
 apps/src/templates/tables/QuickActionsCell.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/src/templates/tables/QuickActionsCell.jsx b/apps/src/templates/tables/QuickActionsCell.jsx
index c0116683f2023..f373657cef8b7 100644
--- a/apps/src/templates/tables/QuickActionsCell.jsx
+++ b/apps/src/templates/tables/QuickActionsCell.jsx
@@ -27,7 +27,7 @@ const styles = {
     },
     [QuickActionsCellType.header]: {
       fontSize: 20,
-      marginTop: -3,
+      lineHeight: '15px',
       color: color.darker_gray,
     }
   },

From f838ae1d49bd35801a6c168c924da7518dd8b896 Mon Sep 17 00:00:00 2001
From: Caley Brock <caleybrock7@gmail.com>
Date: Thu, 8 Mar 2018 15:35:46 -0800
Subject: [PATCH 34/56] Prevent multiple saves

---
 .../manageStudents/manageStudentsRedux.js          | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/src/templates/manageStudents/manageStudentsRedux.js b/apps/src/templates/manageStudents/manageStudentsRedux.js
index e0275fb4ab264..3e9fc5823e047 100644
--- a/apps/src/templates/manageStudents/manageStudentsRedux.js
+++ b/apps/src/templates/manageStudents/manageStudentsRedux.js
@@ -122,9 +122,10 @@ export const saveAllStudents = () => {
     });
 
     // Adding students can be saved together.
+    // Only add students that currently are not in progress saving.
     const arrayOfEditedData = Object.values(state.editingData);
     const newStudentsToAdd = arrayOfEditedData
-      .filter(student => student.rowType === RowType.NEW_STUDENT)
+      .filter(student => (student.rowType === RowType.NEW_STUDENT && !student.isSaving))
       .map(student => student.id);
     if (newStudentsToAdd.length > 0) {
       dispatch(addStudents(newStudentsToAdd));
@@ -269,6 +270,13 @@ export default function manageStudents(state=initialState, action) {
           isSaving: true
         }
       },
+      editingData: {
+        ...state.editingData,
+        [action.studentId]: {
+          ...state.editingData[action.studentId],
+          isSaving: true
+        }
+      },
     };
   }
   if (action.type === SAVE_STUDENT_SUCCESS) {
@@ -297,6 +305,10 @@ export default function manageStudents(state=initialState, action) {
         ...state.studentData[action.studentIds[i]],
         isSaving: false,
       };
+      newState.editingData[action.studentIds[i]] = {
+        ...state.editingData[action.studentIds[i]],
+        isSaving: false,
+      };
     }
     return newState;
   }

From 4ca5fb43cf9f2181d349f3a56998e2cebd9c592a Mon Sep 17 00:00:00 2001
From: Caley Brock <caleybrock7@gmail.com>
Date: Thu, 8 Mar 2018 15:59:00 -0800
Subject: [PATCH 35/56] Update start saving success

---
 .../unit/templates/manageStudents/manageStudentsReduxTest.js     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/test/unit/templates/manageStudents/manageStudentsReduxTest.js b/apps/test/unit/templates/manageStudents/manageStudentsReduxTest.js
index 5af0e5974aec2..fb50b6952e59e 100644
--- a/apps/test/unit/templates/manageStudents/manageStudentsReduxTest.js
+++ b/apps/test/unit/templates/manageStudents/manageStudentsReduxTest.js
@@ -309,6 +309,7 @@ describe('manageStudentsRedux', () => {
       const startedSavingState = manageStudents(editingState, startSavingAction);
       assert.equal(startedSavingState.studentData[1].isEditing, true);
       assert.equal(startedSavingState.studentData[1].isSaving, true);
+      assert.equal(startedSavingState.editingData[1].isSaving, true);
     });
 
     it('saveStudentSuccess updates studentData and removes editingData', () => {

From 568a7dc5422ebdd48c2aec30c5b9dd0f75d34591 Mon Sep 17 00:00:00 2001
From: Caley Brock <caleybrock7@gmail.com>
Date: Thu, 8 Mar 2018 16:05:44 -0800
Subject: [PATCH 36/56] Update failure test

---
 .../unit/templates/manageStudents/manageStudentsReduxTest.js   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/test/unit/templates/manageStudents/manageStudentsReduxTest.js b/apps/test/unit/templates/manageStudents/manageStudentsReduxTest.js
index fb50b6952e59e..c00e2b9b23d18 100644
--- a/apps/test/unit/templates/manageStudents/manageStudentsReduxTest.js
+++ b/apps/test/unit/templates/manageStudents/manageStudentsReduxTest.js
@@ -516,6 +516,7 @@ describe('manageStudentsRedux', () => {
 
       assert.deepEqual(addedStudentState.editingData[0], {
         ...initialState.editingData[0],
+        isSaving: false,
       });
       assert.deepEqual(addedStudentState.studentData[0], {
         ...initialState.studentData[0],
@@ -560,9 +561,11 @@ describe('manageStudentsRedux', () => {
 
       assert.deepEqual(addedStudentState.editingData[1], {
         ...initialState.editingData[1],
+        isSaving: false,
       });
       assert.deepEqual(addedStudentState.editingData[2], {
         ...initialState.editingData[2],
+        isSaving: false,
       });
       assert.deepEqual(addedStudentState.studentData[1], {
         ...initialState.studentData[1],

From 9b9bdea8a98a5535631f69304b2f4b9d8c92933e Mon Sep 17 00:00:00 2001
From: Ram Kandasamy <ram@code.org>
Date: Thu, 8 Mar 2018 16:27:20 -0800
Subject: [PATCH 37/56] Don't get lazy about doucmenting params

---
 apps/src/block_utils.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/src/block_utils.js b/apps/src/block_utils.js
index ef1ca797c49b5..08c1db701ff39 100644
--- a/apps/src/block_utils.js
+++ b/apps/src/block_utils.js
@@ -428,6 +428,13 @@ exports.interpolateInputs = interpolateInputs;
 
 /**
  * Add pre-labeled inputs
+ * @param {Blockly} blockly The Blockly object provided to install()
+ * @param {Block} block The block to add the inputs to
+ * @param {Object[]} args The list of inputs
+ * @param {String} args[].name The name for this input, conventionally all-caps
+ * @param {String} args[].type The type for this input, defaults to allowing any
+ *   type
+ * @param {String} args[].label The text to display to the left of the input
  */
 const addInputs = function (blockly, block, args) {
   block.appendDummyInput()
@@ -489,6 +496,7 @@ exports.createJsWrapperBlockCreator = function (
    *   block without a previous statement connector.
    * @param {boolean} opts.eventLoopBlock Generate an "event loop" block, which
    *   looks like a loop block but without previous or next statement connectors
+   * @param {boolean} opts.inline Render inputs inline, defaults to false
    */
   return ({
     color,

From a22fce53e868bff8c1149a19a079e03a2ab8508d Mon Sep 17 00:00:00 2001
From: Andrew Oberhardt <Andrew@Code.org>
Date: Thu, 8 Mar 2018 16:29:24 -0800
Subject: [PATCH 38/56] Apply the same styles to the status footer for partners
 and admins

---
 .../detail_view_contents.jsx                     | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/src/code-studio/pd/application_dashboard/detail_view_contents.jsx b/apps/src/code-studio/pd/application_dashboard/detail_view_contents.jsx
index 5c3bbbaa685c1..1ef08dc46f697 100644
--- a/apps/src/code-studio/pd/application_dashboard/detail_view_contents.jsx
+++ b/apps/src/code-studio/pd/application_dashboard/detail_view_contents.jsx
@@ -1,6 +1,8 @@
 import React, {PropTypes} from 'react';
 import { connect } from 'react-redux';
 import {
+  Row,
+  Col,
   Button,
   SplitButton,
   MenuItem,
@@ -308,7 +310,11 @@ export class DetailViewContents extends React.Component {
     } else {
       // Render just the select; otherwise, rendering a single element in an
       // InputGroup makes it look funky
-      return selectControl;
+      return (
+        <div style={styles.statusSelectGroup}>
+          {selectControl}
+        </div>
+      );
     }
   };
 
@@ -450,8 +456,8 @@ export class DetailViewContents extends React.Component {
         <h4>
           Notes
         </h4>
-        <div className="row">
-          <div className="col-md-8">
+        <Row>
+          <Col md={8}>
             <FormControl
               id="Notes"
               disabled={!this.state.editing}
@@ -460,8 +466,8 @@ export class DetailViewContents extends React.Component {
               onChange={this.handleNotesChange}
               style={styles.notes}
             />
-          </div>
-        </div>
+          </Col>
+        </Row>
         <br />
       </div>
     );

From ec0e641774ce18728416c68529feccf8d8d87dfe Mon Sep 17 00:00:00 2001
From: Erin <erin@code.org>
Date: Thu, 8 Mar 2018 14:43:36 -0800
Subject: [PATCH 39/56] Remove the /v3/animations API for restoring a previous
 version.

We verified by examining metrics from the Firehose 'project-data-integrity/version-restored' experiment that this API has _never_ been called.  It simplifies the code to tear it out.
---
 shared/middleware/files_api.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/shared/middleware/files_api.rb b/shared/middleware/files_api.rb
index 9dff70b138914..e6f65bad4f973 100644
--- a/shared/middleware/files_api.rb
+++ b/shared/middleware/files_api.rb
@@ -461,18 +461,17 @@ def copy_file(endpoint, encrypted_channel_id, filename, source_filename)
   end
 
   #
-  # PUT /v3/(animations|sources)/<channel-id>/<filename>/restore?version=<version-id>
+  # PUT /v3/sources/<channel-id>/<filename>/restore?version=<version-id>
   #
-  # Copies the given version of the file to make it the current revision.
-  # NOTE: Not yet implemented for assets.
+  # Copies the given version of the source to make it the current revision.
   #
-  put %r{/v3/(animations|sources)/([^/]+)/([^/]+)/restore$} do |endpoint, encrypted_channel_id, filename|
+  put %r{/v3/sources/([^/]+)/([^/]+)/restore$} do |encrypted_channel_id, filename|
     dont_cache
     content_type :json
 
     not_authorized unless owns_channel?(encrypted_channel_id)
 
-    get_bucket_impl(endpoint).new.restore_previous_version(encrypted_channel_id, filename, request.GET['version'], current_user_id).to_json
+    SourceBucket.new.restore_previous_version(encrypted_channel_id, filename, request.GET['version'], current_user_id).to_json
   end
 
   #

From 134f41e9f4151395ebc49ec6bfe6a38731a240f6 Mon Sep 17 00:00:00 2001
From: Erin <erin@code.org>
Date: Thu, 8 Mar 2018 17:24:39 -0800
Subject: [PATCH 40/56] Fix step def typo

---
 dashboard/test/ui/features/step_definitions/gamelab.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard/test/ui/features/step_definitions/gamelab.rb b/dashboard/test/ui/features/step_definitions/gamelab.rb
index 22b22a8f43a2b..928b479e67f03 100644
--- a/dashboard/test/ui/features/step_definitions/gamelab.rb
+++ b/dashboard/test/ui/features/step_definitions/gamelab.rb
@@ -36,7 +36,7 @@
   steps 'When I press "animationMode"'
 end
 
-When /^I switch to(?: the)? code (?:mode|tab)$ in Game Lab/ do
+When /^I switch to(?: the)? code (?:mode|tab) in Game Lab$/ do
   @browser.execute_script("$(\"#codeMode\")[0].click();")
 end
 

From afa79f5685e741c3f429cdba69370ab281f1b899 Mon Sep 17 00:00:00 2001
From: Elijah Hamovitz <elijahhamovitz@gmail.com>
Date: Thu, 8 Mar 2018 17:41:20 -0800
Subject: [PATCH 41/56] update HintDisplayLightbulb to ES6 class

---
 apps/src/templates/HintDisplayLightbulb.jsx | 28 ++++++++++-----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/apps/src/templates/HintDisplayLightbulb.jsx b/apps/src/templates/HintDisplayLightbulb.jsx
index 9509593120f6a..6a87c5a4b5e20 100644
--- a/apps/src/templates/HintDisplayLightbulb.jsx
+++ b/apps/src/templates/HintDisplayLightbulb.jsx
@@ -3,28 +3,26 @@ import Lightbulb from './Lightbulb';
 
 import { connect } from 'react-redux';
 
-const HintDisplayLightbulb = React.createClass({
-  propTypes: {
+class HintDisplayLightbulb extends React.Component {
+  static propTypes = {
     unseenHints: PropTypes.arrayOf(PropTypes.object),
     isMinecraft: PropTypes.bool
-  },
-
-  getInitialState() {
-    return {
-      shouldAnimate: false
-    };
-  },
+  };
 
-  getCount() {
-    return this.props.unseenHints.length;
-  },
+  state = {
+    shouldAnimate: false
+  };
 
   componentWillReceiveProps(nextProps) {
     const receivingNewHints = nextProps.unseenHints.length > this.getCount();
     this.setState({
       shouldAnimate: receivingNewHints
     });
-  },
+  }
+
+  getCount() {
+    return this.props.unseenHints.length;
+  }
 
   render() {
     return (
@@ -37,8 +35,8 @@ const HintDisplayLightbulb = React.createClass({
         />
       </div>
     );
-  },
-});
+  }
+}
 
 export default connect(function propsFromStore(state) {
   return {

From a4f5444a881f029c9d2ee8bdbf4cecfe4dcc34c1 Mon Sep 17 00:00:00 2001
From: Brad Buchanan <brad@code.org>
Date: Thu, 8 Mar 2018 17:41:51 -0800
Subject: [PATCH 42/56] Test restore operation on sources api

---
 shared/test/files_api_test_helper.rb          |   5 +
 .../fixtures/vcr/sources/source_versions.yml  | 184 +++++++++++-------
 shared/test/test_sources.rb                   |  15 +-
 3 files changed, 136 insertions(+), 68 deletions(-)

diff --git a/shared/test/files_api_test_helper.rb b/shared/test/files_api_test_helper.rb
index e1a36a3047687..f77e95827f3b8 100644
--- a/shared/test/files_api_test_helper.rb
+++ b/shared/test/files_api_test_helper.rb
@@ -108,6 +108,11 @@ def post_object_version(filename, version_id, body = '', headers = {})
     last_response.body
   end
 
+  def restore_sources_version(filename, version_id, body = '', headers = {})
+    put "/v3/sources/#{@channel_id}/#{filename}/restore?version=#{version_id}", body, headers
+    JSON.parse(last_response.body)
+  end
+
   def list_files_versions
     get "/v3/#{@endpoint}-version/#{@channel_id}"
     JSON.parse(last_response.body)
diff --git a/shared/test/fixtures/vcr/sources/source_versions.yml b/shared/test/fixtures/vcr/sources/source_versions.yml
index 70536dd8e248a..e5e7401cb233c 100644
--- a/shared/test/fixtures/vcr/sources/source_versions.yml
+++ b/shared/test/fixtures/vcr/sources/source_versions.yml
@@ -15,7 +15,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Wed, 13 Apr 2016 21:57:38 GMT
+      - Fri, 09 Mar 2018 01:37:51 GMT
       Content-Type:
       - application/xml
       Transfer-Encoding:
@@ -26,9 +26,9 @@ http_interactions:
       encoding: UTF-8
       string: |-
         <?xml version="1.0" encoding="UTF-8"?>
-        <ListVersionsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>cdo-v3-sources</Name><Prefix>sources_test/1/1/test.js</Prefix><KeyMarker></KeyMarker><VersionIdMarker></VersionIdMarker><MaxKeys>1000</MaxKeys><EncodingType>url</EncodingType><IsTruncated>false</IsTruncated><DeleteMarker><Key>sources_test/1/1/test.js</Key><VersionId>VTIw0gYunlg6uLruOFn4TtMf6XLNxbmf</VersionId><IsLatest>true</IsLatest><LastModified>2016-04-13T21:55:52.000Z</LastModified><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner></DeleteMarker><Version><Key>sources_test/1/1/test.js</Key><VersionId>q60a.YXAstVAMXItyX4eMp6mx5gmLdYM</VersionId><IsLatest>false</IsLatest><LastModified>2016-04-13T21:55:51.000Z</LastModified><ETag>&quot;e994138e751a9e7dbd44b60a556cb14d&quot;</ETag><Size>7</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Version><Version><Key>sources_test/1/1/test.js</Key><VersionId>N.ZBJuLaToTPz1SKVLrXSm9M7T.MMbhJ</VersionId><IsLatest>false</IsLatest><LastModified>2016-04-13T21:55:50.000Z</LastModified><ETag>&quot;c89cfdb5dd9f56836f59fba6c062dda4&quot;</ETag><Size>7</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Version><DeleteMarker><Key>sources_test/1/1/test.js</Key><VersionId>.04on1agnukKAiKpMhf5Y91K5ur96MJX</VersionId><IsLatest>false</IsLatest><LastModified>2016-04-13T21:55:40.000Z</LastModified><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner></DeleteMarker><DeleteMarker><Key>sources_test/1/1/test.js</Key><VersionId>HyRY6l2hXihCjn.GBfAroOW5yQYHpjDc</VersionId><IsLatest>false</IsLatest><LastModified>2016-04-13T21:55:30.000Z</LastModified><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner></DeleteMarker><DeleteMarker><Key>sources_test/1/1/test.js</Key><VersionId>KSskvrB73wVBirLlQnO9MOo8z.PETDtq</VersionId><IsLatest>false</IsLatest><LastModified>2016-03-04T01:28:04.000Z</LastModified><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner></DeleteMarker><DeleteMarker><Key>sources_test/1/1/test.js</Key><VersionId>zg_kuuiKt7ePQvJxSswJItHoRZ7uY257</VersionId><IsLatest>false</IsLatest><LastModified>2016-03-04T01:22:22.000Z</LastModified><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner></DeleteMarker><DeleteMarker><Key>sources_test/1/1/test.js</Key><VersionId>G4kfu2.018dd8c8QsYiZkAjV7lyV4zxq</VersionId><IsLatest>false</IsLatest><LastModified>2016-03-04T01:08:21.000Z</LastModified><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner></DeleteMarker><DeleteMarker><Key>sources_test/1/1/test.js</Key><VersionId>DLOA8Np4_oCzES4J4VKvS8cTDMYhQ9TR</VersionId><IsLatest>false</IsLatest><LastModified>2015-11-17T17:02:54.000Z</LastModified><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner></DeleteMarker></ListVersionsResult>
+        <ListVersionsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>cdo-v3-sources</Name><Prefix>sources_test/1/1/test.js</Prefix><KeyMarker></KeyMarker><VersionIdMarker></VersionIdMarker><MaxKeys>1000</MaxKeys><EncodingType>url</EncodingType><IsTruncated>false</IsTruncated><Version><Key>sources_test/1/1/test.js</Key><VersionId>hky49_7ESXiHFetIGfkyS9YbqrBFP0uL</VersionId><IsLatest>true</IsLatest><LastModified>2018-03-09T01:33:50.000Z</LastModified><ETag>&quot;e994138e751a9e7dbd44b60a556cb14d&quot;</ETag><Size>7</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Version><DeleteMarker><Key>sources_test/1/1/test.js</Key><VersionId>RtYgKmne4vGqupxUQrfbk5FpnvAznFTt</VersionId><IsLatest>false</IsLatest><LastModified>2018-03-09T01:33:47.000Z</LastModified><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner></DeleteMarker><Version><Key>sources_test/1/1/test.js</Key><VersionId>.QesqfnMIsgVFW_YIwDy9dXIU8klq1vP</VersionId><IsLatest>false</IsLatest><LastModified>2018-03-09T01:33:47.000Z</LastModified><ETag>&quot;e994138e751a9e7dbd44b60a556cb14d&quot;</ETag><Size>7</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Version><Version><Key>sources_test/1/1/test.js</Key><VersionId>Qxxg89DHS1qDNs3QSoRAMkJD03Vik6PX</VersionId><IsLatest>false</IsLatest><LastModified>2018-03-09T01:33:46.000Z</LastModified><ETag>&quot;c89cfdb5dd9f56836f59fba6c062dda4&quot;</ETag><Size>7</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Version></ListVersionsResult>
     http_version: 
-  recorded_at: Wed, 13 Apr 2016 21:57:37 GMT
+  recorded_at: Fri, 09 Mar 2018 01:37:50 GMT
 - request:
     method: post
     uri: https://cdo-v3-sources.s3.amazonaws.com/?delete
@@ -38,39 +38,19 @@ http_interactions:
         <Delete xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
           <Object>
             <Key>sources_test/1/1/test.js</Key>
-            <VersionId>q60a.YXAstVAMXItyX4eMp6mx5gmLdYM</VersionId>
+            <VersionId>hky49_7ESXiHFetIGfkyS9YbqrBFP0uL</VersionId>
           </Object>
           <Object>
             <Key>sources_test/1/1/test.js</Key>
-            <VersionId>N.ZBJuLaToTPz1SKVLrXSm9M7T.MMbhJ</VersionId>
+            <VersionId>.QesqfnMIsgVFW_YIwDy9dXIU8klq1vP</VersionId>
           </Object>
           <Object>
             <Key>sources_test/1/1/test.js</Key>
-            <VersionId>VTIw0gYunlg6uLruOFn4TtMf6XLNxbmf</VersionId>
+            <VersionId>Qxxg89DHS1qDNs3QSoRAMkJD03Vik6PX</VersionId>
           </Object>
           <Object>
             <Key>sources_test/1/1/test.js</Key>
-            <VersionId>.04on1agnukKAiKpMhf5Y91K5ur96MJX</VersionId>
-          </Object>
-          <Object>
-            <Key>sources_test/1/1/test.js</Key>
-            <VersionId>HyRY6l2hXihCjn.GBfAroOW5yQYHpjDc</VersionId>
-          </Object>
-          <Object>
-            <Key>sources_test/1/1/test.js</Key>
-            <VersionId>KSskvrB73wVBirLlQnO9MOo8z.PETDtq</VersionId>
-          </Object>
-          <Object>
-            <Key>sources_test/1/1/test.js</Key>
-            <VersionId>zg_kuuiKt7ePQvJxSswJItHoRZ7uY257</VersionId>
-          </Object>
-          <Object>
-            <Key>sources_test/1/1/test.js</Key>
-            <VersionId>G4kfu2.018dd8c8QsYiZkAjV7lyV4zxq</VersionId>
-          </Object>
-          <Object>
-            <Key>sources_test/1/1/test.js</Key>
-            <VersionId>DLOA8Np4_oCzES4J4VKvS8cTDMYhQ9TR</VersionId>
+            <VersionId>RtYgKmne4vGqupxUQrfbk5FpnvAznFTt</VersionId>
           </Object>
           <Quiet>true</Quiet>
         </Delete>
@@ -78,16 +58,16 @@ http_interactions:
       Expect:
       - 100-continue
       Content-Md5:
-      - adtnUS0DsyRRfiau9e4hzA==
+      - A93zlNiL518M0Apvs6mF2A==
       Content-Length:
-      - '1196'
+      - '581'
   response:
     status:
       code: 200
       message: OK
     headers:
       Date:
-      - Wed, 13 Apr 2016 21:57:38 GMT
+      - Fri, 09 Mar 2018 01:37:52 GMT
       Connection:
       - close
       Content-Type:
@@ -102,7 +82,7 @@ http_interactions:
         <?xml version="1.0" encoding="UTF-8"?>
         <DeleteResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"></DeleteResult>
     http_version: 
-  recorded_at: Wed, 13 Apr 2016 21:57:37 GMT
+  recorded_at: Fri, 09 Mar 2018 01:37:51 GMT
 - request:
     method: get
     uri: https://cdo-v3-sources.s3.amazonaws.com/?encoding-type=url&prefix=sources_test/1/1/
@@ -118,7 +98,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Wed, 13 Apr 2016 21:57:38 GMT
+      - Fri, 09 Mar 2018 01:37:52 GMT
       X-Amz-Bucket-Region:
       - us-east-1
       Content-Type:
@@ -131,9 +111,9 @@ http_interactions:
       encoding: UTF-8
       string: |-
         <?xml version="1.0" encoding="UTF-8"?>
-        <ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>cdo-v3-sources</Name><Prefix>sources_test/1/1/</Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><EncodingType>url</EncodingType><IsTruncated>false</IsTruncated><Contents><Key>sources_test/1/1/main.json</Key><LastModified>2016-04-13T20:01:59.000Z</LastModified><ETag>&quot;5116df015dca4bf8ef38fb9a027afaac&quot;</ETag><Size>1622</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>sources_test/1/1/replace_me.js</Key><LastModified>2016-04-13T21:57:36.000Z</LastModified><ETag>&quot;d4ca1ed7571e2e7b1f1c375bd50fa220&quot;</ETag><Size>9</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>
+        <ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>cdo-v3-sources</Name><Prefix>sources_test/1/1/</Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><EncodingType>url</EncodingType><IsTruncated>false</IsTruncated><Contents><Key>sources_test/1/1/main.json</Key><LastModified>2018-03-09T01:36:04.000Z</LastModified><ETag>&quot;4ceb22ebb7134b0eaa2b60d01615b302&quot;</ETag><Size>10676</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>sources_test/1/1/replace_me.js</Key><LastModified>2018-02-20T06:38:43.000Z</LastModified><ETag>&quot;d4ca1ed7571e2e7b1f1c375bd50fa220&quot;</ETag><Size>9</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>
     http_version: 
-  recorded_at: Wed, 13 Apr 2016 21:57:38 GMT
+  recorded_at: Fri, 09 Mar 2018 01:37:52 GMT
 - request:
     method: put
     uri: https://cdo-v3-sources.s3.amazonaws.com/sources_test/1/1/test.js
@@ -155,9 +135,9 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Wed, 13 Apr 2016 21:57:39 GMT
+      - Fri, 09 Mar 2018 01:37:53 GMT
       X-Amz-Version-Id:
-      - aFFCXf8c.n2PoT3RfNKCo_LieSsLbsHB
+      - 4Uxmqaw9IHYzgHwzyz24dqwIJXjKbkjL
       Etag:
       - '"c89cfdb5dd9f56836f59fba6c062dda4"'
       Content-Length:
@@ -168,7 +148,7 @@ http_interactions:
       encoding: UTF-8
       string: ''
     http_version: 
-  recorded_at: Wed, 13 Apr 2016 21:57:39 GMT
+  recorded_at: Fri, 09 Mar 2018 01:37:52 GMT
 - request:
     method: get
     uri: https://cdo-v3-sources.s3.amazonaws.com/?encoding-type=url&prefix=sources_test/1/1/
@@ -184,7 +164,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Wed, 13 Apr 2016 21:57:40 GMT
+      - Fri, 09 Mar 2018 01:37:54 GMT
       X-Amz-Bucket-Region:
       - us-east-1
       Content-Type:
@@ -197,9 +177,9 @@ http_interactions:
       encoding: UTF-8
       string: |-
         <?xml version="1.0" encoding="UTF-8"?>
-        <ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>cdo-v3-sources</Name><Prefix>sources_test/1/1/</Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><EncodingType>url</EncodingType><IsTruncated>false</IsTruncated><Contents><Key>sources_test/1/1/main.json</Key><LastModified>2016-04-13T20:01:59.000Z</LastModified><ETag>&quot;5116df015dca4bf8ef38fb9a027afaac&quot;</ETag><Size>1622</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>sources_test/1/1/replace_me.js</Key><LastModified>2016-04-13T21:57:36.000Z</LastModified><ETag>&quot;d4ca1ed7571e2e7b1f1c375bd50fa220&quot;</ETag><Size>9</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>sources_test/1/1/test.js</Key><LastModified>2016-04-13T21:57:39.000Z</LastModified><ETag>&quot;c89cfdb5dd9f56836f59fba6c062dda4&quot;</ETag><Size>7</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>
+        <ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>cdo-v3-sources</Name><Prefix>sources_test/1/1/</Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><EncodingType>url</EncodingType><IsTruncated>false</IsTruncated><Contents><Key>sources_test/1/1/main.json</Key><LastModified>2018-03-09T01:36:04.000Z</LastModified><ETag>&quot;4ceb22ebb7134b0eaa2b60d01615b302&quot;</ETag><Size>10676</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>sources_test/1/1/replace_me.js</Key><LastModified>2018-02-20T06:38:43.000Z</LastModified><ETag>&quot;d4ca1ed7571e2e7b1f1c375bd50fa220&quot;</ETag><Size>9</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>sources_test/1/1/test.js</Key><LastModified>2018-03-09T01:37:53.000Z</LastModified><ETag>&quot;c89cfdb5dd9f56836f59fba6c062dda4&quot;</ETag><Size>7</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>
     http_version: 
-  recorded_at: Wed, 13 Apr 2016 21:57:39 GMT
+  recorded_at: Fri, 09 Mar 2018 01:37:53 GMT
 - request:
     method: put
     uri: https://cdo-v3-sources.s3.amazonaws.com/sources_test/1/1/test.js
@@ -221,9 +201,9 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Wed, 13 Apr 2016 21:57:41 GMT
+      - Fri, 09 Mar 2018 01:37:54 GMT
       X-Amz-Version-Id:
-      - j_wHSummnxwGHYgmeUW8WP1Ji19lpMks
+      - dTytPKCuoz3iTr4eDS3VKPAO1Eel_dAu
       Etag:
       - '"e994138e751a9e7dbd44b60a556cb14d"'
       Content-Length:
@@ -234,7 +214,7 @@ http_interactions:
       encoding: UTF-8
       string: ''
     http_version: 
-  recorded_at: Wed, 13 Apr 2016 21:57:40 GMT
+  recorded_at: Fri, 09 Mar 2018 01:37:53 GMT
 - request:
     method: delete
     uri: https://cdo-v3-sources.s3.amazonaws.com/sources_test/1/1/test.js
@@ -250,9 +230,9 @@ http_interactions:
       message: No Content
     headers:
       Date:
-      - Wed, 13 Apr 2016 21:57:41 GMT
+      - Fri, 09 Mar 2018 01:37:54 GMT
       X-Amz-Version-Id:
-      - but_1RXW7z3Vd_vqIyPkFR2RR2Gj.zmL
+      - 8gm9bJcSAtJ1QdpvZwUF2NWAofg04.DJ
       X-Amz-Delete-Marker:
       - 'true'
       Server:
@@ -261,7 +241,7 @@ http_interactions:
       encoding: UTF-8
       string: ''
     http_version: 
-  recorded_at: Wed, 13 Apr 2016 21:57:40 GMT
+  recorded_at: Fri, 09 Mar 2018 01:37:54 GMT
 - request:
     method: get
     uri: https://cdo-v3-sources.s3.amazonaws.com/?encoding-type=url&prefix=sources_test/1/1/test.js&versions
@@ -277,7 +257,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Wed, 13 Apr 2016 21:57:41 GMT
+      - Fri, 09 Mar 2018 01:37:55 GMT
       Content-Type:
       - application/xml
       Transfer-Encoding:
@@ -288,12 +268,12 @@ http_interactions:
       encoding: UTF-8
       string: |-
         <?xml version="1.0" encoding="UTF-8"?>
-        <ListVersionsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>cdo-v3-sources</Name><Prefix>sources_test/1/1/test.js</Prefix><KeyMarker></KeyMarker><VersionIdMarker></VersionIdMarker><MaxKeys>1000</MaxKeys><EncodingType>url</EncodingType><IsTruncated>false</IsTruncated><DeleteMarker><Key>sources_test/1/1/test.js</Key><VersionId>but_1RXW7z3Vd_vqIyPkFR2RR2Gj.zmL</VersionId><IsLatest>true</IsLatest><LastModified>2016-04-13T21:57:41.000Z</LastModified><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner></DeleteMarker><Version><Key>sources_test/1/1/test.js</Key><VersionId>j_wHSummnxwGHYgmeUW8WP1Ji19lpMks</VersionId><IsLatest>false</IsLatest><LastModified>2016-04-13T21:57:41.000Z</LastModified><ETag>&quot;e994138e751a9e7dbd44b60a556cb14d&quot;</ETag><Size>7</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Version><Version><Key>sources_test/1/1/test.js</Key><VersionId>aFFCXf8c.n2PoT3RfNKCo_LieSsLbsHB</VersionId><IsLatest>false</IsLatest><LastModified>2016-04-13T21:57:39.000Z</LastModified><ETag>&quot;c89cfdb5dd9f56836f59fba6c062dda4&quot;</ETag><Size>7</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Version></ListVersionsResult>
+        <ListVersionsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>cdo-v3-sources</Name><Prefix>sources_test/1/1/test.js</Prefix><KeyMarker></KeyMarker><VersionIdMarker></VersionIdMarker><MaxKeys>1000</MaxKeys><EncodingType>url</EncodingType><IsTruncated>false</IsTruncated><DeleteMarker><Key>sources_test/1/1/test.js</Key><VersionId>8gm9bJcSAtJ1QdpvZwUF2NWAofg04.DJ</VersionId><IsLatest>true</IsLatest><LastModified>2018-03-09T01:37:54.000Z</LastModified><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner></DeleteMarker><Version><Key>sources_test/1/1/test.js</Key><VersionId>dTytPKCuoz3iTr4eDS3VKPAO1Eel_dAu</VersionId><IsLatest>false</IsLatest><LastModified>2018-03-09T01:37:54.000Z</LastModified><ETag>&quot;e994138e751a9e7dbd44b60a556cb14d&quot;</ETag><Size>7</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Version><Version><Key>sources_test/1/1/test.js</Key><VersionId>4Uxmqaw9IHYzgHwzyz24dqwIJXjKbkjL</VersionId><IsLatest>false</IsLatest><LastModified>2018-03-09T01:37:53.000Z</LastModified><ETag>&quot;c89cfdb5dd9f56836f59fba6c062dda4&quot;</ETag><Size>7</Size><Owner><ID>cf6bd5437eaccbf2d79d5d40694e94c727ef59eb29caa52acbc32daffeb8e9e4</ID><DisplayName>site</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Version></ListVersionsResult>
     http_version: 
-  recorded_at: Wed, 13 Apr 2016 21:57:40 GMT
+  recorded_at: Fri, 09 Mar 2018 01:37:54 GMT
 - request:
     method: get
-    uri: https://cdo-v3-sources.s3.amazonaws.com/sources_test/1/1/test.js?versionId=aFFCXf8c.n2PoT3RfNKCo_LieSsLbsHB
+    uri: https://cdo-v3-sources.s3.amazonaws.com/sources_test/1/1/test.js?versionId=4Uxmqaw9IHYzgHwzyz24dqwIJXjKbkjL
     body:
       encoding: ASCII-8BIT
       string: ''
@@ -306,15 +286,15 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Wed, 13 Apr 2016 21:57:42 GMT
-      X-Amz-Version-Id:
-      - aFFCXf8c.n2PoT3RfNKCo_LieSsLbsHB
-      X-Amz-Meta-Abuse-Score:
-      - '0'
+      - Fri, 09 Mar 2018 01:37:56 GMT
       Last-Modified:
-      - Wed, 13 Apr 2016 21:57:39 GMT
+      - Fri, 09 Mar 2018 01:37:53 GMT
       Etag:
       - '"c89cfdb5dd9f56836f59fba6c062dda4"'
+      X-Amz-Meta-Abuse-Score:
+      - '0'
+      X-Amz-Version-Id:
+      - 4Uxmqaw9IHYzgHwzyz24dqwIJXjKbkjL
       Accept-Ranges:
       - bytes
       Content-Type:
@@ -327,10 +307,10 @@ http_interactions:
       encoding: UTF-8
       string: abc 123
     http_version: 
-  recorded_at: Wed, 13 Apr 2016 21:57:41 GMT
+  recorded_at: Fri, 09 Mar 2018 01:37:55 GMT
 - request:
     method: get
-    uri: https://cdo-v3-sources.s3.amazonaws.com/sources_test/1/1/test.js?versionId=j_wHSummnxwGHYgmeUW8WP1Ji19lpMks
+    uri: https://cdo-v3-sources.s3.amazonaws.com/sources_test/1/1/test.js?versionId=dTytPKCuoz3iTr4eDS3VKPAO1Eel_dAu
     body:
       encoding: ASCII-8BIT
       string: ''
@@ -343,15 +323,15 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Wed, 13 Apr 2016 21:57:42 GMT
-      X-Amz-Version-Id:
-      - j_wHSummnxwGHYgmeUW8WP1Ji19lpMks
-      X-Amz-Meta-Abuse-Score:
-      - '0'
+      - Fri, 09 Mar 2018 01:37:56 GMT
       Last-Modified:
-      - Wed, 13 Apr 2016 21:57:41 GMT
+      - Fri, 09 Mar 2018 01:37:54 GMT
       Etag:
       - '"e994138e751a9e7dbd44b60a556cb14d"'
+      X-Amz-Meta-Abuse-Score:
+      - '0'
+      X-Amz-Version-Id:
+      - dTytPKCuoz3iTr4eDS3VKPAO1Eel_dAu
       Accept-Ranges:
       - bytes
       Content-Type:
@@ -364,5 +344,77 @@ http_interactions:
       encoding: UTF-8
       string: def 456
     http_version: 
-  recorded_at: Wed, 13 Apr 2016 21:57:41 GMT
-recorded_with: VCR 3.0.0
+  recorded_at: Fri, 09 Mar 2018 01:37:55 GMT
+- request:
+    method: put
+    uri: https://cdo-v3-sources.s3.amazonaws.com/sources_test/1/1/test.js
+    body:
+      encoding: ASCII-8BIT
+      string: ''
+    headers:
+      X-Amz-Copy-Source:
+      - cdo-v3-sources/sources_test/1/1/test.js?versionId=4Uxmqaw9IHYzgHwzyz24dqwIJXjKbkjL
+      Content-Length:
+      - '0'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 09 Mar 2018 01:37:56 GMT
+      X-Amz-Copy-Source-Version-Id:
+      - 4Uxmqaw9IHYzgHwzyz24dqwIJXjKbkjL
+      X-Amz-Version-Id:
+      - 9egC1OgDgA00BD9HvrIfRizrHG0EiTI_
+      Content-Type:
+      - application/xml
+      Content-Length:
+      - '234'
+      Server:
+      - AmazonS3
+    body:
+      encoding: UTF-8
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <CopyObjectResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><LastModified>2018-03-09T01:37:56.000Z</LastModified><ETag>&quot;c89cfdb5dd9f56836f59fba6c062dda4&quot;</ETag></CopyObjectResult>
+    http_version: 
+  recorded_at: Fri, 09 Mar 2018 01:37:55 GMT
+- request:
+    method: get
+    uri: https://cdo-v3-sources.s3.amazonaws.com/sources_test/1/1/test.js?versionId=9egC1OgDgA00BD9HvrIfRizrHG0EiTI_
+    body:
+      encoding: ASCII-8BIT
+      string: ''
+    headers:
+      Content-Length:
+      - '0'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 09 Mar 2018 01:37:57 GMT
+      Last-Modified:
+      - Fri, 09 Mar 2018 01:37:56 GMT
+      Etag:
+      - '"c89cfdb5dd9f56836f59fba6c062dda4"'
+      X-Amz-Meta-Abuse-Score:
+      - '0'
+      X-Amz-Version-Id:
+      - 9egC1OgDgA00BD9HvrIfRizrHG0EiTI_
+      Accept-Ranges:
+      - bytes
+      Content-Type:
+      - ''
+      Content-Length:
+      - '7'
+      Server:
+      - AmazonS3
+    body:
+      encoding: UTF-8
+      string: abc 123
+    http_version: 
+  recorded_at: Fri, 09 Mar 2018 01:37:56 GMT
+recorded_with: VCR 3.0.3
diff --git a/shared/test/test_sources.rb b/shared/test/test_sources.rb
index bee0ee5894f0f..9e094ef1ecb73 100644
--- a/shared/test/test_sources.rb
+++ b/shared/test/test_sources.rb
@@ -43,13 +43,24 @@ def test_source_versions
     assert_equal 2, versions.count
 
     # Get the first and second version.
-    first_version = @api.get_object_version(filename, versions.last['versionId'])
+    first_version_id = versions.last['versionId']
+    first_version = @api.get_object_version(filename, first_version_id)
     assert_equal file_data, first_version
-    second_version = @api.get_object_version(filename, versions.first['versionId'])
+    second_version_id = versions.first['versionId']
+    second_version = @api.get_object_version(filename, second_version_id)
     assert_equal new_file_data, second_version
 
     # Check cache headers
     assert_match 'private, must-revalidate, max-age=0', last_response['Cache-Control']
+
+    # Restore the first version
+    restore_result = @api.restore_sources_version(filename, first_version_id)
+    restored_version_id = restore_result['version_id']
+    third_version = @api.get_object_version(filename, restored_version_id)
+
+    # New version id, same body
+    refute_equal first_version_id, restored_version_id
+    assert_equal file_data, third_version
   end
 
   def test_get_source_blocks_profanity_violations

From 28156b687bea954be3fb9cba234463505564d7f3 Mon Sep 17 00:00:00 2001
From: Elijah Hamovitz <elijahhamovitz@gmail.com>
Date: Thu, 8 Mar 2018 17:47:18 -0800
Subject: [PATCH 43/56] update ReadOnlyBlockSpace to ES6 class

---
 apps/src/templates/ReadOnlyBlockSpace.jsx | 56 ++++++++++++-----------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/apps/src/templates/ReadOnlyBlockSpace.jsx b/apps/src/templates/ReadOnlyBlockSpace.jsx
index 54092a6e6edf0..0e0280c6817fa 100644
--- a/apps/src/templates/ReadOnlyBlockSpace.jsx
+++ b/apps/src/templates/ReadOnlyBlockSpace.jsx
@@ -1,4 +1,4 @@
-import React, {PropTypes} from 'react';
+import React, { PropTypes } from 'react';
 
 /**
   * Many of our hints include Blockly blocks. Unfortunately, Blockly
@@ -7,30 +7,22 @@ import React, {PropTypes} from 'react';
   * React render method once we're confident that this component is in
   * the DOM.
   */
-var ReadOnlyBlockSpace = React.createClass({
-  propTypes: {
+export default class ReadOnlyBlockSpace extends React.Component {
+  static propTypes = {
     block: PropTypes.object.isRequired,
-  },
+  };
 
-  getInitialState: function () {
-    return {
-      height: 100,
-      blockSpace: undefined
-    };
-  },
-
-  componentDidUpdate: function () {
-    if (this.state.blockSpace) {
-      this.state.blockSpace.blockSpaceEditor.svgResize();
-    }
-  },
+  state = {
+    height: 100,
+    blockSpace: undefined,
+  };
 
-  componentDidMount: function () {
-    if (!document.body.contains(this.refs.container)) {
+  componentDidMount() {
+    if (!document.body.contains(this.container)) {
       return new Error('ReadOnlyBlockSpace component MUST be rendered into a container that already exists in the DOM');
     }
 
-    let blockSpace = Blockly.BlockSpace.createReadOnlyBlockSpace(this.refs.container, this.props.block, {
+    let blockSpace = Blockly.BlockSpace.createReadOnlyBlockSpace(this.container, this.props.block, {
       noScrolling: true
     });
 
@@ -43,18 +35,28 @@ var ReadOnlyBlockSpace = React.createClass({
     // eslint-disable-next-line react/no-did-mount-set-state
     this.setState({
       height,
-      blockSpace
+      blockSpace,
     });
-  },
+  }
 
-  render: function () {
+  componentDidUpdate() {
+    if (this.state.blockSpace) {
+      this.state.blockSpace.blockSpaceEditor.svgResize();
+    }
+  }
+
+  render() {
     const style = {
       maxHeight: this.state.height,
-      paddingBottom: 10
+      paddingBottom: 10,
     };
 
-    return (<div className="block-space" ref="container" style={style}/>);
+    return (
+      <div
+        className="block-space"
+        ref={(container) => { this.container = container; }}
+        style={style}
+      />
+    );
   }
-});
-
-module.exports = ReadOnlyBlockSpace;
+}

From 92d4cb0d4195ebbcfb9d08cfb7a927eec92ac16f Mon Sep 17 00:00:00 2001
From: Elijah Hamovitz <elijahhamovitz@gmail.com>
Date: Thu, 8 Mar 2018 17:55:03 -0800
Subject: [PATCH 44/56] update InlineHint to ES6 class

---
 .../src/templates/instructions/InlineHint.jsx | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/apps/src/templates/instructions/InlineHint.jsx b/apps/src/templates/instructions/InlineHint.jsx
index b5cad4b340b6c..29c9d295e4b59 100644
--- a/apps/src/templates/instructions/InlineHint.jsx
+++ b/apps/src/templates/instructions/InlineHint.jsx
@@ -1,5 +1,4 @@
-/* eslint-disable react/no-danger */
-import React, {PropTypes} from 'react';
+import React, { PropTypes } from 'react';
 import ReactDOM from 'react-dom';
 import Radium from 'radium';
 import ReadOnlyBlockSpace from '../ReadOnlyBlockSpace';
@@ -10,9 +9,8 @@ import { convertXmlToBlockly } from './utils';
 import VideoThumbnail from '../VideoThumbnail';
 import { videoDataShape } from '../types';
 
-const InlineHint = React.createClass({
-
-  propTypes: {
+class InlineHint extends React.Component {
+  static propTypes = {
     block: PropTypes.object, // XML
     borderColor: PropTypes.string,
     content: PropTypes.string.isRequired,
@@ -20,31 +18,34 @@ const InlineHint = React.createClass({
     ttsUrl: PropTypes.string,
     ttsMessage: PropTypes.string,
     isBlockly: PropTypes.bool,
-  },
+  };
 
   componentDidMount() {
     if (this.props.isBlockly) {
       convertXmlToBlockly(ReactDOM.findDOMNode(this));
     }
-  },
+  }
 
-  onVideoClick() {
+  onVideoClick = () => {
     firehoseClient.putRecord(
       {
         study: 'hint-videos',
         event: 'click',
         data_string: this.props.video.key,
       },
-      { includeUserId: true }
+      { includeUserId: true },
     );
-  },
+  };
 
   render() {
+    /* eslint-disable react/no-danger */
     return (
-      <ChatBubble borderColor={this.props.borderColor} ttsUrl={this.props.ttsUrl} ttsMessage={this.props.ttsMessage}>
-        <div
-          dangerouslySetInnerHTML={{ __html: this.props.content }}
-        />
+      <ChatBubble
+        borderColor={this.props.borderColor}
+        ttsUrl={this.props.ttsUrl}
+        ttsMessage={this.props.ttsMessage}
+      >
+        <div dangerouslySetInnerHTML={{ __html: this.props.content }} />
         {this.props.block && <ReadOnlyBlockSpace block={this.props.block} />}
         {this.props.video &&
           <VideoThumbnail
@@ -54,9 +55,9 @@ const InlineHint = React.createClass({
         }
       </ChatBubble>
     );
+    /* eslint-enable react/no-danger */
   }
-
-});
+}
 
 export const StatelessInlineHint = Radium(InlineHint);
 export default connect(state => ({

From 1a669c70f1c222d6f1d113de5be234d670ba43f6 Mon Sep 17 00:00:00 2001
From: Elijah Hamovitz <elijahhamovitz@gmail.com>
Date: Thu, 8 Mar 2018 18:14:40 -0800
Subject: [PATCH 45/56] Revert "Remove 'edit_code' serialized property"

---
 dashboard/app/helpers/levels_helper.rb        |  2 +-
 dashboard/app/models/game.rb                  |  4 ++++
 dashboard/app/models/levels/applab.rb         |  5 +----
 dashboard/app/models/levels/blockly.rb        | 20 +++++++++--------
 dashboard/app/models/levels/gamelab.rb        |  5 +----
 dashboard/app/models/levels/gamelab_jr.rb     |  5 +----
 dashboard/app/models/levels/studio_ec.rb      |  5 +----
 .../views/levels/editors/_artist.html.haml    |  2 +-
 .../views/levels/editors/_blockly.html.haml   | 22 +++++++++----------
 dashboard/test/models/blockly_test.rb         | 20 -----------------
 10 files changed, 32 insertions(+), 58 deletions(-)

diff --git a/dashboard/app/helpers/levels_helper.rb b/dashboard/app/helpers/levels_helper.rb
index 24f694044eccc..31896a5d46370 100644
--- a/dashboard/app/helpers/levels_helper.rb
+++ b/dashboard/app/helpers/levels_helper.rb
@@ -262,7 +262,7 @@ def app_options
   # Helper that renders the _apps_dependencies partial with a configuration
   # appropriate to the level being rendered.
   def render_app_dependencies
-    use_droplet = @level.uses_droplet?
+    use_droplet = app_options[:droplet]
     use_netsim = @level.game == Game.netsim
     use_applab = @level.game == Game.applab
     use_gamelab = @level.game.app == Game::GAMELAB
diff --git a/dashboard/app/models/game.rb b/dashboard/app/models/game.rb
index 30053109630d9..a64c5627cf46b 100644
--- a/dashboard/app/models/game.rb
+++ b/dashboard/app/models/game.rb
@@ -191,6 +191,10 @@ def flappy?
     app == FLAPPY
   end
 
+  def uses_droplet?
+    %w(MazeEC ArtistEC Applab StudioEC Gamelab).include? name
+  end
+
   def uses_pusher?
     app == NETSIM
   end
diff --git a/dashboard/app/models/levels/applab.rb b/dashboard/app/models/levels/applab.rb
index 6656cc9b4e781..743db98d9cc81 100644
--- a/dashboard/app/models/levels/applab.rb
+++ b/dashboard/app/models/levels/applab.rb
@@ -75,6 +75,7 @@ def self.create_from_level_builder(params, level_params)
         level_num: 'custom',
         properties: {
           code_functions: JSON.parse(palette),
+          edit_code: true
         }
       )
     )
@@ -124,10 +125,6 @@ def validate_maker_if_needed
     end
   end
 
-  def uses_droplet?
-    true
-  end
-
   def self.palette
     SharedConstants::APPLAB_BLOCKS
   end
diff --git a/dashboard/app/models/levels/blockly.rb b/dashboard/app/models/levels/blockly.rb
index a4204f69d2f85..da6875e734797 100644
--- a/dashboard/app/models/levels/blockly.rb
+++ b/dashboard/app/models/levels/blockly.rb
@@ -65,6 +65,7 @@ class Blockly < Level
     project_template_level_name
     hide_share_and_remix
     is_project_level
+    edit_code
     code_functions
     palette_category_at_start
     failure_message_override
@@ -217,11 +218,20 @@ def blockly_app_options(game, skin_id)
       app_options[:skinId] = skin_id if skin_id
 
       # Set some values that Blockly expects on the root of its options string
+
+      droplet = game.try(:uses_droplet?)
+      #TODO(ram) normalize or remove the edit_code field
+      if edit_code == "false"
+        droplet = false
+      elsif edit_code == true
+        droplet = true
+      end
+
       app_options.merge!(
         {
           baseUrl: Blockly.base_url,
           app: game.try(:app),
-          droplet: uses_droplet?,
+          droplet: droplet,
           pretty: Rails.configuration.pretty_apps ? '' : '.min',
         }
       )
@@ -285,7 +295,6 @@ def blockly_level_options
       level_prop['startDirection'] = level_prop['startDirection'].to_i if level_prop['startDirection'].present?
       level_prop['sliderSpeed'] = level_prop['sliderSpeed'].to_f if level_prop['sliderSpeed']
       level_prop['scale'] = {'stepSpeed' => level_prop['stepSpeed']} if level_prop['stepSpeed'].present?
-      level_prop['editCode'] = uses_droplet?
 
       # Blockly requires these fields to be objects not strings
       %w(map initialDirt serializedMaze goal softButtons inputOutputTable).
@@ -389,11 +398,4 @@ def fix_examples
     return if examples.nil?
     self.examples = examples.select(&:present?)
   end
-
-  # This should just return false, but we have a few levels.js levels that use
-  # droplet (starwars, and a few test levels). They all have level records of
-  # type 'Blockly', so they can't override this as needed
-  def uses_droplet?
-    %w(MazeEC ArtistEC Applab StudioEC Gamelab).include? game.name
-  end
 end
diff --git a/dashboard/app/models/levels/gamelab.rb b/dashboard/app/models/levels/gamelab.rb
index 197f053f88a7a..2735a55ccf771 100644
--- a/dashboard/app/models/levels/gamelab.rb
+++ b/dashboard/app/models/levels/gamelab.rb
@@ -67,6 +67,7 @@ def self.create_from_level_builder(params, level_params)
         properties: {
           code_functions: JSON.parse(palette),
           show_d_pad: true,
+          edit_code: true,
           show_debug_watch: true
         }
       )
@@ -89,10 +90,6 @@ def update_palette
     return false
   end
 
-  def uses_droplet?
-    true
-  end
-
   def self.palette
     SharedConstants::GAMELAB_BLOCKS
   end
diff --git a/dashboard/app/models/levels/gamelab_jr.rb b/dashboard/app/models/levels/gamelab_jr.rb
index 507bd7e33e1ff..67773d0ef82ac 100644
--- a/dashboard/app/models/levels/gamelab_jr.rb
+++ b/dashboard/app/models/levels/gamelab_jr.rb
@@ -38,6 +38,7 @@ def self.create_from_level_builder(params, level_params)
         properties: {
           code_functions: JSON.parse(palette),
           show_d_pad: true,
+          edit_code: "false",
           show_debug_watch: true,
           use_helper_lib: true,
         }
@@ -162,8 +163,4 @@ def toolbox(type)
   def xml_blocks
     %w(initialization_blocks start_blocks toolbox_blocks required_blocks recommended_blocks solution_blocks)
   end
-
-  def uses_droplet?
-    false
-  end
 end
diff --git a/dashboard/app/models/levels/studio_ec.rb b/dashboard/app/models/levels/studio_ec.rb
index 51093929d322a..58b65ae40e3f6 100644
--- a/dashboard/app/models/levels/studio_ec.rb
+++ b/dashboard/app/models/levels/studio_ec.rb
@@ -40,6 +40,7 @@ def self.create_from_level_builder(params, level_params)
         properties: {
           code_functions: JSON.parse(palette),
           goal_override: JSON.parse(goal_override),
+          edit_code: true
         }
       )
     )
@@ -87,10 +88,6 @@ def self.goal_override
       }
     JSON
   end
-
-  def uses_droplet?
-    true
-  end
 end
 
 # Another name for this class to match the capitalization conventions of the annotation gem.
diff --git a/dashboard/app/views/levels/editors/_artist.html.haml b/dashboard/app/views/levels/editors/_artist.html.haml
index e34750817867f..d9b95c7f4190c 100644
--- a/dashboard/app/views/levels/editors/_artist.html.haml
+++ b/dashboard/app/views/levels/editors/_artist.html.haml
@@ -29,7 +29,7 @@
   = link_to 'Edit Predraw Blocks', level_edit_blocks_path(@level, :predraw_blocks) unless @level.new_record?
   = f.text_area :predraw_blocks, placeholder: 'Predraw Blocks', rows: 4, value: @level.pretty_block('predraw')
   :javascript
-    levelbuilder.initializeCodeMirror('level_predraw_blocks', '#{@level.uses_droplet? ? 'javascript' : 'xml'}');
+    levelbuilder.initializeCodeMirror('level_predraw_blocks', '#{@level.game.uses_droplet? ? 'javascript' : 'xml'}');
 .field
   = f.label :images, 'Image field in JSON array format, e.g.:'
   %div
diff --git a/dashboard/app/views/levels/editors/_blockly.html.haml b/dashboard/app/views/levels/editors/_blockly.html.haml
index 5d8abddaf9a92..b2e0c7ef519c1 100644
--- a/dashboard/app/views/levels/editors/_blockly.html.haml
+++ b/dashboard/app/views/levels/editors/_blockly.html.haml
@@ -1,12 +1,12 @@
 - content_for(:head) do
-  - if @level.is_a?(Blockly) && !@level.uses_droplet?
+  - if @level.is_a?(Blockly) && !@level.game.uses_droplet?
     = javascript_include_tag 'js/blockly'
     = javascript_include_tag "js/en_us/blockly_locale"
     = javascript_include_tag "js/en_us/common_locale"
     = javascript_include_tag "js/en_us/#{@level.game.app}_locale"
 
 .field
-  = f.label :edit_code, @level.uses_droplet? ? 'Droplet JavaScript level' : 'Blockly level'
+  = f.label :edit_code, @level.game.uses_droplet? ? 'Droplet JavaScript level' : 'Blockly level'
 = render partial: 'levels/editors/ani_gif', locals: {f: f}
 .field
   = f.label :skin
@@ -78,7 +78,7 @@
     in the workspace (including hidden start blocks).
   = boolean_check_box f, :top_level_procedure_autopopulate
 
-- if @level.uses_droplet?
+- if @level.game.uses_droplet?
   .field
     = f.label :code_functions, 'Edit Droplet Palette'
     = f.text_area :code_functions, placeholder: 'Droplet Palette', rows: 4, value: @level.code_functions ? JSON.pretty_generate(@level.code_functions) : ''
@@ -91,17 +91,17 @@
       #toolbox-preview.span4
 
 .field
-  - if @level.uses_droplet?
+  - if @level.game.uses_droplet?
     = f.label :start_blocks, 'Edit Starting JavaScript Program'
   - else
     = link_to 'Edit Start Blocks', level_edit_blocks_path(@level, :start_blocks) unless @level.new_record?
   .row
     .span8
-      ~ f.text_area :start_blocks, placeholder: 'Start Blocks', rows: 4, value: @level.uses_droplet? ? @level.start_blocks : @level.pretty_block('start')
+      ~ f.text_area :start_blocks, placeholder: 'Start Blocks', rows: 4, value: @level.game.uses_droplet? ? @level.start_blocks : @level.pretty_block('start')
     #start-preview.span4
 
 .field
-  - if @level.uses_droplet?
+  - if @level.game.uses_droplet?
     = f.label :required_blocks, 'Edit Required Blocks'
   - else
     = link_to 'Edit Required Blocks', level_edit_blocks_path(@level, :required_blocks) unless @level.new_record?
@@ -111,7 +111,7 @@
     #required-preview.span4
 
 .field
-  - if @level.uses_droplet?
+  - if @level.game.uses_droplet?
     = f.label :recommended_blocks, 'Edit Recommended Blocks'
   - else
     = link_to 'Edit Recommended Blocks', level_edit_blocks_path(@level, :recommended_blocks) unless @level.new_record?
@@ -120,7 +120,7 @@
       ~ f.text_area :recommended_blocks, placeholder: 'Recommended Blocks', rows: 4, value: @level.pretty_block('recommended')
     #recommended-preview.span4
 
-- unless @level.uses_droplet?
+- unless @level.game.uses_droplet?
   .field
     = link_to 'Edit Initialization Blocks', level_edit_blocks_path(@level, :initialization_blocks) unless @level.new_record?
   .row
@@ -178,7 +178,7 @@
   = f.text_area :input_output_table, placeholder: 'Input/Output', rows: 4, value: @level.input_output_table
 -if @level.respond_to? :solution_blocks
   .field
-    - if @level.uses_droplet?
+    - if @level.game.uses_droplet?
       = f.label :solution_blocks, 'Edit Solution Blocks'
     - else
       = link_to 'Edit Solution Blocks', level_edit_blocks_path(@level, :solution_blocks) unless @level.new_record?
@@ -186,7 +186,7 @@
       .span8
         ~ f.text_area :solution_blocks, placeholder: 'Solution Blocks', rows: 4, value: @level.pretty_block('solution')
       #solution-preview.span4
--if @level.uses_droplet?
+-if @level.game.uses_droplet?
   .field
     = f.label :palette_category_at_start
     = f.select :palette_category_at_start, options_for_select(@level.class.palette_categories, @level.palette_category_at_start), {include_blank: true}
@@ -212,7 +212,7 @@
       isK1: @level.try(:isK1),
       app: @level.game.app,
       solution_blocks: @level.respond_to?(:solution_blocks),
-      uses_droplet: @level.uses_droplet?,
+      uses_droplet: @level.game.uses_droplet?,
       input_output_table: @level.respond_to?(:input_output_table),
       original_palette: JSON.parse(@level.class.try(:palette) || "{}"),
     }.to_json
diff --git a/dashboard/test/models/blockly_test.rb b/dashboard/test/models/blockly_test.rb
index f3fc1d062face..d00057782d375 100644
--- a/dashboard/test/models/blockly_test.rb
+++ b/dashboard/test/models/blockly_test.rb
@@ -221,24 +221,4 @@ def assert_equal_xml(a, b)
 
     assert_nil level.localized_authored_hints
   end
-
-  test 'uses_droplet for StudioEC levels' do
-    level = Level.new(
-      name: 'test studioEC level',
-      type: 'Blockly',
-      game: Game.studio_ec,
-    )
-
-    assert level.uses_droplet?
-  end
-
-  test 'does not use droplet for maze levels' do
-    level = Level.new(
-      name: 'test studioEC level',
-      type: 'Blockly',
-      game_id: Game.by_name('Maze'),
-    )
-
-    refute level.uses_droplet?
-  end
 end

From 648c64b7a82b2ee7a526d51f7ea9157f9a6af4a4 Mon Sep 17 00:00:00 2001
From: Ram Kandasamy <ram.kandasamy@gmail.com>
Date: Thu, 8 Mar 2018 19:52:42 -0800
Subject: [PATCH 46/56] Revert "Revert "Remove 'edit_code' serialized
 property""

---
 dashboard/app/helpers/levels_helper.rb        |  2 +-
 dashboard/app/models/game.rb                  |  4 ----
 dashboard/app/models/levels/applab.rb         |  5 ++++-
 dashboard/app/models/levels/blockly.rb        | 20 ++++++++---------
 dashboard/app/models/levels/gamelab.rb        |  5 ++++-
 dashboard/app/models/levels/gamelab_jr.rb     |  5 ++++-
 dashboard/app/models/levels/studio_ec.rb      |  5 ++++-
 .../views/levels/editors/_artist.html.haml    |  2 +-
 .../views/levels/editors/_blockly.html.haml   | 22 +++++++++----------
 dashboard/test/models/blockly_test.rb         | 20 +++++++++++++++++
 10 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/dashboard/app/helpers/levels_helper.rb b/dashboard/app/helpers/levels_helper.rb
index 31896a5d46370..24f694044eccc 100644
--- a/dashboard/app/helpers/levels_helper.rb
+++ b/dashboard/app/helpers/levels_helper.rb
@@ -262,7 +262,7 @@ def app_options
   # Helper that renders the _apps_dependencies partial with a configuration
   # appropriate to the level being rendered.
   def render_app_dependencies
-    use_droplet = app_options[:droplet]
+    use_droplet = @level.uses_droplet?
     use_netsim = @level.game == Game.netsim
     use_applab = @level.game == Game.applab
     use_gamelab = @level.game.app == Game::GAMELAB
diff --git a/dashboard/app/models/game.rb b/dashboard/app/models/game.rb
index a64c5627cf46b..30053109630d9 100644
--- a/dashboard/app/models/game.rb
+++ b/dashboard/app/models/game.rb
@@ -191,10 +191,6 @@ def flappy?
     app == FLAPPY
   end
 
-  def uses_droplet?
-    %w(MazeEC ArtistEC Applab StudioEC Gamelab).include? name
-  end
-
   def uses_pusher?
     app == NETSIM
   end
diff --git a/dashboard/app/models/levels/applab.rb b/dashboard/app/models/levels/applab.rb
index 743db98d9cc81..6656cc9b4e781 100644
--- a/dashboard/app/models/levels/applab.rb
+++ b/dashboard/app/models/levels/applab.rb
@@ -75,7 +75,6 @@ def self.create_from_level_builder(params, level_params)
         level_num: 'custom',
         properties: {
           code_functions: JSON.parse(palette),
-          edit_code: true
         }
       )
     )
@@ -125,6 +124,10 @@ def validate_maker_if_needed
     end
   end
 
+  def uses_droplet?
+    true
+  end
+
   def self.palette
     SharedConstants::APPLAB_BLOCKS
   end
diff --git a/dashboard/app/models/levels/blockly.rb b/dashboard/app/models/levels/blockly.rb
index da6875e734797..a4204f69d2f85 100644
--- a/dashboard/app/models/levels/blockly.rb
+++ b/dashboard/app/models/levels/blockly.rb
@@ -65,7 +65,6 @@ class Blockly < Level
     project_template_level_name
     hide_share_and_remix
     is_project_level
-    edit_code
     code_functions
     palette_category_at_start
     failure_message_override
@@ -218,20 +217,11 @@ def blockly_app_options(game, skin_id)
       app_options[:skinId] = skin_id if skin_id
 
       # Set some values that Blockly expects on the root of its options string
-
-      droplet = game.try(:uses_droplet?)
-      #TODO(ram) normalize or remove the edit_code field
-      if edit_code == "false"
-        droplet = false
-      elsif edit_code == true
-        droplet = true
-      end
-
       app_options.merge!(
         {
           baseUrl: Blockly.base_url,
           app: game.try(:app),
-          droplet: droplet,
+          droplet: uses_droplet?,
           pretty: Rails.configuration.pretty_apps ? '' : '.min',
         }
       )
@@ -295,6 +285,7 @@ def blockly_level_options
       level_prop['startDirection'] = level_prop['startDirection'].to_i if level_prop['startDirection'].present?
       level_prop['sliderSpeed'] = level_prop['sliderSpeed'].to_f if level_prop['sliderSpeed']
       level_prop['scale'] = {'stepSpeed' => level_prop['stepSpeed']} if level_prop['stepSpeed'].present?
+      level_prop['editCode'] = uses_droplet?
 
       # Blockly requires these fields to be objects not strings
       %w(map initialDirt serializedMaze goal softButtons inputOutputTable).
@@ -398,4 +389,11 @@ def fix_examples
     return if examples.nil?
     self.examples = examples.select(&:present?)
   end
+
+  # This should just return false, but we have a few levels.js levels that use
+  # droplet (starwars, and a few test levels). They all have level records of
+  # type 'Blockly', so they can't override this as needed
+  def uses_droplet?
+    %w(MazeEC ArtistEC Applab StudioEC Gamelab).include? game.name
+  end
 end
diff --git a/dashboard/app/models/levels/gamelab.rb b/dashboard/app/models/levels/gamelab.rb
index 2735a55ccf771..197f053f88a7a 100644
--- a/dashboard/app/models/levels/gamelab.rb
+++ b/dashboard/app/models/levels/gamelab.rb
@@ -67,7 +67,6 @@ def self.create_from_level_builder(params, level_params)
         properties: {
           code_functions: JSON.parse(palette),
           show_d_pad: true,
-          edit_code: true,
           show_debug_watch: true
         }
       )
@@ -90,6 +89,10 @@ def update_palette
     return false
   end
 
+  def uses_droplet?
+    true
+  end
+
   def self.palette
     SharedConstants::GAMELAB_BLOCKS
   end
diff --git a/dashboard/app/models/levels/gamelab_jr.rb b/dashboard/app/models/levels/gamelab_jr.rb
index 67773d0ef82ac..507bd7e33e1ff 100644
--- a/dashboard/app/models/levels/gamelab_jr.rb
+++ b/dashboard/app/models/levels/gamelab_jr.rb
@@ -38,7 +38,6 @@ def self.create_from_level_builder(params, level_params)
         properties: {
           code_functions: JSON.parse(palette),
           show_d_pad: true,
-          edit_code: "false",
           show_debug_watch: true,
           use_helper_lib: true,
         }
@@ -163,4 +162,8 @@ def toolbox(type)
   def xml_blocks
     %w(initialization_blocks start_blocks toolbox_blocks required_blocks recommended_blocks solution_blocks)
   end
+
+  def uses_droplet?
+    false
+  end
 end
diff --git a/dashboard/app/models/levels/studio_ec.rb b/dashboard/app/models/levels/studio_ec.rb
index 58b65ae40e3f6..51093929d322a 100644
--- a/dashboard/app/models/levels/studio_ec.rb
+++ b/dashboard/app/models/levels/studio_ec.rb
@@ -40,7 +40,6 @@ def self.create_from_level_builder(params, level_params)
         properties: {
           code_functions: JSON.parse(palette),
           goal_override: JSON.parse(goal_override),
-          edit_code: true
         }
       )
     )
@@ -88,6 +87,10 @@ def self.goal_override
       }
     JSON
   end
+
+  def uses_droplet?
+    true
+  end
 end
 
 # Another name for this class to match the capitalization conventions of the annotation gem.
diff --git a/dashboard/app/views/levels/editors/_artist.html.haml b/dashboard/app/views/levels/editors/_artist.html.haml
index d9b95c7f4190c..e34750817867f 100644
--- a/dashboard/app/views/levels/editors/_artist.html.haml
+++ b/dashboard/app/views/levels/editors/_artist.html.haml
@@ -29,7 +29,7 @@
   = link_to 'Edit Predraw Blocks', level_edit_blocks_path(@level, :predraw_blocks) unless @level.new_record?
   = f.text_area :predraw_blocks, placeholder: 'Predraw Blocks', rows: 4, value: @level.pretty_block('predraw')
   :javascript
-    levelbuilder.initializeCodeMirror('level_predraw_blocks', '#{@level.game.uses_droplet? ? 'javascript' : 'xml'}');
+    levelbuilder.initializeCodeMirror('level_predraw_blocks', '#{@level.uses_droplet? ? 'javascript' : 'xml'}');
 .field
   = f.label :images, 'Image field in JSON array format, e.g.:'
   %div
diff --git a/dashboard/app/views/levels/editors/_blockly.html.haml b/dashboard/app/views/levels/editors/_blockly.html.haml
index b2e0c7ef519c1..5d8abddaf9a92 100644
--- a/dashboard/app/views/levels/editors/_blockly.html.haml
+++ b/dashboard/app/views/levels/editors/_blockly.html.haml
@@ -1,12 +1,12 @@
 - content_for(:head) do
-  - if @level.is_a?(Blockly) && !@level.game.uses_droplet?
+  - if @level.is_a?(Blockly) && !@level.uses_droplet?
     = javascript_include_tag 'js/blockly'
     = javascript_include_tag "js/en_us/blockly_locale"
     = javascript_include_tag "js/en_us/common_locale"
     = javascript_include_tag "js/en_us/#{@level.game.app}_locale"
 
 .field
-  = f.label :edit_code, @level.game.uses_droplet? ? 'Droplet JavaScript level' : 'Blockly level'
+  = f.label :edit_code, @level.uses_droplet? ? 'Droplet JavaScript level' : 'Blockly level'
 = render partial: 'levels/editors/ani_gif', locals: {f: f}
 .field
   = f.label :skin
@@ -78,7 +78,7 @@
     in the workspace (including hidden start blocks).
   = boolean_check_box f, :top_level_procedure_autopopulate
 
-- if @level.game.uses_droplet?
+- if @level.uses_droplet?
   .field
     = f.label :code_functions, 'Edit Droplet Palette'
     = f.text_area :code_functions, placeholder: 'Droplet Palette', rows: 4, value: @level.code_functions ? JSON.pretty_generate(@level.code_functions) : ''
@@ -91,17 +91,17 @@
       #toolbox-preview.span4
 
 .field
-  - if @level.game.uses_droplet?
+  - if @level.uses_droplet?
     = f.label :start_blocks, 'Edit Starting JavaScript Program'
   - else
     = link_to 'Edit Start Blocks', level_edit_blocks_path(@level, :start_blocks) unless @level.new_record?
   .row
     .span8
-      ~ f.text_area :start_blocks, placeholder: 'Start Blocks', rows: 4, value: @level.game.uses_droplet? ? @level.start_blocks : @level.pretty_block('start')
+      ~ f.text_area :start_blocks, placeholder: 'Start Blocks', rows: 4, value: @level.uses_droplet? ? @level.start_blocks : @level.pretty_block('start')
     #start-preview.span4
 
 .field
-  - if @level.game.uses_droplet?
+  - if @level.uses_droplet?
     = f.label :required_blocks, 'Edit Required Blocks'
   - else
     = link_to 'Edit Required Blocks', level_edit_blocks_path(@level, :required_blocks) unless @level.new_record?
@@ -111,7 +111,7 @@
     #required-preview.span4
 
 .field
-  - if @level.game.uses_droplet?
+  - if @level.uses_droplet?
     = f.label :recommended_blocks, 'Edit Recommended Blocks'
   - else
     = link_to 'Edit Recommended Blocks', level_edit_blocks_path(@level, :recommended_blocks) unless @level.new_record?
@@ -120,7 +120,7 @@
       ~ f.text_area :recommended_blocks, placeholder: 'Recommended Blocks', rows: 4, value: @level.pretty_block('recommended')
     #recommended-preview.span4
 
-- unless @level.game.uses_droplet?
+- unless @level.uses_droplet?
   .field
     = link_to 'Edit Initialization Blocks', level_edit_blocks_path(@level, :initialization_blocks) unless @level.new_record?
   .row
@@ -178,7 +178,7 @@
   = f.text_area :input_output_table, placeholder: 'Input/Output', rows: 4, value: @level.input_output_table
 -if @level.respond_to? :solution_blocks
   .field
-    - if @level.game.uses_droplet?
+    - if @level.uses_droplet?
       = f.label :solution_blocks, 'Edit Solution Blocks'
     - else
       = link_to 'Edit Solution Blocks', level_edit_blocks_path(@level, :solution_blocks) unless @level.new_record?
@@ -186,7 +186,7 @@
       .span8
         ~ f.text_area :solution_blocks, placeholder: 'Solution Blocks', rows: 4, value: @level.pretty_block('solution')
       #solution-preview.span4
--if @level.game.uses_droplet?
+-if @level.uses_droplet?
   .field
     = f.label :palette_category_at_start
     = f.select :palette_category_at_start, options_for_select(@level.class.palette_categories, @level.palette_category_at_start), {include_blank: true}
@@ -212,7 +212,7 @@
       isK1: @level.try(:isK1),
       app: @level.game.app,
       solution_blocks: @level.respond_to?(:solution_blocks),
-      uses_droplet: @level.game.uses_droplet?,
+      uses_droplet: @level.uses_droplet?,
       input_output_table: @level.respond_to?(:input_output_table),
       original_palette: JSON.parse(@level.class.try(:palette) || "{}"),
     }.to_json
diff --git a/dashboard/test/models/blockly_test.rb b/dashboard/test/models/blockly_test.rb
index d00057782d375..f3fc1d062face 100644
--- a/dashboard/test/models/blockly_test.rb
+++ b/dashboard/test/models/blockly_test.rb
@@ -221,4 +221,24 @@ def assert_equal_xml(a, b)
 
     assert_nil level.localized_authored_hints
   end
+
+  test 'uses_droplet for StudioEC levels' do
+    level = Level.new(
+      name: 'test studioEC level',
+      type: 'Blockly',
+      game: Game.studio_ec,
+    )
+
+    assert level.uses_droplet?
+  end
+
+  test 'does not use droplet for maze levels' do
+    level = Level.new(
+      name: 'test studioEC level',
+      type: 'Blockly',
+      game_id: Game.by_name('Maze'),
+    )
+
+    refute level.uses_droplet?
+  end
 end

From 630759b0e30301db1121019a2a31687f4977493d Mon Sep 17 00:00:00 2001
From: Ram Kandasamy <ram@code.org>
Date: Thu, 8 Mar 2018 19:59:04 -0800
Subject: [PATCH 47/56] "Non-blockly" levels don't use droplet

---
 dashboard/app/models/levels/level.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dashboard/app/models/levels/level.rb b/dashboard/app/models/levels/level.rb
index 654ac4d776d09..d5e25e2c2bad2 100644
--- a/dashboard/app/models/levels/level.rb
+++ b/dashboard/app/models/levels/level.rb
@@ -482,4 +482,8 @@ def summary_for_lesson_plans
   def write_to_file?
     custom? && !is_a?(DSLDefined) && Rails.application.config.levelbuilder_mode
   end
+
+  def uses_droplet?
+    false
+  end
 end

From 561ea35f03632605985303ec53fa5bb2e1d67869 Mon Sep 17 00:00:00 2001
From: Brendan Reville <brendan@code.org>
Date: Thu, 8 Mar 2018 20:20:42 -0800
Subject: [PATCH 48/56] Homepage: remove database table for gsheet

---
 pegasus/migrations/128_drop_cdo_homepage.rb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 pegasus/migrations/128_drop_cdo_homepage.rb

diff --git a/pegasus/migrations/128_drop_cdo_homepage.rb b/pegasus/migrations/128_drop_cdo_homepage.rb
new file mode 100644
index 0000000000000..d47cc70fe8f25
--- /dev/null
+++ b/pegasus/migrations/128_drop_cdo_homepage.rb
@@ -0,0 +1,6 @@
+Sequel.migration do
+  up do
+    drop_table? :cdo_homepage
+    self[:seed_info].where(table: 'cdo_homepage').delete
+  end
+end

From a56228cd3c30750a203e6775d325cfcba3988c13 Mon Sep 17 00:00:00 2001
From: Ram Kandasamy <ram@code.org>
Date: Thu, 8 Mar 2018 20:24:43 -0800
Subject: [PATCH 49/56] Add a test for Weblab#uses_droplet?

---
 dashboard/app/models/levels/level.rb |  8 ++++----
 dashboard/test/models/level_test.rb  | 10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dashboard/app/models/levels/level.rb b/dashboard/app/models/levels/level.rb
index d5e25e2c2bad2..7f598546411eb 100644
--- a/dashboard/app/models/levels/level.rb
+++ b/dashboard/app/models/levels/level.rb
@@ -477,13 +477,13 @@ def summary_for_lesson_plans
     summary
   end
 
+  def uses_droplet?
+    false
+  end
+
   private
 
   def write_to_file?
     custom? && !is_a?(DSLDefined) && Rails.application.config.levelbuilder_mode
   end
-
-  def uses_droplet?
-    false
-  end
 end
diff --git a/dashboard/test/models/level_test.rb b/dashboard/test/models/level_test.rb
index b0453cfb0fa67..8c130cb893166 100644
--- a/dashboard/test/models/level_test.rb
+++ b/dashboard/test/models/level_test.rb
@@ -675,4 +675,14 @@ def create_maze
       level.valid?
     end
   end
+
+  test 'does not use droplet for weblab levels' do
+    level = Weblab.new(
+      name: 'test studioEC level',
+      type: 'Blockly',
+      game_id: Game.by_name('weblab'),
+    )
+
+    refute level.uses_droplet?
+  end
 end

From 1f67ea7cfe8841ebd1d4b6073d20f2308548feb5 Mon Sep 17 00:00:00 2001
From: Continuous Integration <dev@code.org>
Date: Fri, 9 Mar 2018 14:45:04 +0000
Subject: [PATCH 50/56] Update schema cache dump after schema changes.

---
 dashboard/db/schema_cache.dump | Bin 137481 -> 137481 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dashboard/db/schema_cache.dump b/dashboard/db/schema_cache.dump
index 6593016afd7aa4cfa2ebf184efec4cec108f4e4b..6fc9f27f08246f3587923f8e202d41bf0728a440 100644
GIT binary patch
delta 31
ncmeC&#L>BlV}d!$Lqn+<8?6r*Ob@VSlxvnW+%9Rz_~AJKzw8U!

delta 31
ncmeC&#L>BlV}d!0)QgwXH(DPsm|pA6DAz1$xLwka@xyZf(BBNy


From 68acb45d286096552c6558c6ca04ca565c7791ab Mon Sep 17 00:00:00 2001
From: Erin Bond <erin.bond@code.org>
Date: Fri, 9 Mar 2018 09:31:37 -0800
Subject: [PATCH 51/56] use QuickActionsCellType

---
 .../manageStudents/ManageStudentsActionsHeaderCell.jsx        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/src/templates/manageStudents/ManageStudentsActionsHeaderCell.jsx b/apps/src/templates/manageStudents/ManageStudentsActionsHeaderCell.jsx
index b9177b5b3b856..ac7c490bf4d79 100644
--- a/apps/src/templates/manageStudents/ManageStudentsActionsHeaderCell.jsx
+++ b/apps/src/templates/manageStudents/ManageStudentsActionsHeaderCell.jsx
@@ -1,5 +1,5 @@
 import React, {Component} from 'react';
-import QuickActionsCell from "../tables/QuickActionsCell";
+import QuickActionsCell, {QuickActionsCellType} from "../tables/QuickActionsCell";
 import PopUpMenu, {MenuBreak} from "@cdo/apps/lib/ui/PopUpMenu";
 import i18n from '@cdo/locale';
 
@@ -9,7 +9,7 @@ export default class ManageStudentsActionsHeaderCell extends Component {
     return (
       <div>
         <QuickActionsCell
-          type="header"
+          type={QuickActionsCellType.header}
         >
           <PopUpMenu.Item
             onClick={() => console.log('edit all was clicked!')}

From 7d2c69fcbe8651a1948c8300ea96dadc7bf638ac Mon Sep 17 00:00:00 2001
From: Erin Bond <erin.bond@code.org>
Date: Fri, 9 Mar 2018 09:47:32 -0800
Subject: [PATCH 52/56] remove beta tag and update dialog

---
 apps/i18n/common/en_us.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/i18n/common/en_us.json b/apps/i18n/common/en_us.json
index ae95f372e9a66..35d3c5d8b586e 100644
--- a/apps/i18n/common/en_us.json
+++ b/apps/i18n/common/en_us.json
@@ -426,10 +426,10 @@
   "emptyTopLevelBlock": "There are no blocks to run. You must attach a block to the {topLevelBlockName} block.",
   "enable": "Enable",
   "enableLessonExtras": "Enable Lesson Extras (CS Fundamentals Only)",
-  "enableMaker": "Enable Maker Toolkit (BETA)",
+  "enableMaker": "Enable Maker Toolkit",
   "enableMakerDialogTitle": "Enable Maker Toolkit?",
   "enableMakerDialogWarning": "Warning: Your app will NOT work unless you have an Adafruit Circuit Playground board.",
-  "enableMakerDialogDescription": "This is a new feature for the Computer Science Discoveries curriculum being piloted this year. See the setup page for more details:",
+  "enableMakerDialogDescription": "Maker Toolkit is a feature used in the Computer Science Discoveries curriculum. See the setup page for more details:",
   "enableMakerDialogSetupPageLinkText": "Maker Toolkit Setup",
   "enablePairProgramming": "Enable Pair Programming",
   "end": "end",

From 130300b5ad9ee5f4dedb9e362f66f0d9080fa0c1 Mon Sep 17 00:00:00 2001
From: Andrew Oberhardt <Andrew@Code.org>
Date: Fri, 9 Mar 2018 09:52:23 -0800
Subject: [PATCH 53/56] Remove outdated ops_data_pull cronjob

---
 bin/cron/ops_data_pull                        | 53 -------------------
 .../cdo-apps/templates/default/crontab.erb    |  1 -
 2 files changed, 54 deletions(-)
 delete mode 100755 bin/cron/ops_data_pull

diff --git a/bin/cron/ops_data_pull b/bin/cron/ops_data_pull
deleted file mode 100755
index 1a8ebfe0ed8e7..0000000000000
--- a/bin/cron/ops_data_pull
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env ruby
-
-# This script runs queries used to generate per-level completion report for PD scripts.
-# It is run daily by Cron, with the results cached in the database-backed Properties object.
-# The final report is generated in ReportsController#pd_progress.
-
-require_relative '../../dashboard/config/environment'
-require 'cdo/properties'
-include ApplicationHelper
-include UsersHelper
-include Rails.application.routes.url_helpers
-
-def get_program_type(script_name)
-  return 'CSF' if script_name.downcase.include? 'k5'
-  return 'ECS' if script_name.downcase.include? 'ecs'
-  return 'CSP' if script_name.downcase.include? 'csp'
-  # Some scripts (e.g., 'algPDMiami') abbreviate 'algebra' to 'alg'.
-  return 'CSinA' if script_name.downcase.include? 'alg'
-  return 'CSinS' if script_name.downcase.include? 'science'
-  # There are known scripts (e.g., 'equity-pd') that will receive this classification.
-  return 'Unknown'
-end
-
-SeamlessDatabasePool.use_persistent_read_connection do
-  pd_scripts = Script.all.select(&:professional_learning_course?)
-  pd_scripts.each do |script|
-    # Get all users with any activity in the script
-    users = script.users
-    headers = nil
-    data = users.map do |user|
-      row = {
-        ID: user.id,
-        'Ops First Name': user.ops_first_name,
-        'Ops Last Name': user.ops_last_name,
-        Email: user.email,
-        District: user.district.try(:name) || 'None',
-        School: user.ops_school || 'None'
-      }
-      row[:'Script Percent Complete'] = percent_complete_total(script, user).
-        to_s
-      headers ||= row.keys
-      row.values
-    end
-    program_type = get_program_type(script.name)
-    locals_options = {
-      headers: headers,
-      data: data,
-      script: {name: script.name, id: script.id, program_type: program_type},
-      time: DateTime.now
-    }
-    Properties.set("pd_progress_#{script.id}", locals_options)
-  end
-end
diff --git a/cookbooks/cdo-apps/templates/default/crontab.erb b/cookbooks/cdo-apps/templates/default/crontab.erb
index eb9db2831bca0..542afe325c65c 100644
--- a/cookbooks/cdo-apps/templates/default/crontab.erb
+++ b/cookbooks/cdo-apps/templates/default/crontab.erb
@@ -113,7 +113,6 @@
       cronjob at:'*/1 * * * *', do:deploy_dir('bin', 'cron', 'geocode_hoc_activity')
       cronjob at:'*/1 * * * *', do:deploy_dir('bin', 'cron', 'form_geos')
       cronjob at:'*/1 * * * *', do:deploy_dir('bin', 'cron', 'user_geos')
-      cronjob at:'55 8 * * *', do:deploy_dir('bin', 'cron', 'ops_data_pull')
       cronjob at:'0 9 * * 5', do:deploy_dir('bin', 'cron', 'create_rollup_tables')
     end
   end

From a244bb86d018cbe267915d1f02802dd23d060386 Mon Sep 17 00:00:00 2001
From: Continuous Integration <dev@code.org>
Date: Fri, 9 Mar 2018 19:21:58 +0000
Subject: [PATCH 54/56] Updated cookbook versions

---
 cookbooks/Berksfile.lock       | 2 +-
 cookbooks/cdo-apps/metadata.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cookbooks/Berksfile.lock b/cookbooks/Berksfile.lock
index 7418714641aeb..a376ed3adfa20 100644
--- a/cookbooks/Berksfile.lock
+++ b/cookbooks/Berksfile.lock
@@ -63,7 +63,7 @@ GRAPH
     seven_zip (>= 0.0.0)
     windows (>= 0.0.0)
   build-essential (2.1.3)
-  cdo-apps (0.2.281)
+  cdo-apps (0.2.282)
     apt (>= 0.0.0)
     build-essential (>= 0.0.0)
     cdo-cloudwatch-extra-metrics (>= 0.0.0)
diff --git a/cookbooks/cdo-apps/metadata.rb b/cookbooks/cdo-apps/metadata.rb
index d412fe40d5540..ce2fff4b05049 100644
--- a/cookbooks/cdo-apps/metadata.rb
+++ b/cookbooks/cdo-apps/metadata.rb
@@ -4,7 +4,7 @@
 license          'All rights reserved'
 description      'Installs/Configures cdo-apps'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.281'
+version          '0.2.282'
 
 depends 'apt'
 depends 'build-essential'

From 91a2ef89cdc91686f82412e63181972191f8b7fe Mon Sep 17 00:00:00 2001
From: Continuous Integration <dev@code.org>
Date: Fri, 9 Mar 2018 20:00:05 +0000
Subject: [PATCH 55/56] levelbuilder content changes (-robo-commit)

---
 .../config/scripts/csd3-1819draft.script      |   2 +-
 .../config/scripts/csd_u3_game_intro.external |   8 +-
 ...ditionals - first conditional 2-2018.level |   4 +-
 .../CSD U3 Conditionals Apple 2-2018.level    |   4 +-
 .../levels/CSD U3 abstraction jump-2018.level |  97 +++++++
 ...abstraction sidescroll template-2018.level | 111 +++++++
 .../levels/CSD U3 apple template-2018.level   |   7 +-
 .../scripts/levels/CSD U6 analog rbg 1.level  |   9 +-
 .../scripts/levels/CSD U6 getters debug.level |   9 +-
 .../levels/CSDU6 arrays select rainbow.level  |   4 +-
 ...n - Lesson 15 - Complete 3-bit color.level |  15 +-
 .../config/scripts/levels/gljr_demo_pet.level | 273 ++++++++++++++++++
 12 files changed, 518 insertions(+), 25 deletions(-)
 create mode 100644 dashboard/config/scripts/levels/CSD U3 abstraction jump-2018.level
 create mode 100644 dashboard/config/scripts/levels/CSD U3 abstraction sidescroll template-2018.level
 create mode 100644 dashboard/config/scripts/levels/gljr_demo_pet.level

diff --git a/dashboard/config/scripts/csd3-1819draft.script b/dashboard/config/scripts/csd3-1819draft.script
index 50161cc134d4c..9444ab73caf73 100644
--- a/dashboard/config/scripts/csd3-1819draft.script
+++ b/dashboard/config/scripts/csd3-1819draft.script
@@ -187,7 +187,7 @@ level 'CSD U3 abstraction rotation control', progression: 'Velocity'
 level 'CSD U3 abstraction velocityY control', progression: 'Velocity'
 level 'CSD U3 abstraction velocityX if-statements', progression: 'Velocity'
 level 'CSD U3 abstraction velocityX control', progression: 'Velocity'
-level 'CSD U3 abstraction jump', progression: 'Side Scroller'
+level 'CSD U3 abstraction jump-2018', progression: 'Side Scroller'
 level 'CSD U3 abstraction tumbleweed', progression: 'Side Scroller'
 level 'CSD U3 abstraction looping', progression: 'Side Scroller'
 named_level 'CSD U3 L15 Freeplay'
diff --git a/dashboard/config/scripts/csd_u3_game_intro.external b/dashboard/config/scripts/csd_u3_game_intro.external
index c3d5d4f036c53..182f6e445d8e4 100644
--- a/dashboard/config/scripts/csd_u3_game_intro.external
+++ b/dashboard/config/scripts/csd_u3_game_intro.external
@@ -10,13 +10,13 @@ Now that you have all the skills you need, it's time to make your own game!
 
 With a partner, brainstorm some different ideas for your game.  You can think about the games you've already seen, or look at some more sample games to give you ideas.
 
-[<img src="https://images.code.org/fc2d4cdba80a476b1ff476081991031e-image-1498594631779.png" style="width: 200px; float: left; margin: 10px;">](https://studio.code.org/projects/gamelab/-e63S2hP9AnPvsQyCfYQrg)
+[<img src="https://images.code.org/fc2d4cdba80a476b1ff476081991031e-image-1498594631779.png" style="width: 200px; float: left; margin: 10px;">](https://studio.code.org/projects/gamelab/AwDcX5nehOApfzyywI6BOLT1xbf0MIV1dUj8KjQaNtA)
 
-[<img src="https://images.code.org/b89895bdd43be4b729ca9165fc2923cf-image-1498595512898.28.24 PM.png" style="width: 200px; float: left; margin: 10px;">](https://studio.code.org/projects/gamelab/aZhgijA6KwMcN4s_cEdr7qVNQ5vvLp38o54cPL_QOCc)
+[<img src="https://images.code.org/b89895bdd43be4b729ca9165fc2923cf-image-1498595512898.28.24 PM.png" style="width: 200px; float: left; margin: 10px;">](https://studio.code.org/projects/gamelab/r9OYVTSj2od8vaCA-nKikTVpx-2Co8qHhuZiBIu30JA)
 
-[<img src="https://images.code.org/d430061caab264330da0227b53e2db90-image-1498595505047.27.59 PM.png" style="width: 200px; margin: 10px;">](https://studio.code.org/projects/gamelab/VtVgPggDmdm1GHM6bMq0OTXafufBF1WYQMkSEYJplhc)
+[<img src="https://images.code.org/d430061caab264330da0227b53e2db90-image-1498595505047.27.59 PM.png" style="width: 200px; margin: 10px;">](https://studio.code.org/projects/gamelab/hAz7RSdqc0c_MSQVUpvz1XrLDr8QLsansWDVI0ZberQ)
 
-[<img src="https://images.code.org/c9fb241c5684e10d9ba2b85d4d4a906b-image-1498764384615.25.58 PM.png" style="width: 200px; margin: 10px;">](https://studio.code.org/projects/gamelab/pbIagL-fn3ATM5nzQ_eJfPmfdEjtpMpGHt0wiclY_PE)
+[<img src="https://images.code.org/c9fb241c5684e10d9ba2b85d4d4a906b-image-1498764384615.25.58 PM.png" style="width: 200px; margin: 10px;">](https://studio.code.org/projects/gamelab/DmRPNYR3n7bMO--_KkP7r6mOoGynBVyi3BMVPWDiVeI)
 
 Once you have settled on a type of game with your partner, fill out the Project Guide with the backgrounds, variables, sprites, and functions that you will need to make the game.  You'll spend the next few levels creating your game.
 MARKDOWN
diff --git a/dashboard/config/scripts/levels/CSD U3 - conditionals - first conditional 2-2018.level b/dashboard/config/scripts/levels/CSD U3 - conditionals - first conditional 2-2018.level
index 31fc9373e06a0..fefe21278616e 100644
--- a/dashboard/config/scripts/levels/CSD U3 - conditionals - first conditional 2-2018.level	
+++ b/dashboard/config/scripts/levels/CSD U3 - conditionals - first conditional 2-2018.level	
@@ -97,12 +97,12 @@
     "hide_share_and_remix": "false",
     "disable_if_else_editing": "false",
     "expand_debugger": "false",
-    "contained_level_names": null,
     "display_name": "Visibility Challenge",
     "disable_procedure_autopopulate": "false",
     "top_level_procedure_autopopulate": "false",
     "start_blocks": "var balloon = createSprite(200, 200);\r\nballoon.setAnimation(\"balloon\");\r\nballoon.scale = 0.1;\r\n\r\nfunction draw() {\r\n  // Draw Background\r\n  background(\"white\");\r\n  \r\n  // Update Values\r\n  balloon.scale = balloon.scale + 0.001;\r\n\r\n  // Draw Animations\r\n  drawSprites();\r\n}",
-    "start_animations": "{\r\n    \"orderedKeys\": [\r\n        \"balloon\",\r\n        \"pop\"\r\n    ],\r\n    \"propsByKey\": {\r\n        \"balloon\": {\r\n            \"name\": \"balloon\",\r\n            \"sourceUrl\": \"https://curriculum.code.org/images/sprites/balloon.png\",\r\n            \"sourceSize\": {\r\n                \"x\": 444,\r\n                \"y\": 598\r\n            },\r\n            \"frameSize\": {\r\n                \"x\": 444,\r\n                \"y\": 598\r\n            },\r\n            \"frameCount\": 1,\r\n            \"frameDelay\": 2,\r\n            \"looping\": true\r\n        },\r\n        \"pop\": {\r\n            \"name\": \"pop\",\r\n            \"sourceUrl\": \"https://curriculum.code.org/images/sprites/pop.png\",\r\n            \"sourceSize\": {\r\n                \"x\": 600,\r\n                \"y\": 465\r\n            },\r\n            \"frameSize\": {\r\n                \"x\": 600,\r\n                \"y\": 465\r\n            },\r\n            \"frameCount\": 1,\r\n            \"frameDelay\": 2,\r\n            \"looping\": true\r\n        }\r\n    }\r\n}"
+    "start_animations": "{\r\n    \"orderedKeys\": [\r\n        \"balloon\",\r\n        \"pop\"\r\n    ],\r\n    \"propsByKey\": {\r\n        \"balloon\": {\r\n            \"name\": \"balloon\",\r\n            \"sourceUrl\": \"https://curriculum.code.org/images/sprites/balloon.png\",\r\n            \"sourceSize\": {\r\n                \"x\": 444,\r\n                \"y\": 598\r\n            },\r\n            \"frameSize\": {\r\n                \"x\": 444,\r\n                \"y\": 598\r\n            },\r\n            \"frameCount\": 1,\r\n            \"frameDelay\": 2,\r\n            \"looping\": true\r\n        },\r\n        \"pop\": {\r\n            \"name\": \"pop\",\r\n            \"sourceUrl\": \"https://curriculum.code.org/images/sprites/pop.png\",\r\n            \"sourceSize\": {\r\n                \"x\": 600,\r\n                \"y\": 465\r\n            },\r\n            \"frameSize\": {\r\n                \"x\": 600,\r\n                \"y\": 465\r\n            },\r\n            \"frameCount\": 1,\r\n            \"frameDelay\": 2,\r\n            \"looping\": true\r\n        }\r\n    }\r\n}",
+    "contained_level_names": null
   },
   "published": true,
   "notes": "",
diff --git a/dashboard/config/scripts/levels/CSD U3 Conditionals Apple 2-2018.level b/dashboard/config/scripts/levels/CSD U3 Conditionals Apple 2-2018.level
index e6ee2c54ffd71..024df135c4a32 100644
--- a/dashboard/config/scripts/levels/CSD U3 Conditionals Apple 2-2018.level	
+++ b/dashboard/config/scripts/levels/CSD U3 Conditionals Apple 2-2018.level	
@@ -93,8 +93,8 @@
     "watchers_prepopulated": "[\"apple.scale\"]",
     "encrypted_examples": "2eMP4R7hopbR2Q4+VjpQr+1omA2X37TWHmW0fCJYVAb6+Krl6cgghAOZqiIF\na+OqMKccfNAweFCH7QB05xWIoGS0suG69m4rpxxo47IXuoQUky/H45Jd2iQk\neZDG9pSe+JRiQ7ZM+N2gCwejxaJkeA==\n",
     "disable_procedure_autopopulate": "false",
-    "contained_level_names": null,
-    "top_level_procedure_autopopulate": "false"
+    "top_level_procedure_autopopulate": "false",
+    "contained_level_names": null
   },
   "published": true,
   "notes": "",
diff --git a/dashboard/config/scripts/levels/CSD U3 abstraction jump-2018.level b/dashboard/config/scripts/levels/CSD U3 abstraction jump-2018.level
new file mode 100644
index 0000000000000..8e095045e064e
--- /dev/null
+++ b/dashboard/config/scripts/levels/CSD U3 abstraction jump-2018.level	
@@ -0,0 +1,97 @@
+<Gamelab>
+  <config><![CDATA[{
+  "game_id": 50,
+  "created_at": "2018-03-09T17:48:50.000Z",
+  "level_num": "custom",
+  "user_id": 324,
+  "properties": {
+    "skin": "gamelab",
+    "embed": "false",
+    "is_k1": "false",
+    "skip_instructions_popup": "false",
+    "never_autoplay_video": "false",
+    "disable_param_editing": "true",
+    "disable_variable_editing": "false",
+    "use_modal_function_editor": "false",
+    "use_contract_editor": "false",
+    "contract_highlight": "false",
+    "contract_collapse": "false",
+    "examples_highlight": "false",
+    "examples_collapse": "false",
+    "examples_required": "false",
+    "definition_highlight": "false",
+    "definition_collapse": "false",
+    "disable_examples": "false",
+    "code_functions": {
+      "draw": null,
+      "drawSprites": null,
+      "comment_GameLab": null,
+      "background": null,
+      "fill": null,
+      "noFill": null,
+      "stroke": null,
+      "strokeWeight": null,
+      "noStroke": null,
+      "color": null,
+      "arc": null,
+      "ellipse": null,
+      "line": null,
+      "rect": null,
+      "comment_Drawing": null,
+      "var sprite = createSprite": null,
+      "setAnimation": null,
+      "rotationSpeed": null,
+      "velocityX": null,
+      "velocityY": null,
+      "x": null,
+      "y": null,
+      "comment_Sprites": null,
+      "ifBlock": null,
+      "ifElseBlock": null,
+      "addOperator": null,
+      "subtractOperator": null,
+      "multiplyOperator": null,
+      "divideOperator": null,
+      "equalityOperator": null,
+      "inequalityOperator": null,
+      "greaterThanOperator": null,
+      "greaterThanOrEqualOperator": null,
+      "lessThanOperator": null,
+      "lessThanOrEqualOperator": null,
+      "comment_Math": null,
+      "keyWentDown": null,
+      "keyDown": null
+    },
+    "droplet_tooltips_disabled": "false",
+    "lock_zero_param_functions": "false",
+    "free_play": "false",
+    "text_mode_at_start": "false",
+    "submittable": "false",
+    "hide_view_data_button": "false",
+    "debugger_disabled": "true",
+    "hide_animation_mode": "false",
+    "show_d_pad": "false",
+    "pause_animations_by_default": "false",
+    "callout_json": "[\r\n {\r\n  \"localization_key\": \"CSD_U3_L11_S17_C1\",\r\n  \"callout_text\": \"Look at this if statement\",\r\n  \"element_id\": \"\",\r\n  \"on\": \"code_triggered1\",\r\n  \"qtip_config\": {\r\n   \"codeStudio\": {\r\n    \"canReappear\": true,\r\n    \"dropletPaletteCategory\": \"\",\r\n     \"codeString\": \"  if (frog.y > 324) {\"\r\n   },\r\n   \"style\": {\r\n    \"classes\": \"\"\r\n   },\r\n   \"position\": {\r\n    \"my\": \"top center\",\r\n    \"at\": \"bottom left\",\r\n    \"adjust\": {\r\n     \"x\": 160,\r\n     \"y\": 10\r\n    }\r\n   }\r\n  }\r\n },\r\n {\r\n  \"localization_key\": \"CSD_U3_L11_S17_C2\",\r\n  \"callout_text\": \"Send the frog back down here\",\r\n  \"element_id\": \"\",\r\n  \"on\": \"code_triggered2\",\r\n  \"qtip_config\": {\r\n   \"codeStudio\": {\r\n    \"canReappear\": true,\r\n    \"dropletPaletteCategory\": \"\",\r\n     \"codeString\": \"// send it back down\"\r\n   },\r\n   \"style\": {\r\n    \"classes\": \"\"\r\n   },\r\n   \"position\": {\r\n    \"my\": \"top left\",\r\n    \"at\": \"bottom left\",\r\n    \"adjust\": {\r\n     \"x\": 160,\r\n     \"y\": 60\r\n    }\r\n   }\r\n  }\r\n }\r\n ]",
+    "markdown_instructions": "# Jumping\r\n\r\nYou now have all the blocks you need to make your sprite jump!  The sprite should jump up if it's on the ground and the user presses the \"up\" key, then should start moving back down when it reaches the top of its jump.\r\n\r\n# Do this\r\n\r\n* Find the `if` statement that checks whether the sprite is on the ground, and look at the `if` statement inside of it that checks whether the user has pressed the \"up\" arrow key. ( [Show me where](#triggercallout=code_triggered1) )\r\n\t* Make the frog jump up when the user presses the arrow key.\r\n\t* Make the frog stop moving otherwise.\r\n* Add code that does the following  ( [Show me where](#triggercallout=code_triggered2) )\r\n  * Checks whether the frog sprite has reached its highest point.\r\n  * If so, make the sprite go back down.",
+    "project_template_level_name": "CSD U3 abstraction sidescroll template",
+    "start_in_animation_tab": "false",
+    "all_animations_single_frame": "true",
+    "instructions_important": "false",
+    "show_debug_watch": "true",
+    "encrypted_examples": "448fFh8qX1wumgv106ftexvk0qaMa0XqpaCee07WWsGl/6JB2AijjaWUdo9y\nUSPH\n",
+    "hide_share_and_remix": "false",
+    "disable_if_else_editing": "false",
+    "expand_debugger": "false",
+    "disable_procedure_autopopulate": "false",
+    "top_level_procedure_autopopulate": "false",
+    "contained_level_names": null
+  },
+  "published": true,
+  "notes": "",
+  "audit_log": "[{\"changed_at\":\"2017-06-05 23:42:21 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"encrypted_examples\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2018-03-02 15:26:18 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"encrypted_examples\",\"contained_level_names\"],\"changed_by_id\":106,\"changed_by_email\":\"gtwrobel@gmail.com\"},{\"changed_at\":\"2018-03-02 15:26:47 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"encrypted_examples\",\"contained_level_names\"],\"changed_by_id\":106,\"changed_by_email\":\"gtwrobel@gmail.com\"},{\"changed_at\":\"2018-03-02 15:27:43 +0000\",\"changed\":[\"code_functions\",\"encrypted_examples\",\"contained_level_names\"],\"changed_by_id\":106,\"changed_by_email\":\"gtwrobel@gmail.com\"},{\"changed_at\":\"2018-03-09 17:55:40 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"encrypted_examples\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"}]",
+  "level_concept_difficulty": {
+  }
+}]]></config>
+  <blocks/>
+</Gamelab>
\ No newline at end of file
diff --git a/dashboard/config/scripts/levels/CSD U3 abstraction sidescroll template-2018.level b/dashboard/config/scripts/levels/CSD U3 abstraction sidescroll template-2018.level
new file mode 100644
index 0000000000000..2096239d770e2
--- /dev/null
+++ b/dashboard/config/scripts/levels/CSD U3 abstraction sidescroll template-2018.level	
@@ -0,0 +1,111 @@
+<Gamelab>
+  <config><![CDATA[{
+  "game_id": 50,
+  "created_at": "2018-03-09T17:50:54.000Z",
+  "level_num": "custom",
+  "user_id": 324,
+  "properties": {
+    "skin": "gamelab",
+    "embed": "false",
+    "start_blocks": "// Create the mushroom\r\nvar mushroom = createSprite(350, 335);\r\nmushroom.setAnimation(\"mushroom\");\r\n\r\n// Create the frog\r\nvar frog = createSprite(175, 325);\r\nfrog.setAnimation(\"frog\");\r\n\r\nfunction draw() {\r\n  background(\"skyblue\");\r\n  fill(\"burlywood\");\r\n  noStroke();\r\n  rect(0, 360, 400, 40);\r\n  // if frog is on ground,\r\n  if (frog.y > 324) {\r\n    // if the user presses the up arrow\r\n    if(keyWentDown(\"up\")){\r\n      //make the frog move up\r\n      \r\n    } else {\r\n      //make the frog stop moving\r\n      \r\n    }\r\n  }\r\n  // if the frog gets high enough\r\n  // send it back down\r\n\r\n\r\n  // if the mushroom has gone off the left edge,\r\n  if (mushroom.x < -30) {\r\n    // move it to the right edge\r\n    \r\n  }\r\n  drawSprites();\r\n}\r\n",
+    "is_k1": "false",
+    "skip_instructions_popup": "false",
+    "never_autoplay_video": "false",
+    "disable_param_editing": "true",
+    "disable_variable_editing": "false",
+    "use_modal_function_editor": "false",
+    "use_contract_editor": "false",
+    "contract_highlight": "false",
+    "contract_collapse": "false",
+    "examples_highlight": "false",
+    "examples_collapse": "false",
+    "examples_required": "false",
+    "definition_highlight": "false",
+    "definition_collapse": "false",
+    "disable_examples": "false",
+    "code_functions": {
+      "draw": null,
+      "drawSprites": null,
+      "comment_GameLab": null,
+      "background": null,
+      "fill": null,
+      "noFill": null,
+      "stroke": null,
+      "strokeWeight": null,
+      "noStroke": null,
+      "color": null,
+      "arc": null,
+      "ellipse": null,
+      "line": null,
+      "rect": null,
+      "text": null,
+      "textSize": null,
+      "textFont": null,
+      "comment_Drawing": null,
+      "var sprite = createSprite": null,
+      "visible": null,
+      "setAnimation": null,
+      "rotationSpeed": null,
+      "velocityX": null,
+      "velocityY": null,
+      "x": null,
+      "y": null,
+      "comment_Sprites": null,
+      "ifBlock": null,
+      "ifElseBlock": null,
+      "addOperator": null,
+      "subtractOperator": null,
+      "multiplyOperator": null,
+      "divideOperator": null,
+      "equalityOperator": null,
+      "inequalityOperator": null,
+      "greaterThanOperator": null,
+      "greaterThanOrEqualOperator": null,
+      "lessThanOperator": null,
+      "lessThanOrEqualOperator": null,
+      "comment_Math": null,
+      "playSound": null,
+      "isTouching": null,
+      "declareAssign_x": null,
+      "declareNoAssign_x": null,
+      "assign_x": null,
+      "console.log": null,
+      "comment_Variables": null,
+      "stopSound": null,
+      "keyDown": null,
+      "keyWentDown": null
+    },
+    "droplet_tooltips_disabled": "false",
+    "lock_zero_param_functions": "false",
+    "free_play": "false",
+    "text_mode_at_start": "false",
+    "submittable": "false",
+    "hide_view_data_button": "false",
+    "debugger_disabled": "true",
+    "hide_animation_mode": "false",
+    "show_d_pad": "false",
+    "pause_animations_by_default": "false",
+    "start_animations": "{\r\n  \"orderedKeys\": [\r\n    \"91f10853-18cd-4566-b11e-e0ec3a42b694\",\r\n    \"835b990e-3801-47b7-a12e-5c0979be890e\"\r\n  ],\r\n  \"propsByKey\": {\r\n    \"91f10853-18cd-4566-b11e-e0ec3a42b694\": {\r\n      \"name\": \"frog\",\r\n      \"sourceUrl\": \"https://studio.code.org/v3/animations/bxS7XEWi1VaoTNG6cCQcDA/91f10853-18cd-4566-b11e-e0ec3a42b694.png?version=RRKaOh.vyil2LwCZ9PFimdAdmbwLmbTX\",\r\n      \"frameSize\": {\r\n        \"x\": 104,\r\n        \"y\": 70\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"RRKaOh.vyil2LwCZ9PFimdAdmbwLmbTX\"\r\n    },\r\n    \"835b990e-3801-47b7-a12e-5c0979be890e\": {\r\n      \"name\": \"mushroom\",\r\n      \"sourceUrl\": \"https://studio.code.org/v3/animations/bxS7XEWi1VaoTNG6cCQcDA/835b990e-3801-47b7-a12e-5c0979be890e.png?version=Di9TFsxRE2sotd3Kh0HrTFu4SUaJFwaN\",\r\n      \"frameSize\": {\r\n        \"x\": 60,\r\n        \"y\": 63\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"Di9TFsxRE2sotd3Kh0HrTFu4SUaJFwaN\"\r\n    }\r\n  }\r\n}",
+    "callout_json": "[\r\n {\r\n  \"localization_key\": \"CSD_U3_L11_S17_C1\",\r\n  \"callout_text\": \"Set the sprite's starting position here.\",\r\n  \"element_id\": \"\",\r\n  \"on\": \"code_triggered1\",\r\n  \"qtip_config\": {\r\n   \"codeStudio\": {\r\n    \"canReappear\": true,\r\n    \"dropletPaletteCategory\": \"\",\r\n     \"codeString\": \"// Create the hay bale\"\r\n   },\r\n   \"style\": {\r\n    \"classes\": \"\"\r\n   },\r\n   \"position\": {\r\n    \"my\": \"top center\",\r\n    \"at\": \"bottom left\",\r\n    \"adjust\": {\r\n     \"x\": 160,\r\n     \"y\": 10\r\n    }\r\n   }\r\n  }\r\n },\r\n {\r\n  \"localization_key\": \"CSD_U3_L11_S17_C2\",\r\n  \"callout_text\": \"Set the hay bale's velocity here\",\r\n  \"element_id\": \"\",\r\n  \"on\": \"code_triggered2\",\r\n  \"qtip_config\": {\r\n   \"codeStudio\": {\r\n    \"canReappear\": true,\r\n    \"dropletPaletteCategory\": \"\",\r\n     \"codeString\": \"// Create the hay bale\"\r\n   },\r\n   \"style\": {\r\n    \"classes\": \"\"\r\n   },\r\n   \"position\": {\r\n    \"my\": \"top left\",\r\n    \"at\": \"bottom left\",\r\n    \"adjust\": {\r\n     \"x\": 160,\r\n     \"y\": 60\r\n    }\r\n   }\r\n  }\r\n },\r\n {\r\n  \"localization_key\": \"CSD_U3_L11_S17_C3\",\r\n  \"callout_text\": \"Add your if statement here.\",\r\n  \"element_id\": \"\",\r\n  \"on\": \"code_triggered3\",\r\n  \"qtip_config\": {\r\n   \"codeStudio\": {\r\n    \"canReappear\": true,\r\n    \"dropletPaletteCategory\": \"\",\r\n     \"codeString\": \"// move it to the right hand side of the screen\"\r\n   },\r\n   \"style\": {\r\n    \"classes\": \"\"\r\n   },\r\n   \"position\": {\r\n    \"my\": \"top left\",\r\n    \"at\": \"bottom left\",\r\n    \"adjust\": {\r\n     \"x\": 160,\r\n     \"y\": 10\r\n    }\r\n   }\r\n  }\r\n }\r\n ]",
+    "start_in_animation_tab": "false",
+    "all_animations_single_frame": "false",
+    "instructions_important": "false",
+    "show_debug_watch": "true",
+    "hide_share_and_remix": "false",
+    "disable_if_else_editing": "false",
+    "expand_debugger": "false",
+    "disable_procedure_autopopulate": "false",
+    "top_level_procedure_autopopulate": "false",
+    "contained_level_names": null,
+    "encrypted_examples": [
+
+    ]
+  },
+  "published": true,
+  "notes": "",
+  "audit_log": "[{\"changed_at\":\"2018-03-02 15:37:17 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\"],\"changed_by_id\":106,\"changed_by_email\":\"gtwrobel@gmail.com\"},{\"changed_at\":\"2018-03-09 17:55:46 +0000\",\"changed\":[\"start_blocks\",\"code_functions\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2018-03-09 18:12:32 +0000\",\"changed\":[\"start_blocks\",\"code_functions\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2018-03-09 18:13:14 +0000\",\"changed\":[\"start_blocks\",\"code_functions\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2018-03-09 18:13:54 +0000\",\"changed\":[\"start_blocks\",\"code_functions\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"}]",
+  "level_concept_difficulty": {
+  }
+}]]></config>
+  <blocks/>
+</Gamelab>
\ No newline at end of file
diff --git a/dashboard/config/scripts/levels/CSD U3 apple template-2018.level b/dashboard/config/scripts/levels/CSD U3 apple template-2018.level
index 4565b41a6f814..0128845ab6fd9 100644
--- a/dashboard/config/scripts/levels/CSD U3 apple template-2018.level	
+++ b/dashboard/config/scripts/levels/CSD U3 apple template-2018.level	
@@ -43,12 +43,9 @@
     "start_in_animation_tab": "false",
     "all_animations_single_frame": "true",
     "pause_animations_by_default": "false",
-    "contained_level_names": null,
-    "encrypted_examples": [
-
-    ],
     "disable_procedure_autopopulate": "false",
-    "top_level_procedure_autopopulate": "false"
+    "top_level_procedure_autopopulate": "false",
+    "contained_level_names": null
   },
   "published": true,
   "notes": "",
diff --git a/dashboard/config/scripts/levels/CSD U6 analog rbg 1.level b/dashboard/config/scripts/levels/CSD U6 analog rbg 1.level
index 5852537e749ef..f0bdd45620d51 100644
--- a/dashboard/config/scripts/levels/CSD U6 analog rbg 1.level	
+++ b/dashboard/config/scripts/levels/CSD U6 analog rbg 1.level	
@@ -180,7 +180,7 @@
     },
     "edit_code": true,
     "embed": "false",
-    "markdown_instructions": "# Displaying Sensor Readings in Color\r\n\r\nIn the earlier prediction level you saw how the `setScale()` method can convert the full range of sensor readings (0-1023) into a range that can be used for RGB values (0-255). Let's build on that idea to make an app that can communcate the current value of all three analog sensors with a single color.\r\n\r\n# Do This\r\n\r\nTo start, we just need to set the sensor scales correctly - don't worry about actually setting the color of the background yet.\r\n\r\n* Using the `sensor.setScale()` block, set each of light and sound sensors to the right scale for an RGB color channel.\r\n* Create a variable for each of the three colors and assign each one to the value of a different sensor.\r\n* Use `console.log()` to test that your variables are in the correct range.\r\n\r\n_Hint: Order matters. You need to set the scale of a sensor before checking it's value_\r\n_Hint: Remember that the temperature sensor can be read in both Celsius and Fahrenheit - either way it should already give you a value that's within the necessary range for RGB_",
+    "markdown_instructions": "# Displaying Sensor Readings in Color\r\n\r\nIn the earlier prediction level you saw how the `setScale()` method can convert the full range of sensor readings (0-1023) into a range that can be used for RGB values (0-255). Let's build on that idea to make an app that can communicate the current value of all three analog sensors with a single color.\r\n\r\n# Do This\r\n\r\nTo start, we just need to set the sensor scales correctly - don't worry about actually setting the color of the background yet.\r\n\r\n* Using the `sensor.setScale()` block, set each of light and sound sensors to the right scale for an RGB color channel.\r\n* Create a variable for each of the three colors and assign each one to the value of a different sensor.\r\n* Use `console.log()` to test that your variables are in the correct range.\r\n\r\n_Hint: Order matters. You need to set the scale of a sensor before checking it's value_\r\n_Hint: Remember that the temperature sensor can be read in both Celsius and Fahrenheit - either way it should already give you a value that's within the necessary range for RGB_",
     "instructions_important": "false",
     "is_k1": "false",
     "skip_instructions_popup": "false",
@@ -219,11 +219,14 @@
     "project_template_level_name": "CSD U6 analog data template",
     "disable_procedure_autopopulate": "false",
     "top_level_procedure_autopopulate": "false",
-    "contained_level_names": null
+    "contained_level_names": null,
+    "encrypted_examples": [
+
+    ]
   },
   "published": true,
   "notes": "",
-  "audit_log": "[{\"changed_at\":\"2017-10-20 22:57:33 +0000\",\"changed\":[\"code_functions\",\"project_template_level_name\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-20 23:06:58 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-11-27 18:59:50 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2018-01-09 20:51:46 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"}]",
+  "audit_log": "[{\"changed_at\":\"2017-10-20 22:57:33 +0000\",\"changed\":[\"code_functions\",\"project_template_level_name\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-20 23:06:58 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-11-27 18:59:50 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2018-01-09 20:51:46 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2018-03-09 16:51:04 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"}]",
   "level_concept_difficulty": {
   }
 }]]></config>
diff --git a/dashboard/config/scripts/levels/CSD U6 getters debug.level b/dashboard/config/scripts/levels/CSD U6 getters debug.level
index ba54c40674944..f02971e624c2c 100644
--- a/dashboard/config/scripts/levels/CSD U6 getters debug.level	
+++ b/dashboard/config/scripts/levels/CSD U6 getters debug.level	
@@ -56,7 +56,7 @@
     "autocomplete_palette_apis_only": "false",
     "execute_palette_apis_only": "false",
     "design_mode_at_start": "false",
-    "hide_design_mode": "true",
+    "hide_design_mode": "false",
     "beginner_mode": "false",
     "start_html": "<div id=\"designModeViz\" class=\"appModern withCrosshair clip-content\" data-radium=\"true\" style=\"width: 320px; height: 450px;\"><div class=\"screen\" tabindex=\"1\" id=\"screen1\" style=\"display: block; height: 451px; width: 320px; left: 0px; top: 0px; position: absolute; z-index: 0;\">\r\n  \r\n  <label style=\"margin: 0px; padding: 2px; line-height: 1; font-size: 22px; overflow: hidden; word-wrap: break-word; color: rgb(51, 51, 51); max-width: 320px; width: 149px; height: 26px; position: absolute; left: 75px; top: 20px;\" id=\"label1\">LED Controls</label>\r\n  \r\n  <select id=\"LEDtype\" style=\"width: 200px; height: 30px; font-size: 14px; margin: 0px; color: rgb(255, 255, 255); background-color: rgb(26, 188, 156); position: absolute; left: 60px; top: 65px;\"><option>constant</option><option>blink</option><option>pulse</option></select>\r\n  \r\n  <input type=\"range\" value=\"50\" min=\"0\" max=\"100\" step=\"1\" id=\"LEDspeed\" style=\"margin: 0px; padding: 0px; width: 150px; height: 24px; position: absolute; left: 80px; top: 105px;\" />\r\n  \r\n  <label style=\"margin: 0px; padding: 2px; line-height: 1; font-size: 14px; overflow: hidden; word-wrap: break-word; color: rgb(51, 51, 51); max-width: 320px; width: 36px; height: 18px; position: absolute; left: 30px; top: 110px;\" id=\"label_slow\">slow</label>\r\n  \r\n  <label style=\"margin: 0px; padding: 2px; line-height: 1; font-size: 14px; overflow: hidden; word-wrap: break-word; color: rgb(51, 51, 51); max-width: 320px; width: 30px; height: 18px; position: absolute; left: 265px; top: 110px;\" id=\"label_fast\">fast</label>\r\n  \r\n  <label style=\"margin: 0px; padding: 2px; line-height: 1; font-size: 22px; overflow: hidden; word-wrap: break-word; color: rgb(51, 51, 51); max-width: 320px; width: 180px; height: 26px; position: absolute; left: 65px; top: 235px;\" id=\"buzzer_label\">Buzzer Controls</label>\r\n  \r\n  <input type=\"range\" value=\"50\" min=\"0\" max=\"100\" step=\"1\" id=\"duration\" style=\"margin: 0px; padding: 0px; width: 150px; height: 24px; position: absolute; left: 80px; top: 295px;\" />\r\n  \r\n  <input type=\"range\" value=\"50\" min=\"0\" max=\"100\" step=\"1\" id=\"frequency\" style=\"margin: 0px; padding: 0px; width: 150px; height: 24px; position: absolute; left: 80px; top: 330px;\" />\r\n  \r\n  <label style=\"margin: 0px; padding: 2px; line-height: 1; font-size: 18px; overflow: hidden; word-wrap: break-word; color: rgb(51, 51, 51); max-width: 320px; width: 220px; height: 45px; position: absolute; left: 55px; top: 375px;\" id=\"instructions1\">Press board buttons to turn buzzer on and off. </label>\r\n  \r\n  <label style=\"margin: 0px; padding: 2px; line-height: 1; font-size: 18px; overflow: hidden; word-wrap: break-word; color: rgb(51, 51, 51); max-width: 320px; width: 230px; height: 50px; position: absolute; left: 45px; top: 150px;\" id=\"instructions2\">&nbsp;Use the toggle switch to turn the LED on and off.</label>\r\n  \r\n  <label style=\"margin: 0px; padding: 2px; line-height: 1; font-size: 14px; overflow: hidden; word-wrap: break-word; color: rgb(51, 51, 51); max-width: 320px; width: 41px; height: 18px; position: absolute; left: 25px; top: 300px;\" id=\"short\">short</label>\r\n  \r\n  <label style=\"margin: 0px; padding: 2px; line-height: 1; font-size: 14px; overflow: hidden; word-wrap: break-word; color: rgb(51, 51, 51); max-width: 320px; width: 36px; height: 18px; position: absolute; left: 255px; top: 300px;\" id=\"long\">long</label>\r\n  \r\n  <label style=\"margin: 0px; padding: 2px; line-height: 1; font-size: 14px; overflow: hidden; word-wrap: break-word; color: rgb(51, 51, 51); max-width: 320px; width: 29px; height: 18px; position: absolute; left: 35px; top: 335px;\" id=\"low\">low</label>\r\n  \r\n  <label style=\"margin: 0px; padding: 2px; line-height: 1; font-size: 14px; overflow: hidden; word-wrap: break-word; color: rgb(51, 51, 51); max-width: 320px; width: 40px; height: 20px; position: absolute; left: 255px; top: 335px;\" id=\"high\">high</label>\r\n  \r\n  </div></div>",
     "hide_view_data_button": "true",
@@ -67,11 +67,14 @@
     "makerlab_enabled": "true",
     "start_blocks": "// check for changes in LED controls\r\nonBoardEvent(toggleSwitch, \"change\", function(event) {\r\n  updateLED();\r\n});\r\nonEvent(LEDtype, \"change\", function(event) {\r\n  updateLED();\r\n});\r\nonEvent(LEDspeed, \"change\", function(event) {\r\n  updateLED();\r\n});\r\n\r\n// check for changes in buzzer controls\r\nonBoardEvent(buttonL, \"press\", function(event) {\r\n  playBuzzer();\r\n});\r\nonBoardEvent(buttonR, \"press\", function(event) {\r\n  buzzer.off();\r\n});\r\nonBoardEvent(\"duration\", \"change\", function(event) {\r\n  playBuzzer();\r\n});\r\nonEvent(\"buzzerFrequency\", \"change\", function(event) {\r\n  playBuzzer();\r\n});\r\n\r\n// update LED according to controls\r\nfunction updateLED() {\r\n  if (toggleSwitch.isOpen()) {\r\n    var LEDtype = getProperty(\"LEDtype\", \"value\");\r\n    var LEDinterval = getProperty(\"LEDspeed\", \"value\");\r\n    if (LEDtype == \"constant\") {\r\n      LED.on();\r\n    }\r\n    if (LEDtype == \"blink\") {\r\n      led.blink(LEDinterval);\r\n    }\r\n    if (LEDtype == \"pulse\") {\r\n      led.pulse(LEDinterval);\r\n    }\r\n  } else {\r\n    led.off();\r\n  }\r\n}\r\n\r\n// play buzzer according to controls\r\nfunction playBuzzer() {\r\n  var frequency = getProperty(\"frequency\", \"value\");\r\n  var duration = getProperty(\"duration\", \"value\");\r\n  buzzer.frequency(frequency, duration);\r\n}",
     "top_level_procedure_autopopulate": "false",
-    "contained_level_names": null
+    "contained_level_names": null,
+    "encrypted_examples": [
+
+    ]
   },
   "published": true,
   "notes": "",
-  "audit_log": "[{\"changed_at\":\"2017-10-17 19:16:50 +0000\",\"changed\":[\"notes\",\"code_functions\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-17 21:39:27 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\",\"encrypted_examples\",\"start_blocks\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-17 21:40:16 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-17 22:05:22 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"start_blocks\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-17 22:11:55 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-17 23:00:45 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"start_blocks\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-26 19:00:53 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"start_blocks\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-27 18:09:56 +0000\",\"changed\":[\"code_functions\",\"start_html\",\"makerlab_enabled\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-27 18:14:31 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-27 18:19:22 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"start_html\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-27 18:20:10 +0000\",\"changed\":[\"code_functions\",\"start_html\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-27 18:29:15 +0000\",\"changed\":[\"code_functions\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-29 19:48:53 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-29 20:01:10 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-29 22:01:56 +0000\",\"changed\":[\"code_functions\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-29 23:56:54 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"start_blocks\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-29 23:59:48 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 00:01:34 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 00:23:36 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 03:08:47 +0000\",\"changed\":[\"code_functions\",\"start_html\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 03:21:09 +0000\",\"changed\":[\"code_functions\",\"hide_design_mode\",\"start_html\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 03:23:45 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"start_html\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 03:25:34 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"start_html\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 20:45:50 +0000\",\"changed\":[\"name\",\"code_functions\",\"start_blocks\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 20:52:11 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 20:55:43 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"hide_design_mode\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-31 22:06:03 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-11-02 19:21:08 +0000\",\"changed\":[\"code_functions\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-11-17 22:42:43 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-11-18 01:30:20 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-11-18 01:30:59 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2018-02-14 21:01:53 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2018-02-19 22:29:59 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2018-02-19 22:32:35 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"}]",
+  "audit_log": "[{\"changed_at\":\"2017-10-17 19:16:50 +0000\",\"changed\":[\"notes\",\"code_functions\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-17 21:39:27 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\",\"encrypted_examples\",\"start_blocks\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-17 21:40:16 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-17 22:05:22 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"start_blocks\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-17 22:11:55 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-17 23:00:45 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"start_blocks\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2017-10-26 19:00:53 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"start_blocks\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-27 18:09:56 +0000\",\"changed\":[\"code_functions\",\"start_html\",\"makerlab_enabled\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-27 18:14:31 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-27 18:19:22 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"start_html\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-27 18:20:10 +0000\",\"changed\":[\"code_functions\",\"start_html\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-27 18:29:15 +0000\",\"changed\":[\"code_functions\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-29 19:48:53 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-29 20:01:10 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-29 22:01:56 +0000\",\"changed\":[\"code_functions\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-29 23:56:54 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"start_blocks\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-29 23:59:48 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 00:01:34 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 00:23:36 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 03:08:47 +0000\",\"changed\":[\"code_functions\",\"start_html\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 03:21:09 +0000\",\"changed\":[\"code_functions\",\"hide_design_mode\",\"start_html\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 03:23:45 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"start_html\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 03:25:34 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"start_html\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 20:45:50 +0000\",\"changed\":[\"name\",\"code_functions\",\"start_blocks\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 20:52:11 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-30 20:55:43 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"hide_design_mode\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-10-31 22:06:03 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-11-02 19:21:08 +0000\",\"changed\":[\"code_functions\",\"start_html\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-11-17 22:42:43 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-11-18 01:30:20 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2017-11-18 01:30:59 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2018-02-14 21:01:53 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2018-02-19 22:29:59 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2018-02-19 22:32:35 +0000\",\"changed\":[\"code_functions\",\"start_blocks\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"},{\"changed_at\":\"2018-03-09 17:27:46 +0000\",\"changed\":[\"code_functions\",\"hide_design_mode\",\"contained_level_names\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"}]",
   "level_concept_difficulty": {
   }
 }]]></config>
diff --git a/dashboard/config/scripts/levels/CSDU6 arrays select rainbow.level b/dashboard/config/scripts/levels/CSDU6 arrays select rainbow.level
index 6a239651ca9d1..a4e85a4d8118e 100644
--- a/dashboard/config/scripts/levels/CSDU6 arrays select rainbow.level	
+++ b/dashboard/config/scripts/levels/CSDU6 arrays select rainbow.level	
@@ -91,8 +91,8 @@
     "disable_procedure_autopopulate": "false",
     "top_level_procedure_autopopulate": "false",
     "expand_debugger": "false",
-    "contained_level_names": null,
-    "video_key": "csd_applab_arrays"
+    "video_key": "csd_applab_arrays",
+    "contained_level_names": null
   },
   "published": true,
   "notes": "",
diff --git a/dashboard/config/scripts/levels/Pixelation - Lesson 15 - Complete 3-bit color.level b/dashboard/config/scripts/levels/Pixelation - Lesson 15 - Complete 3-bit color.level
index 6f026ee2aa509..1fed93437f3d8 100644
--- a/dashboard/config/scripts/levels/Pixelation - Lesson 15 - Complete 3-bit color.level	
+++ b/dashboard/config/scripts/levels/Pixelation - Lesson 15 - Complete 3-bit color.level	
@@ -6,12 +6,21 @@
   "user_id": 0,
   "properties": {
     "instructions": "We start you with the 4x2 image Maddie was creating, but we've left out the last two squares. Finish off the image by figuring out which two colors are missing and encode them.",
-    "markdown_instructions": "# Color Pixelation: Task 1\n**Directions:**\n\n* We start you with the 4x2 image Maddie was creating, but we've left out the last two squares. \n* Finish off the image by figuring out which two colors are missing and encode them.\n",
+    "markdown_instructions": "# Color Pixelation: Task 1\r\n**Directions:**\r\n\r\n* We start you with the 4x2 image Maddie was creating, but we've left out the last two squares. \r\n* Finish off the image by figuring out which two colors are missing and encode them.\r\n",
     "version": "3",
-    "data": "000001000000001000000011000111100010001110",
+    "data": "000001000000001000000011000111100010001101",
     "href": "pixelation/pixelation.html",
     "video_key": "csp_pixelation_color_1",
-    "skip_dialog": true
+    "skip_dialog": true,
+    "instructions_important": "false",
+    "hex": "false",
+    "hide_encoding_controls": "false",
+    "v1_hide_sliders": "false"
+  },
+  "published": true,
+  "notes": "",
+  "audit_log": "[{\"changed_at\":\"2018-03-09 00:42:08 +0000\",\"changed\":[\"notes\",\"published\",\"markdown_instructions\",\"data\"],\"changed_by_id\":106,\"changed_by_email\":\"gtwrobel@gmail.com\"}]",
+  "level_concept_difficulty": {
   }
 }]]></config>
 </Pixelation>
diff --git a/dashboard/config/scripts/levels/gljr_demo_pet.level b/dashboard/config/scripts/levels/gljr_demo_pet.level
new file mode 100644
index 0000000000000..df62a4bbc3ad5
--- /dev/null
+++ b/dashboard/config/scripts/levels/gljr_demo_pet.level
@@ -0,0 +1,273 @@
+<GamelabJr>
+  <config><![CDATA[{
+  "game_id": 50,
+  "created_at": "2018-03-09T19:31:19.000Z",
+  "level_num": "custom",
+  "user_id": 9,
+  "properties": {
+    "skin": "gamelab",
+    "code_functions": {
+    },
+    "show_d_pad": "true",
+    "show_debug_watch": "true",
+    "embed": "false",
+    "instructions_important": "false",
+    "submittable": "false",
+    "is_k1": "false",
+    "is_project_level": true,
+    "skip_instructions_popup": "false",
+    "never_autoplay_video": "false",
+    "disable_param_editing": "true",
+    "disable_variable_editing": "false",
+    "disable_procedure_autopopulate": "false",
+    "top_level_procedure_autopopulate": "false",
+    "use_modal_function_editor": "false",
+    "use_contract_editor": "false",
+    "contract_highlight": "false",
+    "contract_collapse": "false",
+    "examples_highlight": "false",
+    "examples_collapse": "false",
+    "examples_required": "false",
+    "definition_highlight": "false",
+    "definition_collapse": "false",
+    "disable_examples": "false",
+    "hide_share_and_remix": "false",
+    "disable_if_else_editing": "false",
+    "free_play": "false",
+    "hide_animation_mode": "false",
+    "start_in_animation_tab": "false",
+    "all_animations_single_frame": "false",
+    "hide_view_data_button": "false",
+    "expand_debugger": "false",
+    "debugger_disabled": "false",
+    "pause_animations_by_default": "false",
+    "edit_code": "false",
+    "helper_libraries": [
+      "GameLabJr"
+    ],
+    "droplet_tooltips_disabled": "false",
+    "lock_zero_param_functions": "false",
+    "start_animations": "{\r\n  \"orderedKeys\": [\r\n    \"d19383c3-9b64-482d-811d-07f8997533ea\",\r\n    \"62c23e14-37e1-4b40-9dc8-68553ff35ff9\"\r\n  ],\r\n  \"propsByKey\": {\r\n    \"d19383c3-9b64-482d-811d-07f8997533ea\": {\r\n      \"name\": \"dog\",\r\n      \"sourceUrl\": \"https://studio.code.org/v3/animations/fyCTcQ6s52URiFmswI6n_lmlYnv7ggPYH0oASid6kRA/d19383c3-9b64-482d-811d-07f8997533ea.png?version=v.GmQEfbU1j.B.l4vI46thaJVPawniCF\",\r\n      \"frameSize\": {\r\n        \"x\": 100,\r\n        \"y\": 87\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"v.GmQEfbU1j.B.l4vI46thaJVPawniCF\"\r\n    },\r\n    \"62c23e14-37e1-4b40-9dc8-68553ff35ff9\": {\r\n      \"name\": \"cat\",\r\n      \"sourceUrl\": \"https://studio.code.org/v3/animations/fyCTcQ6s52URiFmswI6n_lmlYnv7ggPYH0oASid6kRA/62c23e14-37e1-4b40-9dc8-68553ff35ff9.png?version=t7yJ2eX2s4X..cVkKdwWebbWGC.YvO5k\",\r\n      \"frameSize\": {\r\n        \"x\": 64,\r\n        \"y\": 100\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"t7yJ2eX2s4X..cVkKdwWebbWGC.YvO5k\"\r\n    }\r\n  }\r\n}",
+    "contained_level_names": null,
+    "encrypted_examples": [
+
+    ]
+  },
+  "published": true,
+  "notes": "",
+  "audit_log": "[{\"changed_at\":\"2018-02-21 19:18:17 +0000\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":255,\"changed_by_email\":\"ram@code.org\"},{\"changed_at\":\"2018-02-23 01:34:36 +0000\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":255,\"changed_by_email\":\"ram@code.org\"},{\"changed_at\":\"2018-02-23 01:34:52 +0000\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":255,\"changed_by_email\":\"ram@code.org\"},{\"changed_at\":\"2018-03-09 19:56:50 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\"],\"changed_by_id\":53,\"changed_by_email\":\"test5@code.org\"}]",
+  "level_concept_difficulty": {
+  }
+}]]></config>
+  <blocks>
+    <toolbox_blocks>
+      <xml>
+        <category name="Start">
+          <block type="when_run"/>
+        </category>
+        <category name="World">
+          <block type="gamelab_setBackground" inline="true">
+            <value name="COLOR">
+              <block type="colour_picker">
+                <title name="COLOUR">#ff0000</title>
+              </block>
+            </value>
+          </block>
+        </category>
+        <category name="Sprites">
+          <block type="variables_set" inline="false">
+            <title name="VAR">sprite</title>
+            <value name="VALUE">
+              <block type="gamelab_makeNewSprite" inline="true">
+                <title name="ANIMATION">"dog"</title>
+                <value name="X">
+                  <block type="math_number">
+                    <title name="NUM">100</title>
+                  </block>
+                </value>
+                <value name="Y">
+                  <block type="math_number">
+                    <title name="NUM">100</title>
+                  </block>
+                </value>
+              </block>
+            </value>
+          </block>
+          <block type="gamelab_moveUp" inline="true">
+            <value name="THIS">
+              <block type="variables_get">
+                <title name="VAR">sprite</title>
+              </block>
+            </value>
+          </block>
+          <block type="gamelab_moveDown" inline="true">
+            <value name="THIS">
+              <block type="variables_get">
+                <title name="VAR">sprite</title>
+              </block>
+            </value>
+          </block>
+          <block type="gamelab_moveLeft" inline="true">
+            <value name="THIS">
+              <block type="variables_get">
+                <title name="VAR">sprite</title>
+              </block>
+            </value>
+          </block>
+          <block type="gamelab_moveRight" inline="true">
+            <value name="THIS">
+              <block type="variables_get">
+                <title name="VAR">sprite</title>
+              </block>
+            </value>
+          </block>
+          <block type="gamelab_setPosition" inline="true">
+            <title name="POSITION">"top left"</title>
+          </block>
+          <block type="gamelab_displace" inline="true">
+            <value name="THIS">
+              <block type="variables_get">
+                <title name="VAR">sprite</title>
+              </block>
+            </value>
+            <value name="SPRITE">
+              <block type="variables_get">
+                <title name="VAR">other</title>
+              </block>
+            </value>
+          </block>
+          <block type="gamelab_destroy" inline="true">
+            <value name="THIS">
+              <block type="variables_get">
+                <title name="VAR">sprite</title>
+              </block>
+            </value>
+          </block>
+        </category>
+        <category name="Groups">
+          <block type="variables_set" inline="false">
+            <title name="VAR">group</title>
+            <value name="VALUE">
+              <block type="gamelab_makeNewGroup"/>
+            </value>
+          </block>
+          <block type="gamelab_add" inline="true">
+            <value name="SPRITE">
+              <block type="variables_get">
+                <title name="VAR">sprite</title>
+              </block>
+            </value>
+            <value name="THIS">
+              <block type="variables_get">
+                <title name="VAR">group</title>
+              </block>
+            </value>
+          </block>
+          <block type="gamelab_groupLength" inline="true"/>
+        </category>
+        <category name="Events">
+          <block type="gamelab_whenUpArrow"/>
+          <block type="gamelab_whenDownArrow"/>
+          <block type="gamelab_whenLeftArrow"/>
+          <block type="gamelab_whenRightArrow"/>
+          <block type="gamelab_whileUpArrow"/>
+          <block type="gamelab_whileDownArrow"/>
+          <block type="gamelab_whileLeftArrow"/>
+          <block type="gamelab_whileRightArrow"/>
+          <block type="gamelab_whenTouching" inline="true">
+            <value name="SPRITE1">
+              <block type="variables_get">
+                <title name="VAR">sprite</title>
+              </block>
+            </value>
+            <value name="SPRITE2">
+              <block type="variables_get">
+                <title name="VAR">other</title>
+              </block>
+            </value>
+          </block>
+          <block type="gamelab_firstTouched"/>
+          <block type="gamelab_secondTouched"/>
+          <block type="gamelab_clickedOn" inline="true"/>
+        </category>
+        <category name="Variables" custom="VARIABLE"/>
+        <category name="Loops">
+          <block type="controls_repeat_ext" inline="true">
+            <value name="TIMES">
+              <block type="math_number">
+                <title name="NUM">10</title>
+              </block>
+            </value>
+          </block>
+          <block type="controls_whileUntil" inline="false">
+            <title name="MODE">WHILE</title>
+          </block>
+          <block type="controls_for" inline="true">
+            <title name="VAR">i</title>
+            <value name="FROM">
+              <block type="math_number">
+                <title name="NUM">1</title>
+              </block>
+            </value>
+            <value name="TO">
+              <block type="math_number">
+                <title name="NUM">10</title>
+              </block>
+            </value>
+            <value name="BY">
+              <block type="math_number">
+                <title name="NUM">1</title>
+              </block>
+            </value>
+          </block>
+        </category>
+        <category name="Math">
+          <block type="math_random_int" inline="true">
+            <value name="FROM">
+              <block type="math_number">
+                <title name="NUM">1</title>
+              </block>
+            </value>
+            <value name="TO">
+              <block type="math_number">
+                <title name="NUM">100</title>
+              </block>
+            </value>
+          </block>
+          <block type="math_number">
+            <title name="NUM">0</title>
+          </block>
+          <block type="math_arithmetic" inline="true">
+            <title name="OP">ADD</title>
+            <value name="A">
+              <block type="math_number">
+                <title name="NUM">0</title>
+              </block>
+            </value>
+            <value name="B">
+              <block type="math_number">
+                <title name="NUM">0</title>
+              </block>
+            </value>
+          </block>
+        </category>
+        <category name="Logic">
+          <block type="controls_if" inline="false"/>
+          <block type="logic_compare" inline="true">
+            <title name="OP">EQ</title>
+          </block>
+          <block type="logic_operation" inline="true">
+            <title name="OP">AND</title>
+          </block>
+          <block type="logic_negate" inline="false"/>
+          <block type="logic_boolean">
+            <title name="BOOL">TRUE</title>
+          </block>
+        </category>
+        <category name="Text">
+          <block type="text_join_simple" inputcount="2"/>
+        </category>
+      </xml>
+    </toolbox_blocks>
+  </blocks>
+</GamelabJr>
\ No newline at end of file

From e8248adc06c3e63bc40eb1a62343605ecee1b7b5 Mon Sep 17 00:00:00 2001
From: Continuous Integration <dev@code.org>
Date: Fri, 9 Mar 2018 20:00:11 +0000
Subject: [PATCH 56/56] staging content changes (-robo-commit)

---
 .../CSF_skinOverview_Harvester.jpg            |   3 +
 pegasus/data/cdo-cs-statistics.csv            |   2 +-
 pegasus/data/cdo-state-promote.csv            |   4 +-
 .../public/advocacy/state-facts/AK.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/AL.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/AR.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/AZ.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/CA.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/CO.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/CT.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/DC.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/DE.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/FL.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/GA.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/HI.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/IA.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/ID.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/IL.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/IN.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/KS.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/KY.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/LA.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/MA.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/MD.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/ME.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/MI.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/MN.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/MO.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/MS.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/MT.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/NC.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/ND.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/NE.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/NH.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/NJ.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/NM.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/NV.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/NY.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/OH.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/OK.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/OR.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/PA.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/RI.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/SC.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/SD.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/TN.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/TX.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/UT.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/VA.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/VT.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/WA.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/WI.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/WV.pdf.fetch  |   2 +-
 .../public/advocacy/state-facts/WY.pdf.fetch  |   2 +-
 .../docs/k-5/flashCardsOld.pdf.fetch          |   1 +
 .../public/educate/csp/hall-of-fame.md        |   3 +-
 .../files/computer_science_advocacy.pptx      |   4 +-
 .../cs-stats/Slide_States_Standards.png       |   4 +-
 .../cs-stats/Slide_States_Standards.png       |   4 +-
 .../k-5/CourseD_Textbookpages (1).md}         |   0
 .../k-5/CourseD_Textbookpages.md              | 267 ++++++++++++++++++
 .../k-5}/CourseE_Textbookpages.md             |   0
 .../k-5}/CourseF_Textbookpages.md             |   0
 .../k-5}/CoursesAB_Textbookpages.md           |   0
 .../curriculum-docs/k-5/flashCards.pdf        | Bin 0 -> 131 bytes
 .../k-5/{flashCards.md => flashCardsOld.md}   |   0
 .../virtual/curriculum-unplugged/index.md     |   4 +-
 67 files changed, 336 insertions(+), 62 deletions(-)
 create mode 100644 dashboard/public/c/video_thumbnails/CSF_skinOverview_Harvester.jpg
 create mode 100644 pegasus/sites.v3/code.org/public/curriculum/docs/k-5/flashCardsOld.pdf.fetch
 rename pegasus/{sites.v3/code.org/public/curriculum/docs/CourseD_Textbookpages.md => sites/virtual/curriculum-docs/k-5/CourseD_Textbookpages (1).md} (100%)
 create mode 100644 pegasus/sites/virtual/curriculum-docs/k-5/CourseD_Textbookpages.md
 rename pegasus/{sites.v3/code.org/public/curriculum/docs => sites/virtual/curriculum-docs/k-5}/CourseE_Textbookpages.md (100%)
 rename pegasus/{sites.v3/code.org/public/curriculum/docs => sites/virtual/curriculum-docs/k-5}/CourseF_Textbookpages.md (100%)
 rename pegasus/{sites.v3/code.org/public/curriculum/docs => sites/virtual/curriculum-docs/k-5}/CoursesAB_Textbookpages.md (100%)
 create mode 100644 pegasus/sites/virtual/curriculum-docs/k-5/flashCards.pdf
 rename pegasus/sites/virtual/curriculum-docs/k-5/{flashCards.md => flashCardsOld.md} (100%)

diff --git a/dashboard/public/c/video_thumbnails/CSF_skinOverview_Harvester.jpg b/dashboard/public/c/video_thumbnails/CSF_skinOverview_Harvester.jpg
new file mode 100644
index 0000000000000..fbb1bfa9f3608
--- /dev/null
+++ b/dashboard/public/c/video_thumbnails/CSF_skinOverview_Harvester.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00eebb0ad9404431f5a4f4e5df5b62b58324cc4d0b7e2361e58357a423b7cf8f
+size 15849
diff --git a/pegasus/data/cdo-cs-statistics.csv b/pegasus/data/cdo-cs-statistics.csv
index fb0d321748b78..81c730c0ba005 100644
--- a/pegasus/data/cdo-cs-statistics.csv
+++ b/pegasus/data/cdo-cs-statistics.csv
@@ -6,5 +6,5 @@ Slide3_Diversity_K12,https://www.facebook.com/photo.php?fbid=899372776825693
 Slide4_CS_Foundational,https://www.facebook.com/photo.php?fbid=899372830159021
 Slide5_CS_Education,https://www.facebook.com/photo.php?fbid=899372806825690
 Slide6_Computing_Jobs,https://www.facebook.com/Code.org/photos/a.899372753492362.1073741858.309754825787494/990829887679981/?type=3&theater
-Slide_States_Standards,https://www.facebook.com/Code.org/photos/a.899372753492362.1073741858.309754825787494/1582201865209444/?type=3&theater
+Slide_States_Standards,https://www.facebook.com/Code.org/photos/a.899372753492362.1073741858.309754825787494/1621281874634776/?type=3&theater
 Slide7_States_Map,https://www.facebook.com/Code.org/photos/a.899372753492362.1073741858.309754825787494/1465064813589817/?type=3&theater
diff --git a/pegasus/data/cdo-state-promote.csv b/pegasus/data/cdo-state-promote.csv
index 691c3dde38822..10f4d61879f89 100644
--- a/pegasus/data/cdo-state-promote.csv
+++ b/pegasus/data/cdo-state-promote.csv
@@ -1,6 +1,6 @@
 state_code_s!,state_name_s,cs_jobs_i,growth_vs_average_f,cs_graduates_i,count_schools_teach_cs_i,job_student_gap_i,state_plan_s,cs_counts_t,cs_teacher_cert_s,cs_standards_s,pd_funding_s,pre_service_s,state_position_s,require_hs_s,higher_ed_entrance_s,text_t,petition_url_t,action_url_s,action_text_s,avg_sal_computing_i,sal_x_jobs_bi,avg_sal_all_i,preservice_prepared_i,percent_female_cs_grad_i,percent_cs_exams_f,ap_cs_exams_i,percent_ap_female_i,ap_hispanic_i,ap_black_i,ap_native_american_i,ap_hawaiian_i,total_ap_students_color_i,schools_ap_cs_i,percent_schools_ap_cs_i,number_additional_schools_i,ap_csa_exams_i,percent_ap_csa_female_i,ap_csa_hispanic_i,ap_csa_black_i,ap_csa_native_american_i,ap_csa_hawaiian_i,percent_schools_ap_csa_i,ap_csp_exams_i,percent_ap_csp_female_i,ap_csp_hispanic_i,ap_csp_black_i,ap_csp_native_american_i,ap_csp_hawaiian_i,percent_schools_ap_csp_i,website_url_s,school_district_partners_t,professional_learning_partners_t,other_partners_t,num_affiliates_i,num_elementary_trained_i,num_ecs_csd_i,num_csp_i,num_ms_trained_i,num_hs_trained_i,num_hoc_i,ap_calc_i,ap_bio_i,ap_phy_i,ap_stats_i,ap_chem_i,ap_env_sci_i,ap_cs_i,student_studio_acct_i,teacher_studio_acct_i,policy_0_t,policy_1_t,policy_2_t,policy_3_t,policy_4_t,policy_5_t,policy_6_t,policy_7_t,policy_8_t,pd_funding_exception_s,require_hs_exception_s,cs_standards_exception_s
 AK,Alaska,671,3.3,25,5,-646,No,No,No,No,No,No,No,No,No,,,,,84747,56865237,56710,0,16%,1.07%,68,25%,4,0,1,0,5,6,8%,3,26,19%,1,0,0,0,5%,42,29%,3,0,1,0,4%,www.code.org/promote/AK,no school districts in the state,none,none,0,0,0,1,0,0,147000,789,264,288,273,308,104,60,34561,1370,,,,,,,,,,,,
-AL,Alabama,4393,4.5,503,26,-3890,No,Yes,No,Other,Yes,No,No,No,No,,,,,82893,364148949,42510,0,21%,0.59%,1520,30%,77,157,7,2,243,86,25%,58,271,20%,8,14,1,1,7%,1249,33%,69,143,6,1,23%,www.code.org/promote/AL,no school districts in the state,A+ College Ready,none,4,1557,18,60,0,31,779000,4065,4556,2144,1890,3189,1335,303,212431,5953,,Alabama is in the process of developing K-12 computer science standards.,,,,,,,,,,
+AL,Alabama,4393,4.5,503,26,-3890,No,Yes,No,Yes,Yes,No,No,No,No,,,,,82893,364148949,42510,0,21%,0.59%,1520,30%,77,157,7,2,243,86,25%,58,271,20%,8,14,1,1,7%,1249,33%,69,143,6,1,23%,www.code.org/promote/AL,no school districts in the state,A+ College Ready,none,4,1557,18,60,0,31,779000,4065,4556,2144,1890,3189,1335,303,212431,5953,,,,,,,,,,,,
 AR,Arkansas,1625,3,328,19,-1297,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,,,,Add your support,70458,114494250,39590,0,12%,0.64%,870,26%,121,90,5,5,221,50,16%,23,378,21%,59,41,1,3,8%,492,31%,62,49,4,2,12%,www.code.org/promote/AR,no school districts in the state,none,none,2,2331,0,0,0,1,419000,2991,2884,1818,1859,1722,1025,304,246033,5221,,,,,,,,,,,,
 AZ,Arizona,9818,3,546,33,-9272,No,Other,Yes,No,Other,No,No,No,No,,,,,84866,833214388,46290,0,15%,0.65%,738,22%,138,12,3,0,153,52,16%,21,480,23%,67,7,1,0,13%,258,20%,71,5,2,0,8%,www.code.org/promote/AZ,Paradise Valley Unified School District and Phoenix Union High School District,Grand Canyon University and Science Foundation Arizona,none,5,2536,68,37,10,39,993000,6745,3239,4012,2082,2222,973,438,380471,9586,,,Arizona has allocated funding for rigorous computer science professional development and course support (with an emphasis on Native American students).,,,,,"Arizona has passed policy that is permissive and encouraging for schools to allow computer science to count for a core graduation requirement, but it is not a requirement for schools.",,"Dedicated state funding for CS PD, emphasis on Native American students",,
 CA,California,69768,3.5,4029,311,-65739,Other,Other,Yes,Other,No,No,Other,No,Yes,,,,,110078,7679921904,56840,0,16%,1.38%,18828,29%,4146,345,26,48,4565,580,25%,210,10268,27%,1469,138,13,25,19%,8560,32%,2677,207,13,23,14%,www.code.org/promote/CA,"Alliance College Ready Public Schools, Anaheim Union High School District, Benicia Unified School District, Brentwood Union School District, Cajon Valley School District, Calistoga Joint Unified School District, Central Unified School District, Corona-Norco Unified School District, Covina Valley Unified School District, Fairfield-Suisun Unified School District, Fontana Unified School District, Granada Hills Charter High School, John Swett Unified School District, Jurupa Unified School District, Liberty Union High School District, Los Angeles Unified School District, Martinez Unified School District, Moraga Elementary School District, Mt. Diablo Unified School District, Oakland Unified Public Schools, Orange Unified School District, Perris Union High School District, Pittsburg Unified School District, Placentia-Yorba Linda Union School District, Riverside Unified School District, Saddleback Valley Unified School District, San Jacinto Unified School District, Temecula Valley Unified School District, Val Verde Unified School District, and Whittier Union High School District","9 Dots Community Learning Center, Alameda County Office of Education, Contra Costa County Office of Education, Elementary Institute of Science, Fresno County Office of the Superintendent, LAUSD, Riverside County Office of Education, Sacramento County Office of Education, and Silicon Valley Education Foundation",none,69,9460,258,203,121,247,11345000,74006,38045,32699,32145,21572,26444,10244,2125327,59105,California is in the process of developing a state plan for K-12 computer science.,California is in the process of developing K-12 computer science standards.,,,,California has a dedicated state board member focused on computer science education. California has an opportunity to make more progress in computer science education by creating a position at the state education authority and creating local leadership positions across the state.,,"California has passed policy that is permissive and encouraging for schools to allow computer science to count for a core graduation requirement, but it is not a requirement for schools.",,,,K-12 CS standards in progress
@@ -44,7 +44,7 @@ SD,South Dakota,745,3,145,19,-600,No,No,No,No,No,No,No,No,No,,,,,65516,48809420,
 TN,Tennessee,6173,4.4,625,30,-5548,No,Yes,Other,No,No,No,No,No,No,,,,,75784,467814632,42350,0,18%,0.71%,934,29%,54,133,1,0,188,50,14%,18,356,28%,13,17,1,0,8%,578,30%,41,116,0,0,9%,www.code.org/promote/TN,no school districts in the state,Tennessee Department of Education,none,5,1303,11,20,0,3,864000,4185,2754,2683,2285,2128,1431,395,272768,5967,,,,Tennessee is in the process of developing clear certification pathways for computer science teachers.,,,,,,,,
 TX,Texas,39271,4.1,2714,376,-36557,No,Yes,Yes,No,No,Yes,No,Yes,Yes,,,,Add your support,91000,3573661000,47770,27,18%,1.12%,8925,27%,2362,327,23,10,2722,399,22%,63,6626,25%,1443,202,19,8,22%,2299,33%,919,125,4,2,9%,www.code.org/promote/TX,"Aldine Independent School District, Dallas Independent School District, Grapevine-Colleyville ISD, and Houston Independent School District","Rice University, Center for STEM Education at the University of Texas at Austin, and the University of Texas at Dallas",none,21,7785,89,75,69,57,4361000,33394,19894,44795,16459,12610,14059,6060,1168329,33128,,,,,,,,,,,,
 UT,Utah,4665,2.8,366,18,-4299,No,Yes,Yes,No,Yes,Yes,No,No,No,,,,,81018,377948970,45490,6,10%,0.31%,405,17%,30,4,1,1,36,33,17%,19,233,17%,20,4,0,0,8%,172,17%,10,0,1,1,10%,www.code.org/promote/UT,Canyons School District and Provo Public Schools,Utah STEM Action Center and Utah Board of Education,none,17,743,55,41,29,53,1142000,4441,1676,1923,2358,972,510,129,352105,6111,,,,,,,,,,,,
-VA,Virginia,37175,4.8,1570,102,-35605,No,Yes,Yes,Yes,Yes,Yes,No,Yes,No,,,,,102773,3820586275,53090,2,18%,1.85%,4251,26%,314,277,4,5,600,134,29%,3,3117,25%,216,170,2,4,26%,1134,31%,98,107,2,1,12%,www.code.org/promote/VA,no school districts in the state,CodeVA,none,13,1220,141,65,104,111,1747000,14172,6798,8143,6752,4142,6306,2856,421486,12089,,,,,,,,,,,,K-12 CS standards in progress
+VA,Virginia,37175,4.8,1570,102,-35605,No,Yes,Yes,Yes,Yes,Yes,No,Yes,No,,,,,102773,3820586275,53090,2,18%,1.85%,4251,26%,314,277,4,5,600,134,29%,3,3117,25%,216,170,2,4,26%,1134,31%,98,107,2,1,12%,www.code.org/promote/VA,no school districts in the state,CodeVA,none,13,1220,141,65,104,111,1747000,14172,6798,8143,6752,4142,6306,2856,421486,12089,,,,,,,,,,,,
 VT,Vermont,540,2.1,163,10,-377,No,No,Yes,No,No,Yes,No,No,No,,,,,78681,42487740,47620,0,18%,1.09%,128,20%,4,0,0,0,4,12,16%,3,66,9%,1,0,0,0,15%,62,31%,3,0,0,0,10%,www.code.org/promote/VT,no school districts in the state,none,none,1,110,0,0,0,0,179000,825,591,320,395,308,134,70,22590,788,,,,,,,,,,,,
 WA,Washington ,16492,2.4,1212,62,-15280,No,Yes,Yes,Yes,Yes,No,Yes,No,Yes,,,,Add your support,107853,1778711676,55810,0,21%,2.23%,2637,28%,199,43,8,9,259,135,31%,37,1900,29%,119,21,6,4,23%,737,26%,80,22,2,5,14%,www.code.org/promote/WA,"Bainbridge Island School District, Bellevue School District, Bremerton School District, Central Valley School District, Cheney School District, Clover Park School District, East Valley School District, Eatonville School District, Enumclaw School District, Everett Public Schools, Franklin Pierce School District, Highline School District, Marysville School District, Shoreline School District, Spokane Public Schools, Tacoma Public Schools, Tukwila School District, and West Valley School District",NorthEast Washington Educational Service District 101 and Puget Sound Educational Service District,none,34,1782,137,78,117,129,5022000,9383,4384,4607,3543,3247,2946,1945,776822,26119,,,,,,,,,,,,
 WI,Wisconsin,8167,3,918,67,-7249,No,Yes,Yes,Yes,No,Yes,No,No,No,,,,,75912,619973304,45240,2,15%,0.79%,1036,17%,47,7,1,0,55,68,13%,8,572,14%,26,5,0,0,11%,464,20%,21,2,1,0,8%,www.code.org/promote/WI,Janesville School District,Marquette University,none,4,1283,22,24,4,0,1402000,8246,4106,4116,3919,2755,1560,591,272818,6697,,,,,,,,,,,,
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/AK.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/AK.pdf.fetch
index 10f880c26726a..a9e78cf243a7a 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/AK.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/AK.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/ea0c40534a1a6a4cf12403d158000cdd-AK.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/7606f8fc2ba94db5c0ad1bbad8b85328-AK.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/AL.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/AL.pdf.fetch
index 2340660f30121..c890432ae0268 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/AL.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/AL.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/46a089ff38b14e5ecb899afd2e30480d-AL.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/083e00a155f2edfd3d3f0adf5336681d-AL.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/AR.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/AR.pdf.fetch
index 01f06301dfe6b..ab551479b1aec 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/AR.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/AR.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/dd8b870d173c9bd74ce67113e029fcb1-AR.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/c319f0dd1f334803f087128c09bc1b43-AR.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/AZ.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/AZ.pdf.fetch
index 521ed33154823..5a64e9b5633b7 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/AZ.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/AZ.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/b1ec91bc86519f5d7487503df5c87104-AZ.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/d65750efb0ea8158a20ca85785b7b963-AZ.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/CA.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/CA.pdf.fetch
index 3fd20034226e2..5646fcf41e1de 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/CA.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/CA.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/a4fc1bf16eca308ac5ca6f7eb8f629e0-CA.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/f048d1d42b67451bfb38eaca3cda875b-CA.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/CO.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/CO.pdf.fetch
index d0deb50a3843f..8811f8102d371 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/CO.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/CO.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/55b07bf933dd827b826a9222f11d795c-CO.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/faf6c75c2d303cd1cfcbc77114c78b56-CO.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/CT.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/CT.pdf.fetch
index 3ef0e34be0814..3ceeef139c624 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/CT.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/CT.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/a28c7238524cc255a7b06488a147945a-CT.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/60a001d4b2389682f129ff6e1bf862ae-CT.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/DC.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/DC.pdf.fetch
index 5a0c2e10436e9..bfbd47586791a 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/DC.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/DC.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/9cd476532d88fc814cc54064c1c65bc8-DC.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/0c9a7176a99b8d4f38b9e4e9f39c19df-DC.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/DE.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/DE.pdf.fetch
index e02856d2da8ef..286796394283a 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/DE.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/DE.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/585d2b8d16e1adebc51d87dac901cdfa-DE.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/38a78ec94bd979bb9cd8e6a16bc9d2dd-DE.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/FL.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/FL.pdf.fetch
index 31e46adee0306..7a796b805976d 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/FL.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/FL.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/649491c34fb5677943db59d2a8af4b74-FL.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/9861a35ebd380b31d314b3d1a6e7bd15-FL.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/GA.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/GA.pdf.fetch
index 81ff61b65db03..89777798e558b 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/GA.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/GA.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/2528abe28ab04c5b440d3b0bd02915d8-GA.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/14edc1fb39f7f6a5d5e88a033fbe608a-GA.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/HI.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/HI.pdf.fetch
index b8ce9c8a9d3a4..80386a1a190c4 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/HI.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/HI.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/7f32d3fce1c5d815e3ae64ff8b1f8413-HI.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/d95cababaece85675788a05999bea619-HI.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/IA.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/IA.pdf.fetch
index e8a7b7196c1e0..466bb9b7b1aa8 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/IA.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/IA.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/e19cb74b53093b76f9ceb074b96660c8-IA.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/68c2e2c876ac20df7f0596da08ae9efe-IA.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/ID.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/ID.pdf.fetch
index 397a710a2d079..cb2a66529250f 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/ID.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/ID.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/c2ef00717e8c0f4bc448f53d63800e5d-ID.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/45fb016ea33a121ae7284103554fbb79-ID.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/IL.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/IL.pdf.fetch
index d513d44beeb7d..a0c81b180d516 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/IL.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/IL.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/7ec1628855b2d1d6b25e527dafd66f88-IL.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/52cc67015543241ded3ba88cac62d59d-IL.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/IN.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/IN.pdf.fetch
index f67d8a097468b..740773194d1b0 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/IN.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/IN.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/0d2d8b0ec87154c7be0cc8075b7ec2de-IN.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/70184d8a0ecc7d180b1f644950d30cae-IN.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/KS.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/KS.pdf.fetch
index c6bfb33b9cea5..35458c3cf724d 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/KS.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/KS.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/747737d1f645d607da9f4fba83cb23fa-KS.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/90b2387021879564e77abea45b89b1bf-KS.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/KY.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/KY.pdf.fetch
index 555d16b523643..c0b2aebce3ac6 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/KY.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/KY.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/a7af07cee91e7370ff491847d36e7dbc-KY.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/38a690f8e1d2d6f50e70ac620f644486-KY.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/LA.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/LA.pdf.fetch
index a0858ade45983..ebc23517bd055 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/LA.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/LA.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/336e366e10379659b72acdf7ddbdb9d2-LA.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/a315dcc86786fe92be39c5e6876e7b51-LA.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/MA.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/MA.pdf.fetch
index f9fb18bd45f47..fcb3a0c4c0099 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/MA.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/MA.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/9f48afd16db8103491c777f043d5e6d2-MA.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/b77b92a7926dc26e2f20c60195d21bdd-MA.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/MD.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/MD.pdf.fetch
index aa28c26a8e5b2..7f867b717d635 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/MD.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/MD.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/171b319ab80668f5b8742bf9a86b1bc0-MD.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/fd27f562de9312186f25b02788e8d832-MD.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/ME.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/ME.pdf.fetch
index 1b4084e004675..d390b0a0d5e61 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/ME.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/ME.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/9767ea6d120051a027191ca62d9ad980-ME.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/6b31e7537bc847c65706224a3a3c93ee-ME.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/MI.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/MI.pdf.fetch
index 0c9523408931d..9b5fcd788c7b6 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/MI.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/MI.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/9157e5ca7c89a63f3b80b7ff0449a939-MI.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/de36994365397fbf1783028febe400a1-MI.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/MN.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/MN.pdf.fetch
index b26584fe215bf..fa31bba7d8b13 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/MN.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/MN.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/2dbdb2c7a535885559ac750ba178b60d-MN.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/eef08b3001d0b834cee63041af2369da-MN.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/MO.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/MO.pdf.fetch
index 7c869821141cd..022faef9da388 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/MO.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/MO.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/856fe21d3bfafef6be73e96cfcc8fdd4-MO.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/1e6b7832df38204b9a7a9c0d5dfa36a3-MO.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/MS.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/MS.pdf.fetch
index a4bc35549cb41..d19eac50da724 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/MS.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/MS.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/6a53ea650a4dac945738398b29a23a9d-MS.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/f00eb92eb4ed2f053804b4ec977e33f8-MS.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/MT.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/MT.pdf.fetch
index 991d18941bcfa..2057b9423ad61 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/MT.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/MT.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/aff894a10df45d2a343d06661dbf329d-MT.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/047923731e6fd1bffff41fe29e586d2f-MT.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/NC.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/NC.pdf.fetch
index 635a16eb919ae..934417033e09e 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/NC.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/NC.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/f7c41d7168fa7883c824373584ddbbf5-NC.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/af666678110e04d84ee8c2dea3ffd3aa-NC.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/ND.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/ND.pdf.fetch
index 091b4056efad2..7aa370da49c7d 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/ND.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/ND.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/10fa570d528e2edfd23fc1cc43c74505-ND.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/98f73fe109ed741705635c232cf82659-ND.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/NE.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/NE.pdf.fetch
index 86f6b9d35aa1c..9daa4d37df78f 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/NE.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/NE.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/667d11c2afc5c504d00f878c28d4dddd-NE.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/bdeddfb837fa4e91d3bd88417bd8ea9f-NE.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/NH.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/NH.pdf.fetch
index 26d2833283037..b7751e3f92d71 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/NH.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/NH.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/b43b85dfe2a10d9a18ca4d009d8e05bf-NH.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/7d6e120103f234819058119403541714-NH.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/NJ.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/NJ.pdf.fetch
index 0206f7ef2675c..b0f5d66d7f52a 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/NJ.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/NJ.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/7b1d7e7a30818d089797f5d2e18bcfc2-NJ.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/633f202b5a77b6afba2f412fbda362fc-NJ.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/NM.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/NM.pdf.fetch
index aba678b1e5648..6075f6d6c1713 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/NM.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/NM.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/0a11660b595459b0caa15092061af2eb-NM.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/c367979988a4a8927b6d83ca61d915bb-NM.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/NV.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/NV.pdf.fetch
index 964f1b3aaf599..536187e8f9028 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/NV.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/NV.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/dd17fb1341906664aa83366a3e490a6f-NV.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/f12536edf9ab8c10b0110c4b351e5f6f-NV.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/NY.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/NY.pdf.fetch
index 03e9f374bde90..4ae0e0c5d45b1 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/NY.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/NY.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/5f84d91ce0b5eae820c52f93c87cde31-NY.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/a4f6fd3189ad80cc23f235aedc1e1b93-NY.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/OH.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/OH.pdf.fetch
index 504a6af4066be..6b9140ea969dc 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/OH.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/OH.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/e054a30092e2d7e686ad611a9fe267bf-OH.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/f40a34b115311860e6712edd62b10bfa-OH.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/OK.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/OK.pdf.fetch
index e3319e63bba8c..9667ff17c43cf 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/OK.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/OK.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/6b8601ac4d346498f568bd94be83139e-OK.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/de78cd8f7cb945c4d798695934c5391e-OK.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/OR.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/OR.pdf.fetch
index 4af71a8da6861..07a06ba61fa14 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/OR.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/OR.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/39abcea1b6cda5e44b98bcaf4cc0d089-OR.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/e36c86b40f72ce00ca47c4a7654cd2c9-OR.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/PA.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/PA.pdf.fetch
index f1f2ed32573c9..66fd5541e2727 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/PA.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/PA.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/ca5a97351d38c85a7ee87dafca54311e-PA.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/7f4dccfc2e8331a367d55b4f02914877-PA.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/RI.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/RI.pdf.fetch
index 9cf2692dabad5..8f165349bcf46 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/RI.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/RI.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/5aad28baaf38c2b8a9655cf80cf879d4-RI.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/e3b84294a8120c4b2c784c02eccdb607-RI.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/SC.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/SC.pdf.fetch
index 1b1c25f2282ed..7bf8e806a6b50 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/SC.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/SC.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/3b776569a608aa4a37759ec758e7f90c-SC.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/6181610e7cc4ed8d1bae604ec1f301b6-SC.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/SD.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/SD.pdf.fetch
index ad615f37aa1e3..87911cfeafe90 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/SD.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/SD.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/418bce229c8e8a71eba9e74db518d114-SD.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/0d6fbd40b1c721398575d31b46b83fc5-SD.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/TN.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/TN.pdf.fetch
index 5ed0a46521c34..976331fd28f44 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/TN.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/TN.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/972664742bf22a858529313ba197d16b-TN.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/432ea402c2100061cdb90694b7915201-TN.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/TX.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/TX.pdf.fetch
index 3c16db7a61cac..1eb957d8c8d05 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/TX.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/TX.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/c1d30184d8eaa49dd4e8c2b60826a701-TX.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/c9465f97f10ec96320d0b6a8d41a6d9f-TX.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/UT.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/UT.pdf.fetch
index 2e0777481acaf..e70839c4eead1 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/UT.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/UT.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/b1e1a37deb288651c074f586b95263fc-UT.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/2f3bb3e0765285b09c43b46f6d773b23-UT.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/VA.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/VA.pdf.fetch
index 91d78c129b63c..277e6e5195cd0 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/VA.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/VA.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/fd5497c197c72a2e43b06cc9d93dc5b3-VA.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/d419235168c3ef1d179913e54cde2491-VA.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/VT.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/VT.pdf.fetch
index 7dcbb16349b60..4cfa8bb38a4a2 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/VT.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/VT.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/4015f9b61674ae5a1c042d20a1345532-VT.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/55382e6cc41c46530a691cf9e39c0819-VT.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/WA.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/WA.pdf.fetch
index 4d23f8d7c0865..532754a1919c3 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/WA.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/WA.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/88fd4efdb222b5d20d85f4dc8f9a6e89-WA.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/8f8feac67009464dfa6db64dd5604f7b-WA.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/WI.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/WI.pdf.fetch
index 20b125f25c854..0dab4a6491539 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/WI.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/WI.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/6c2422bb15ee233f692255e025bba3bc-WI.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/5fe2cdd9180a14f8d6518bcf7eb1564f-WI.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/WV.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/WV.pdf.fetch
index 3a06a92b1de4f..4b99c4017f208 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/WV.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/WV.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/94eb652d1055950e7a033ea30df46b66-WV.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/116708dc22468d55bf7c63f507e8881e-WV.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/advocacy/state-facts/WY.pdf.fetch b/pegasus/sites.v3/code.org/public/advocacy/state-facts/WY.pdf.fetch
index d1c084b9508f3..17d7e25e97e41 100644
--- a/pegasus/sites.v3/code.org/public/advocacy/state-facts/WY.pdf.fetch
+++ b/pegasus/sites.v3/code.org/public/advocacy/state-facts/WY.pdf.fetch
@@ -1 +1 @@
-https://cdo-fetch.s3.amazonaws.com/19cc49a9d4bcc11351a2594ee16cc6b7-WY.pdf
\ No newline at end of file
+https://cdo-fetch.s3.amazonaws.com/7546bada8397cbb4b08be03c3125c06f-WY.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/curriculum/docs/k-5/flashCardsOld.pdf.fetch b/pegasus/sites.v3/code.org/public/curriculum/docs/k-5/flashCardsOld.pdf.fetch
new file mode 100644
index 0000000000000..25135a105ee85
--- /dev/null
+++ b/pegasus/sites.v3/code.org/public/curriculum/docs/k-5/flashCardsOld.pdf.fetch
@@ -0,0 +1 @@
+https://cdo-fetch.s3.amazonaws.com/fc5878c253d264edded1c121b141c1cc-flashCardsOld.pdf
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/educate/csp/hall-of-fame.md b/pegasus/sites.v3/code.org/public/educate/csp/hall-of-fame.md
index 6a964597e2dc6..5c2c855c9b90c 100644
--- a/pegasus/sites.v3/code.org/public/educate/csp/hall-of-fame.md
+++ b/pegasus/sites.v3/code.org/public/educate/csp/hall-of-fame.md
@@ -223,7 +223,8 @@ Find your school below!
 ## Indiana
 * CARMEL HIGH SCHOOL, CARMEL  
 * FISHERS HIGH SCHOOL, FISHERS  
-* GRIFFITH SENIOR HIGH SCHOOL, GRIFFITH  
+* GRIFFITH SENIOR HIGH SCHOOL, GRIFFITH
+* HAMILTON SOUTHEASTERN HIGH SCHOOL, FISHERS  
 * SEYMOUR SENIOR HIGH SCHOOL, SEYMOUR  
 * TELL CITY JR-SR HIGH SCHOOL, TELL CITY 
 * WESTFIELD HIGH SCHOOL, WESTFIELD  
diff --git a/pegasus/sites.v3/code.org/public/files/computer_science_advocacy.pptx b/pegasus/sites.v3/code.org/public/files/computer_science_advocacy.pptx
index abd66f43e9f97..86c3fbd14d882 100644
--- a/pegasus/sites.v3/code.org/public/files/computer_science_advocacy.pptx
+++ b/pegasus/sites.v3/code.org/public/files/computer_science_advocacy.pptx
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c771c21f2a7bd62dc4ec8696c7bdd187be6619231d4c9f6641e572b2d4548bb
-size 3412392
+oid sha256:653a901f363759eb9db571fcf486b6db7a5557e028993e0e71e55dc47e0d4672
+size 3390407
diff --git a/pegasus/sites.v3/code.org/public/images/cs-stats/Slide_States_Standards.png b/pegasus/sites.v3/code.org/public/images/cs-stats/Slide_States_Standards.png
index 14892b5952081..ec84a2054cd03 100644
--- a/pegasus/sites.v3/code.org/public/images/cs-stats/Slide_States_Standards.png
+++ b/pegasus/sites.v3/code.org/public/images/cs-stats/Slide_States_Standards.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1dfd54c0589de2f0066b329642525ea3a4de244bbd73ae7803d50dd5fc9779e9
-size 223388
+oid sha256:0d8bac08f4d727f97ba6038c88f553a909ea6a700c2ab555cee7de9e619eabc0
+size 223758
diff --git a/pegasus/sites.v3/hourofcode.com/public/images/cs-stats/Slide_States_Standards.png b/pegasus/sites.v3/hourofcode.com/public/images/cs-stats/Slide_States_Standards.png
index 14892b5952081..ec84a2054cd03 100644
--- a/pegasus/sites.v3/hourofcode.com/public/images/cs-stats/Slide_States_Standards.png
+++ b/pegasus/sites.v3/hourofcode.com/public/images/cs-stats/Slide_States_Standards.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1dfd54c0589de2f0066b329642525ea3a4de244bbd73ae7803d50dd5fc9779e9
-size 223388
+oid sha256:0d8bac08f4d727f97ba6038c88f553a909ea6a700c2ab555cee7de9e619eabc0
+size 223758
diff --git a/pegasus/sites.v3/code.org/public/curriculum/docs/CourseD_Textbookpages.md b/pegasus/sites/virtual/curriculum-docs/k-5/CourseD_Textbookpages (1).md
similarity index 100%
rename from pegasus/sites.v3/code.org/public/curriculum/docs/CourseD_Textbookpages.md
rename to pegasus/sites/virtual/curriculum-docs/k-5/CourseD_Textbookpages (1).md
diff --git a/pegasus/sites/virtual/curriculum-docs/k-5/CourseD_Textbookpages.md b/pegasus/sites/virtual/curriculum-docs/k-5/CourseD_Textbookpages.md
new file mode 100644
index 0000000000000..39363ef0e097a
--- /dev/null
+++ b/pegasus/sites/virtual/curriculum-docs/k-5/CourseD_Textbookpages.md
@@ -0,0 +1,267 @@
+# Course D Markdown
+
+Might want to play with size of text, but relative sizing is how I want it for now
+
+### Markdown for embedded artist
+
+#### Ready... Set... Draw!
+
+Here's an example of a drawing that you're about to create yourself! 
+
+Run through it one or two times so that you know what to expect.
+
+**Some fun punny things for Frozen**
+
+- Freeze! Here's an example...
+- Do you wanna build a snowflake? ...
+- Cool off with this new drawing ...
+
+### Markdown for embedded Play Lab
+
+#### Ready... Set... Play!
+
+Here's an example of a game that you're about to create yourself! 
+
+Play through it one or two times so that you know what to expect.
+
+### Markdown for concept textbook pages
+
+All in one place for now, will be split up at horizontal lines for each concept
+
+------
+
+1. Algorithms
+
+------
+
+### In this lesson...
+
+Have you ever wanted to tell someone exactly what to do? Do they always listen to you?
+
+Today, you'll be telling a machine what to do, step by step- and it will listen!
+
+#### Blocks to Know
+
+<xml>when run</xml><xml>move forward</xml>
+
+------
+
+### You just learned "algorithms"!
+
+**An algorithm is just a list of steps to finish a task**. The fun thing about algorithms is that you get to decide what happens, step by step. 
+
+When you write an algorithm for a machine, this is called a **program**. 
+
+#### Words to Know
+
+Algorithm
+
+- A list of steps to finish a task
+
+Program
+
+- An algorithm that has been coded into something that can be run by a machine
+
+#### Up Next
+
+Have you ever wondered how you could get your character to move when you press the arrow keys?
+
+
+
+------
+
+2. Events
+
+------
+
+### In this lesson...
+
+Think about your favorite video game. Does the game play itself when you press "play"? 
+
+What if you wanted to make different code run when something new happens? Let's find out!
+
+#### Blocks to Know
+
+<xml>When left arrow</xml> <xml>When actor 1 touches actor 2</xml>
+
+------
+
+### You just learned "events"!
+
+**An event is an action that causes something to happen.**
+
+Events help us write programs that can respond to different actions. 
+
+#### Words to Know
+
+Event
+
+- An action that causes something to happen
+
+#### Up Next
+
+Have you ever wanted to repeat something over and over? Next, you will learn an easy way to do that!
+
+
+
+------
+
+4. Loops/Nested Loops
+
+------
+
+### In this lesson...
+
+How would you move your character forward **5** times? Easy- just drag out **5** move forward blocks. 
+
+What if you want your character to move forward **5,000** times? How long would it take you to drag out **5,000** blocks? 
+
+You will learn an easy way to do this!
+
+#### Blocks to Know
+
+<xml>repeat ??? times</xml>
+
+------
+
+### You just learned "loops"!
+
+**A loop is the action of doing something over and over again.** Another word for doing something again is **repeat**.
+
+Sometimes you even put a loop inside another loop- those are called **nested loops**!
+
+#### Words to Know
+
+Loop
+
+- The action of doing something over and over again
+
+Repeat
+
+- Do something again
+
+Nested Loop
+
+- A loop within a loop
+
+#### Up Next
+
+Be careful! Some bugs might crawl their way into your program.
+
+
+
+------
+
+6. Debugging
+
+------
+
+### In this lesson...
+
+When most people think about bugs, they think about creepy crawly things. In computer science, bugs aren't alive, but they can still be tricky.
+
+The puzzles in this lesson look done! **But wait**- they don't seem to be working yet. 
+
+------
+
+### You just learned about "bugs"!
+
+**A bug is something that goes wrong.** It is an error in a program. When you find and fix those errors, you are **debugging** a problem. 
+
+You have to practice **persistence**, another word for not giving up, in order to find and fix all the bugs.
+
+#### Words to Know
+
+Bug
+
+- Part of a program that does not work correctly
+
+Debugging
+
+- Finding and fixing problems in an algorithm or program
+
+Persistence
+
+- Not giving up
+
+#### Up Next
+
+Have you ever wanted to repeat something over and over? Ever wish there was an easy way to do that? Your wait is almost over!
+
+
+
+---
+
+7. While Loops
+
+---
+
+### In this lesson...
+
+If you were in a room full of your favorite food, what would you do? *While* there is food left,  you would keep eating it, right? 
+
+Today you will learn how to use this idea in your programs!
+
+#### Blocks to Know
+
+<xml>While there is a pile</xml> or <xml>While path ahead</xml>
+
+---
+
+### You just learned "while loops"!
+
+**A while loop is a loop that continues to repeat until something happens**. 
+
+They are really helpful when you don't know exactly how many times a loop should repeat!
+
+#### Words to Know
+
+While Loop
+
+* A loop that continues to repeat while a condition is true.
+
+#### Up Next
+
+Have you ever heard someone say "under one condition"? What does it mean?
+
+
+
+------
+
+8. Conditionals
+
+------
+
+### In this lesson...
+
+What does "under one condition" mean? It means that *if* you follow the rules, or *condition*, something will happen next.
+
+You can use this idea in computer science too! *If* there is a flower, get nectar from it. *While* your character can move forward, keep moving forward.
+
+Let's get started!
+
+#### Blocks to Know
+
+<xml> If at flower </xml>
+
+<xml>While path ahead</xml>
+
+------
+
+### You just learned "conditionals"!
+
+**A *conditional* is a statement that only runs under a certain condition.** 
+
+A *condition* is a statement that a program checks to see if it is true or false. If true, an action is taken. Otherwise, the action is ignored.
+
+Conditionals are very useful in computer science. They are used in websites, video games, apps- everywhere!
+
+#### Words to Know
+
+Condition
+
+- A statement that a program checks to see if it is true or false
+
+Conditionals
+
+- Statements that only run under certain conditions
\ No newline at end of file
diff --git a/pegasus/sites.v3/code.org/public/curriculum/docs/CourseE_Textbookpages.md b/pegasus/sites/virtual/curriculum-docs/k-5/CourseE_Textbookpages.md
similarity index 100%
rename from pegasus/sites.v3/code.org/public/curriculum/docs/CourseE_Textbookpages.md
rename to pegasus/sites/virtual/curriculum-docs/k-5/CourseE_Textbookpages.md
diff --git a/pegasus/sites.v3/code.org/public/curriculum/docs/CourseF_Textbookpages.md b/pegasus/sites/virtual/curriculum-docs/k-5/CourseF_Textbookpages.md
similarity index 100%
rename from pegasus/sites.v3/code.org/public/curriculum/docs/CourseF_Textbookpages.md
rename to pegasus/sites/virtual/curriculum-docs/k-5/CourseF_Textbookpages.md
diff --git a/pegasus/sites.v3/code.org/public/curriculum/docs/CoursesAB_Textbookpages.md b/pegasus/sites/virtual/curriculum-docs/k-5/CoursesAB_Textbookpages.md
similarity index 100%
rename from pegasus/sites.v3/code.org/public/curriculum/docs/CoursesAB_Textbookpages.md
rename to pegasus/sites/virtual/curriculum-docs/k-5/CoursesAB_Textbookpages.md
diff --git a/pegasus/sites/virtual/curriculum-docs/k-5/flashCards.pdf b/pegasus/sites/virtual/curriculum-docs/k-5/flashCards.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..441f64acff78c2ca09cd59be09a50a91cff12522
GIT binary patch
literal 131
zcmWN?%MrpL5CG77s-OV_EWah)zyiXIO2)+;tX|*cUG>dlzC>T^<U`8)Shq*x{eS=D
zo#s>WSxH`co1+Ns37kK2ss&O-^ucD8$W#jyp#(>oOvVDXQBJ79l2)!@bg?x+@Fs&X
NZR7E+LIVaBw;wc4C-ndT

literal 0
HcmV?d00001

diff --git a/pegasus/sites/virtual/curriculum-docs/k-5/flashCards.md b/pegasus/sites/virtual/curriculum-docs/k-5/flashCardsOld.md
similarity index 100%
rename from pegasus/sites/virtual/curriculum-docs/k-5/flashCards.md
rename to pegasus/sites/virtual/curriculum-docs/k-5/flashCardsOld.md
diff --git a/pegasus/sites/virtual/curriculum-unplugged/index.md b/pegasus/sites/virtual/curriculum-unplugged/index.md
index 6afb49b759d48..d9fd7e5d7f3f3 100644
--- a/pegasus/sites/virtual/curriculum-unplugged/index.md
+++ b/pegasus/sites/virtual/curriculum-unplugged/index.md
@@ -83,7 +83,9 @@ end
 Each of these activities can either be used alone or with other computer science lessons on related concepts.
 <br/>
 
-<a href="https://code.org/curriculum/docs/csf/CSF_TeacherGuide_CoursesA-F_v2a_small.pdf" target="_new">Course A-F Curriculum Book (v2)</a>  | <a href="https://code.org/curriculum/docs/csf/A-F_supplies_v2.pdf" target="_new">Course A-F Supply List</a> | <a href="http://code.org/curriculum/docs/k-5/complete_compressed.pdf" target="_new">Course 1-4 Curriculum Book</a> | <a href="http://code.org/curriculum/docs/k-5/teacherKeyComplete.pdf" target="_new">Course 1-4 Answer Keys</a>
+<a href="https://code.org/curriculum/docs/csf/CSF_TeacherGuide_CoursesA-F_v2a_small.pdf" target="_new">Course A-F Curriculum Book (v2)</a>  **||** <a href="http://code.org/curriculum/docs/k-5/complete_compressed.pdf" target="_new">Course 1-4 Curriculum Book</a> **||** <a href="https://code.org/curriculum/docs/csf/A-F_supplies_v2.pdf" target="_new">Course A-F Supply List</a> **||** <a href="https://code.org/curriculum/docs/k-5/flashCards.pdf" target="_new">CSF Flashcards</a> 
+
+<!-- | <a href="http://code.org/curriculum/docs/k-5/teacherKeyComplete.pdf" target="_new">Course 1-4 Answer Keys</a> -->
 <br/>
 
 <table cellpadding="10">