Added some stuff, made it more plugin-wrapperish

Whatever that means.