Comment what we need to add and remove from https://scratch.mit.edu/projects/1364617249/ and what we can port from https://scratch.mit.edu/projects/1351336110/
