almost working again ... sort of
almost working ... not to do the rest of the templates