Still working on master and masteless templates

Signed-off-by: Bert Hajee <hajee@moretIA.com>