es6ified the whole beast