Plugins API expansion & update

Plugins API expansion & update
But there's nothing special or different about the 1 plugin case, so it doesn't worry me. I'm fine leaving this in though.