D3 added, WIP