Chart API revamp WIP