Templatey

Making it more templatey