d3 stuff overhaul
more stuff