added templates and rickshaw + d3js