#7 starting to use ES6 in some areas