Converting to ES6. Premature commit.