created models, cleaned up setup, switched to highcharts