First commit to add basic comments to templates
first draft of working code