initial rework pass for new d3 graphs