Starting to make the templates more templatey