D3

Includes upgrades required to work with the D3 library