Added templates from last years masters branch