Began migration to object-oriented charts
Began migration to object-oriented charts; fixed various calculation bugs, reduced code size