Updated for latest PluginBase changes.  Commands are broken.