added some more templatey things