I'm cool with having them seperate right now... Let's set the scope of this PR to "OHAI can load v7 plugins"...