almost working line chart
fixing merge conflicts