Added charts and such