charts done

Pending to check for bugs and fix them