Basic d3 working
fixed another merge
fixed merges...again