Added initial charting