hotfix/Figure subclass of Plot

Well, this got left off the last PR, what I get for working in haste.