Finished putting in templating