Movement towards a saner plugin system. I think.