move everything out of the plugin for now