Moved some stuff around to improve the plugin.