adding new classes
changed chart and stateset to just extend set/list
Implemented everything