Templates are from the example I followed, and therefore broken, but sort of works
Updating templates