Merge "Attempt 2 at chart restructure"