More work on charts system...