Pushing a bit of code around. Look prettier(ish) and stuff.
Rehaul of the plugin system