Added some basic templating