cleaning up, adding d3 testing