accidentally worked on master
Overhauled the template