Getting started on the templates
Resolved merge conflicts
Template work in progress
Merge attempt
Merge Attempt