Plugin

Droping plugin branch and merging this into faster paths