#11 plugin templates almost finalised.