Templates now working