Got chart1 and chart2 working again.
Merged changes.