Type d3 map

Generic types are fun!
Also, we should mimic should Java docs their Generic types if possible.