Add d3 stuff
Fix up the structured model code