Wip chart refactoring

Chart refactoring PR