Continue migration of d3 stuff