Cleaning more crap, moving stuff around, splitting Chartbuilder into two exercises, first to use it, second to hack it