Working on the template

Signed-off-by: Davinderpal Singh <davinderpalrehal@gmail.com>