More template progress