Major modifications, ember is working, ready for d3 integration