Start reworking plugins again
Merged in changes from GitHub