Craig: Starting to prepare for more than one type of chart. Refactored everything. Still lots of work to do though