Creating template
Merged with new app