[#759] Template work

@KasperBrandt