First stab at refactoring for octo plugins.