switched to functor mode completely for plot class