More plugin work. Plugins now work as intended.