Leaving a few comments as I go through the templates.