Started to add charting output