Started refactoring charts from scratch