Attempt 2 at chart restructure

No match.