updates, playing with templates

does not quite work yet