Fixed bugs and started the charting structure.