Rewrote classifier slightly to remove properties from being contained within the chart objects
Checkin