Stashing changes. Also, I can draw contours now.
Fixed overwrite of ClassTracker source