Add Chart class

I delete old class you have and add new... it was completely different
than what I did!