Bringing this project up to date with the latest D3 stuff