Now with Templates in the right spot