First pass at upgrading to Scratch 2.0