Creating template
fixxed merge and now getting ready for deployment
Hopefully fixed config bug