Big ES6 refactoring
Added more charts