started work on template page
Merge