Make templates work ... maybe?