Make private
Initial Charting
Move Charting up
Some better charting