Some work on the chart controller. [skip ci]