Adding first day of D3 stuff.
Fixing merge conflict, getting ready for D3