Break some various code out of the plugin