Adding basic charting back in