Refs #62; Remove custom querying and manipulation and just used d3's