update for Chart 1.1
preliminary refactor for hascm