Initial effort on making es6 work