Working on Template Creation
Templates Creation
Merging the conflicts