Modularizing some of the templates. Yay modularity