Updated status

Templates is now complete, thanks to Will