moving to using templates as the content source
Merge branch 'f_checkplugin'