Revert "More work on the chart"

This reverts commit 95f7ac962130900974e6fb6f71ac9c2c21455d7c.