Started adding the charting code