diff --git a/examples/add-to-end-of-timeline.html b/examples/add-to-end-of-timeline.html
index 8f61bc3b..abc1f736 100644
--- a/examples/add-to-end-of-timeline.html
+++ b/examples/add-to-end-of-timeline.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
   <head>
-    
     <script src="../jspsych.js"></script>
     <script src="../plugins/jspsych-text.js"></script>
     <script src="../plugins/jspsych-single-stim.js"></script>
     <link rel="stylesheet" href="../css/jspsych.css"></link>
   </head>
+  <body></body>
   <script>
 
   var first = {
diff --git a/examples/all-keys-no-keys.html b/examples/all-keys-no-keys.html
deleted file mode 100644
index ecafe415..00000000
--- a/examples/all-keys-no-keys.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  
-  <script src="../jspsych.js"></script>
-  <script src="../plugins/jspsych-single-stim.js"></script>
-  <link rel="stylesheet" href="../css/jspsych.css"></link>
-  <style>
-    img {
-      width: 300px;
-    }
-  </style>
-</head>
-
-<body>
-</body>
-<script>
-  var trial_1 = {
-    stimulus: '<p>All keys</p>',
-    choices: jsPsych.ALL_KEYS
-  }
-
-  var trial_2 = {
-    stimulus: '<p>No keys</p>',
-    timing_response: 2000,
-    choices: jsPsych.NO_KEYS
-  }
-
-
-  var node = {
-    type: 'single-stim',
-    is_html: true,
-    timeline: [trial_1, trial_2],
-  }
-
-
-  jsPsych.init({
-    timeline: [node],
-    on_finish: function() {
-      jsPsych.data.displayData();
-    },
-    default_iti: 250
-  });
-</script>
-
-</html>
diff --git a/examples/conditional-and-loop-functions.html b/examples/conditional-and-loop-functions.html
index 797fd08f..5be6b3f6 100644
--- a/examples/conditional-and-loop-functions.html
+++ b/examples/conditional-and-loop-functions.html
@@ -1,23 +1,23 @@
 <!DOCTYPE html>
 <html>
   <head>
-
     <script src="../jspsych.js"></script>
     <script src="../plugins/jspsych-text.js"></script>
     <link rel="stylesheet" href="../css/jspsych.css"></link>
   </head>
+  <body></body>
   <script>
 
-  var block = {
+  var trial = {
     type: 'text',
     text: 'Hello. This is in a loop. Press R to repeat this trial, or C to continue.',
     choices: ['r','c']
   }
 
   var loop_node = {
-    timeline: [block],
+    timeline: [trial],
     loop_function: function(data){
-      if(jsPsych.pluginAPI.convertKeyCharacterToKeyCode('r') == data[0].key_press){
+      if(jsPsych.pluginAPI.convertKeyCharacterToKeyCode('r') == data.values()[0].key_press){
         return true;
       } else {
         return false;
@@ -39,7 +39,7 @@
   var if_node = {
     timeline: [if_trial],
     conditional_function: function(){
-      var data = jsPsych.data.getLastTrialData();
+      var data = jsPsych.data.get().last(1).values()[0];
       if(data.key_press == jsPsych.pluginAPI.convertKeyCharacterToKeyCode('s')){
         return false;
       } else {
@@ -55,7 +55,7 @@
 
   jsPsych.init({
     timeline: [loop_node, pre_if_trial, if_node, after_if_trial],
-    on_finish: function(){jsPsych.data.displayData(); },
+    on_finish: function(){ jsPsych.data.displayData(); },
     default_iti: 200
   });
 
diff --git a/examples/conditional-first-trial.html b/examples/conditional-first-trial.html
deleted file mode 100644
index 0f60e0dc..00000000
--- a/examples/conditional-first-trial.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    
-    <script src="../jspsych.js"></script>
-    <script src="../plugins/jspsych-text.js"></script>
-    <link rel="stylesheet" href="../css/jspsych.css"></link>
-  </head>
-  <script>
-
-  var if_trial = {
-    type: 'text',
-    text: 'The random number generated showed this trial. Press any key to continue.'
-  }
-
-  var if_node = {
-    timeline: [if_trial],
-    conditional_function: function(){
-      console.log('conditional function evaluated');
-      return false;
-    }
-  }
-
-  var after_if_trial = {
-    type: 'text',
-    text: 'This is the trial after the conditional. Check the console log to see if conditional evaluated.'
-  }
-
-  jsPsych.init({
-    timeline: [if_node, after_if_trial],
-    on_finish: function(){jsPsych.data.displayData(); }
-  });
-
-  </script>
-</html>
diff --git a/examples/data-add-properties.html b/examples/data-add-properties.html
index e66c8515..533f3ad3 100644
--- a/examples/data-add-properties.html
+++ b/examples/data-add-properties.html
@@ -2,7 +2,6 @@
 <html>
 
 <head>
-  
   <script src="../jspsych.js"></script>
   <script src="../plugins/jspsych-single-stim.js"></script>
   <link rel="stylesheet" href="../css/jspsych.css"></link>
@@ -12,7 +11,7 @@
     }
   </style>
 </head>
-
+<body></body>
 <script>
   var block_1 = {
     type: 'single-stim',
diff --git a/examples/data-add-to-last-trial.html b/examples/data-add-to-last-trial.html
deleted file mode 100644
index 24e59a77..00000000
--- a/examples/data-add-to-last-trial.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  
-  <script src="../jspsych.js"></script>
-  <script src="../plugins/jspsych-single-stim.js"></script>
-  <link rel="stylesheet" href="../css/jspsych.css"></link>
-  <style>
-    img {
-      width: 300px;
-    }
-  </style>
-</head>
-
-<script>
-  var block_1 = {
-    type: 'single-stim',
-    stimulus: 'img/happy_face_1.jpg',
-    choices: [89, 78], // Y or N
-    prompt: '<p class="center-content">Data should have "correct: true" property on next page. (Y or N to continue).</p>',
-    on_finish: function() {
-      jsPsych.data.addDataToLastTrial({
-        correct: true
-      });
-    }
-  }
-
-  jsPsych.init({
-    timeline: [block_1],
-    on_finish: function() {
-      jsPsych.data.displayData();
-    }
-  });
-</script>
-
-</html>
diff --git a/examples/data-as-function.html b/examples/data-as-function.html
index d1f08a74..22eae12b 100644
--- a/examples/data-as-function.html
+++ b/examples/data-as-function.html
@@ -2,7 +2,6 @@
 <html>
 
 <head>
-  
   <script src="../jspsych.js"></script>
   <script src="../plugins/jspsych-single-stim.js"></script>
   <link rel="stylesheet" href="../css/jspsych.css"></link>
@@ -12,7 +11,7 @@
     }
   </style>
 </head>
-
+<body></body>
 <script>
   var block_1 = {
     type: 'single-stim',
diff --git a/examples/data-filters.html b/examples/data-filters.html
deleted file mode 100644
index ee366da3..00000000
--- a/examples/data-filters.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  
-  <script src="../jspsych.js"></script>
-  <script src="../plugins/jspsych-text.js"></script>
-  <link rel="stylesheet" href="../css/jspsych.css"></link>
-  <style>
-    img {
-      width: 300px;
-    }
-  </style>
-</head>
-
-<script>
-  var trial_1 = {
-    data: { prop: 1, type: 1 }
-  }
-
-  var trial_2 = {
-    data: { prop: 1, type: 2}
-  }
-
-  var trial_3 = {
-    data: { prop: 2, type: 1}
-  }
-
-  var trial_4 = {
-    data: { prop: 2, type: 2}
-  }
-
-  var node = {
-    type: 'text',
-    timeline: [trial_1, trial_2, trial_3, trial_4],
-    text: "Press any key. 4 times. Then check console."
-  }
-
-
-  jsPsych.init({
-    timeline: [node],
-    on_finish: function() {
-      console.log(jsPsych.data.getDataAsJSON([{prop: 1}, {type: 2}]));
-      console.log(jsPsych.data.getDataAsJSON([{prop: 1, type: 1}, {type: 2, prop: 2}]));
-      jsPsych.data.displayData();
-    },
-    default_iti: 250
-  });
-</script>
-
-</html>
diff --git a/examples/data-from-timeline.html b/examples/data-from-timeline.html
index aec5472a..f8b6898d 100644
--- a/examples/data-from-timeline.html
+++ b/examples/data-from-timeline.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  
+
   <script src="../jspsych.js"></script>
   <script src="../plugins/jspsych-single-stim.js"></script>
   <link rel="stylesheet" href="../css/jspsych.css"></link>
@@ -12,7 +12,7 @@
     }
   </style>
 </head>
-
+<body></body>
 <script>
   var trial_1 = {
     stimulus: 'img/happy_face_1.jpg',
@@ -36,7 +36,7 @@
       node_data: true
     },
     on_finish: function(){
-      console.log(JSON.stringify(jsPsych.data.getLastTimelineData()));
+      console.log(jsPsych.data.getLastTimelineData().json());
     }
   }
 
diff --git a/examples/data-from-url.html b/examples/data-from-url.html
index 2225df11..70ac384c 100644
--- a/examples/data-from-url.html
+++ b/examples/data-from-url.html
@@ -1,12 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
-    
     <script src="../jspsych.js"></script>
     <link rel="stylesheet" href="../css/jspsych.css"></link>
-    <style>
-      img { width: 300px; }
-    </style>
   </head>
   <body>
     <p>The URL variable should be logged to the console</p>
diff --git a/examples/demo-flanker.html b/examples/demo-flanker.html
index 0011099f..e865d1f9 100644
--- a/examples/demo-flanker.html
+++ b/examples/demo-flanker.html
@@ -2,7 +2,6 @@
 <html>
     <head>
         <title>Flanker Task</title>
-        
         <script src="../jspsych.js"></script>
         <script src="../plugins/jspsych-text.js"></script>
         <script src="../plugins/jspsych-single-stim.js"></script>
@@ -11,6 +10,9 @@
     <body>
     </body>
     <script>
+        /* experiment parameters */
+        var reps_per_trial_type = 4;
+
         /*set up welcome block*/
         var welcome = {
           type: "text",
@@ -20,11 +22,12 @@
         /*set up instructions block*/
         var instructions = {
           type: "text",
-          text: "<p>In this task, you will see five arrows on the screen.</p>"+
+          text: "<p>In this task, you will see five arrows on the screen, like the example below.</p>"+
+            "<img src='img/inc1.png'></img>"+
             "<p>Press the left arrow key if the middle arrow is pointing left. (<)</p>"+
             "<p>Press the right arrow key if the middle arrow is pointing right. (>)</p>"+
             "<p>Press any key to begin.</p>",
-          timing_post_trial: 3000
+          timing_post_trial: 1000
         };
 
         /*defining stimuli*/
@@ -47,64 +50,42 @@
           }
         ];
 
-        /*randomising stimuli*/
-        var all_trials = jsPsych.randomization.repeat(test_stimuli, 3);
-
-        /*creating random ISI*/
-        var post_trial_gap = function() {
-            return Math.floor(Math.random() * 1500) + 500;
-        };
-
-        /*defining experimental block*/
-        var test_block = {
-          type: 'single-stim',
-          choices: [37, 39],
-          timing_response: 1500,
-          on_finish: function(data){
+        /* defining test timeline */
+        var test = {
+          timeline: [{
+            type: 'single-stim',
+            choices: [37, 39],
+            timing_response: 1500,
+            stimulus: jsPsych.timelineVariable('stimulus'),
+            data: jsPsych.timelineVariable('data'),
+            on_finish: function(data){
               var correct = false;
-              if(data.direction == 'left' &&  data.key_press == '37' && data.rt > -1){
+              if(data.direction == 'left' &&  data.key_press == 37 && data.rt > -1){
                 correct = true;
-              } else if(data.direction == 'right' && data.key_press == '39' && data.rt > -1){
+              } else if(data.direction == 'right' && data.key_press == 39 && data.rt > -1){
                 correct = true;
               }
-              jsPsych.data.addDataToLastTrial({correct: correct});
+              data.correct = correct;
             },
-          timeline: all_trials,
-          timing_post_trial: post_trial_gap
-        };
-
-        /*function for getting mean RTs and error rates*/
-        function getSubjectData() {
-
-          var trials = jsPsych.data.getData({trial_type: 'single-stim'});
-          var congruent_trials = jsPsych.data.getData({stim_type: 'congruent', correct: true});
-          var incongruent_trials = jsPsych.data.getData({stim_type: 'incongruent', correct: true});
-
-          var sum_rt_congruent = 0;
-          for (var i = 0; i < congruent_trials.length; i++) {
-            sum_rt_congruent += congruent_trials[i].rt;
-          }
-
-          var sum_rt_incongruent = 0;
-          for (var i = 0; i < incongruent_trials.length; i++) {
-            sum_rt_incongruent += incongruent_trials[i].rt;
-          }
-
-          return {
-            congruent_rt: Math.floor(sum_rt_congruent / congruent_trials.length),
-            incongruent_rt: Math.floor(sum_rt_incongruent / incongruent_trials.length),
-            accuracy: Math.floor( (congruent_trials.length + incongruent_trials.length) / trials.length * 100)
-          }
+            timing_post_trial: function() {
+                return Math.floor(Math.random() * 1500) + 500;
+            }
+          }],
+          timeline_variables: test_stimuli,
+          sample: {type: 'fixed-repetitions', size: reps_per_trial_type}
         };
 
         /*defining debriefing block*/
-        var debrief_block = {
+        var debrief = {
           type: "text",
           text: function() {
-            var subject_data = getSubjectData();
-            return "<p>You responded correctly on "+subject_data.accuracy+"% of the trials.</p> " +
-            "<p>Your average response time for congruent trials was <strong>" + subject_data.congruent_rt + "ms</strong>.</p>"+
-            "<p>Your average response time for incongruent trials was <strong>" + subject_data.incongruent_rt + "ms</strong>.</p>"+
+            var total_trials = jsPsych.data.get().filter({trial_type: 'single-stim'}).count();
+            var accuracy = Math.round(jsPsych.data.get().filter({correct: true}).count() / total_trials * 100);
+            var congruent_rt = Math.round(jsPsych.data.get().filter({correct: true, stim_type: 'congruent'}).select('rt').mean());
+            var incongruent_rt = Math.round(jsPsych.data.get().filter({correct: true, stim_type: 'incongruent'}).select('rt').mean());
+            return "<p>You responded correctly on <strong>"+accuracy+"%</strong> of the trials.</p> " +
+            "<p>Your average response time for congruent trials was <strong>" + congruent_rt + "ms</strong>.</p>"+
+            "<p>Your average response time for incongruent trials was <strong>" + incongruent_rt + "ms</strong>.</p>"+
             "<p>Press any key to complete the experiment. Thank you!</p>";
           }
         };
@@ -113,8 +94,8 @@
         var timeline = [];
         timeline.push(welcome);
         timeline.push(instructions);
-        timeline.push(test_block);
-        timeline.push(debrief_block);
+        timeline.push(test);
+        timeline.push(debrief);
 
         /*start experiment*/
         jsPsych.init({
diff --git a/examples/end-active-node.html b/examples/end-active-node.html
index e35677e1..f174d12a 100644
--- a/examples/end-active-node.html
+++ b/examples/end-active-node.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  
+
   <script src="../jspsych.js"></script>
   <script src="../plugins/jspsych-single-stim.js"></script>
   <link rel="stylesheet" href="../css/jspsych.css"></link>
@@ -12,7 +12,7 @@
     }
   </style>
 </head>
-
+<body></body>
 <script>
   var images = ["img/1.gif", "img/2.gif", "img/3.gif", "img/4.gif", "img/5.gif", "img/6.gif", "img/7.gif", "img/8.gif", "img/9.gif", "img/10.gif"];
 
diff --git a/examples/end-experiment.html b/examples/end-experiment.html
index 82bfaf4c..519baf12 100644
--- a/examples/end-experiment.html
+++ b/examples/end-experiment.html
@@ -2,7 +2,6 @@
 <html>
 
 <head>
-  
   <script src="../jspsych.js"></script>
   <script src="../plugins/jspsych-single-stim.js"></script>
   <link rel="stylesheet" href="../css/jspsych.css"></link>
@@ -12,7 +11,7 @@
     }
   </style>
 </head>
-
+<body></body>
 <script>
   var images = ["img/1.gif", "img/2.gif", "img/3.gif", "img/4.gif", "img/5.gif", "img/6.gif", "img/7.gif", "img/8.gif", "img/9.gif", "img/10.gif"];
 
@@ -37,10 +36,7 @@
 
 
   jsPsych.init({
-    timeline: [block],
-    on_finish: function() {
-      jsPsych.data.displayData();
-    }
+    timeline: [block]
   });
 </script>
 
diff --git a/examples/error-messages-for-bad-experiment-structures.html b/examples/error-messages-for-bad-experiment-structures.html
deleted file mode 100644
index 91f2886f..00000000
--- a/examples/error-messages-for-bad-experiment-structures.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    
-    <script src="../jspsych.js"></script>
-    <link rel="stylesheet" href="../css/jspsych.css"></link>
-    <style>
-      img { width: 300px; }
-    </style>
-  </head>
-  <script>
-
-  // no type parameter below.
-  var block_1 = {
-    stimulus: 'img/happy_face_1.jpg',
-    choices: [89,78], // Y or N
-    prompt: '<p class="center-content">Have you seen this face before? Y or N.</p>'
-  }
-
-  // should get error message in console about no type parameter.
-  jsPsych.init({
-    timeline: [block_1]
-  });
-
-  </script>
-</html>
diff --git a/examples/error-messages-for-no-plugin.html b/examples/error-messages-for-no-plugin.html
deleted file mode 100644
index 78201a1e..00000000
--- a/examples/error-messages-for-no-plugin.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    
-    <script src="../jspsych.js"></script>
-    <link rel="stylesheet" href="../css/jspsych.css"></link>
-    <style>
-      img { width: 300px; }
-    </style>
-  </head>
-  <body>
-    <div id="jspsych-target"></div>
-  </body>
-  <script>
-
-  // no type parameter below.
-  var block_1 = {
-    type: 'single-stim',
-    stimulus: 'img/happy_face_1.jpg',
-    choices: [89,78], // Y or N
-    prompt: '<p class="center-content">Have you seen this face before? Y or N.</p>'
-  }
-
-  // should get error message in console about no plugin loaded
-  jsPsych.init({
-    timeline: [block_1]
-  });
-
-  </script>
-</html>
diff --git a/examples/exclusions.html b/examples/exclusions.html
index ff351d47..96ad073d 100644
--- a/examples/exclusions.html
+++ b/examples/exclusions.html
@@ -2,7 +2,6 @@
 <html>
 
 <head>
-  
   <script src="../jspsych.js"></script>
   <script src="../plugins/jspsych-single-stim.js"></script>
   <link rel="stylesheet" href="../css/jspsych.css"></link>
@@ -18,7 +17,7 @@
 <script>
   var trial_1 = {
     type: 'single-stim',
-    stimulus: 'The experiment has begun!',
+    stimulus: 'The experiment started because your viewing window is at least 1000x500 pixels and you running a browser that supports the WebAudio API. To see the exclusions in action, shrink this window and refresh the page.',
     is_html: true
   }
 
diff --git a/examples/flex-layout-testing.html b/examples/flex-layout-testing.html
deleted file mode 100644
index 0b088826..00000000
--- a/examples/flex-layout-testing.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="../jspsych.js"></script>
-  <script src="../plugins/jspsych-survey-multi-choice.js"></script>
-  <link rel="stylesheet" href="../css/jspsych.css"></link>
-</head>
-<body></body>
-<script>
-
-  var opts = ["Strongly Disagree", "Disagree", "Somewhat Disagree", "Neural", "Somewhat Agree", "Agree", "Strongly Agree"];
-
-  var trial_1 = {
-    type: 'survey-multi-choice',
-    questions: ["I like vegetables.", "I like fruit."],
-    options: [opts, opts],
-  }
-
-  var trial_2 = {
-    type: 'survey-multi-choice',
-    questions: ["I like vegetables."],
-    options: [opts],
-  }
-
-  jsPsych.init({
-    timeline: [trial_1, trial_2],
-    show_progress_bar: true
-  });
-</script>
-</html>
diff --git a/examples/fullscreen-mouse-bug.html b/examples/fullscreen-mouse-bug.html
deleted file mode 100644
index e68d23bc..00000000
--- a/examples/fullscreen-mouse-bug.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  
-  <script src="../jspsych.js"></script>
-  <script src="../plugins/jspsych-text.js"></script>
-  <link rel="stylesheet" href="../css/jspsych.css"></link>
-</head>
-
-<script>
-  var block_1 = {
-    type: 'text',
-    text: 'This trial should display. Click to continue.',
-    choices: 'mouse'
-  }
-
-  jsPsych.init({
-    timeline: [block_1],
-    fullscreen: true,
-    on_finish: function() {
-      jsPsych.data.displayData();
-    }
-  });
-</script>
-
-</html>
diff --git a/examples/function-parameters-reset.html b/examples/function-parameters-reset.html
deleted file mode 100644
index 304f28e8..00000000
--- a/examples/function-parameters-reset.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    
-    <script src="../jspsych.js"></script>
-    <script src="../plugins/jspsych-text.js"></script>
-    <link rel="stylesheet" href="../css/jspsych.css"></link>
-  </head>
-  <script>
-
-  var count = 0;
-
-  var block = {
-    type: 'text',
-    text: function() {
-      return 'Each random number should be newly generated. Press any key. This is a random number: '+Math.round(Math.random()*200);
-    }
-  }
-
-  var loop_node = {
-    timeline: [block],
-    loop_function: function(data){
-      count++;
-      if(count > 5){
-        return false;
-      } else {
-        return true;
-      }
-    }
-  }
-
-
-  jsPsych.init({
-    timeline: [loop_node],
-    on_finish: function(){jsPsych.data.displayData(); }
-  });
-
-  </script>
-</html>
diff --git a/examples/hierarchical-data.html b/examples/hierarchical-data.html
deleted file mode 100644
index a8d25db3..00000000
--- a/examples/hierarchical-data.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  
-  <script src="../jspsych.js"></script>
-  <script src="../plugins/jspsych-text.js"></script>
-  <script src="../plugins/jspsych-single-stim.js"></script>
-  <link rel="stylesheet" href="../css/jspsych.css"></link>
-  <style>
-    img {
-      width: 300px;
-    }
-  </style>
-</head>
-
-<script>
-
-  var description = {
-    type: 'text',
-    text: 'The two single-stim trials should have a which_trial property and a node_level_data property. Press any key.'
-  }
-
-  var trial_1 = {
-    stimulus: 'img/happy_face_1.jpg',
-    data: {
-      which_trial: "trial 1"
-    }
-  }
-
-  var trial_2 = {
-    stimulus: 'img/sad_face_1.jpg',
-    data: {
-      which_trial: "trial 2"
-    }
-  }
-
-  var timeline_node = {
-    timeline: [trial_1, trial_2],
-    data: {
-      node_level_data: true
-    },
-    type: 'single-stim',
-    choices: [89, 78], // Y or N
-    prompt: '<p class="center-content">Have you seen this face before? Y or N.</p>',
-  }
-
-  jsPsych.init({
-    timeline: [description, timeline_node],
-    on_finish: function() {
-      jsPsych.data.displayData();
-    }
-  });
-</script>
-
-</html>
