part 2... is done?... maybe? although not the d3 stuff, obviously