Added template for remaining work
Fix merge fail