Working on template

Almost there !!