Charts is making it too complicated to try to combine it together. We'll keep them separate for now but can later combine them together in a separate PR if we can figure out what to do about Charts.