I'd like to merge in an old branch containing improvements to the icicle chart, but it's been broken since the refactor so needs some help