First draft of the new plugin