Move d3 stuff to where it needs to be for Graham's App
Move the actual d3 back