Have generic templates mostly working.