#7 Added charting facility. Should cleanup stuff thoroughly afterwards.