Plugins

Expands on PR #360