Add template tags and can do onsite
Merge conflicts