add d3 charts
Fix merge conflicts